ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.439 by root, Mon Jul 14 16:42:49 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB 1.6;
23use Coro::Storable; 46use Coro::Storable;
47use Coro::Util ();
24 48
49use JSON::XS 2.01 ();
25use BDB (); 50use BDB ();
26use Data::Dumper; 51use Data::Dumper;
27use Digest::MD5; 52use Digest::MD5;
28use Fcntl; 53use Fcntl;
29use YAML::Syck (); 54use YAML ();
30use IO::AIO 2.32 (); 55use IO::AIO ();
31use Time::HiRes; 56use Time::HiRes;
32use Compress::LZF; 57use Compress::LZF;
58use Digest::MD5 ();
59
60AnyEvent::detect;
33 61
34# configure various modules to our taste 62# configure various modules to our taste
35# 63#
36$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 67
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 69
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 71
49our %COMMAND = (); 72our %COMMAND = ();
50our %COMMAND_TIME = (); 73our %COMMAND_TIME = ();
51 74
52our @EXTS = (); # list of extension package names 75our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 76our %EXTCMD = ();
77our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 78our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 79our %EXT_MAP = (); # pluggable maps
56 80
57our $RELOAD; # number of reloads so far 81our $RELOAD; # number of reloads so far
58our @EVENT; 82our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 90our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
71 96
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 99our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
79 101
102our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 104our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 105our $DB_ENV;
82 106
83our %CFG; 107our %CFG;
84 108
85our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 110our $RUNTIME;
111our $NOW;
87 112
88our %PLAYER; # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 114our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
91 116
92# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 119
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
98 124
99binmode STDOUT; 125binmode STDOUT;
100binmode STDERR; 126binmode STDERR;
101 127
102# read virtual server time, if available 128# read virtual server time, if available
155 181
156The raw value load value from the last tick. 182The raw value load value from the last tick.
157 183
158=item %cf::CFG 184=item %cf::CFG
159 185
160Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 187from wherever your confdir points to.
162 188
163=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
164 190
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 192returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 193per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 194
195=item @cf::INVOKE_RESULTS
196
197This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call.
200
169=back 201=back
170 202
171=cut 203=cut
172 204
173BEGIN { 205BEGIN {
177 $msg .= "\n" 209 $msg .= "\n"
178 unless $msg =~ /\n$/; 210 unless $msg =~ /\n$/;
179 211
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 213
182 utf8::encode $msg;
183 LOG llevError, $msg; 214 LOG llevError, $msg;
184 }; 215 };
185} 216}
217
218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
186 232
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
203)) { 249)) {
204 no strict 'refs'; 250 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 252}
207 253
208$Event::DIED = sub { 254$EV::DIED = sub {
209 warn "error in event callback: @_"; 255 warn "error in event callback: @_";
210}; 256};
211 257
212############################################################################# 258#############################################################################
213 259
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 282 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 283 $d
238 } || "[unable to dump $_[0]: '$@']"; 284 } || "[unable to dump $_[0]: '$@']";
239} 285}
240 286
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 287=item $ref = cf::decode_json $json
244 288
245Converts a JSON string into the corresponding perl data structure. 289Converts a JSON string into the corresponding perl data structure.
246 290
247=item $json = cf::to_json $ref 291=item $json = cf::encode_json $ref
248 292
249Converts a perl data structure into its JSON representation. 293Converts a perl data structure into its JSON representation.
294
295=cut
296
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298
299sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) }
250 301
251=item cf::lock_wait $string 302=item cf::lock_wait $string
252 303
253Wait until the given lock is available. See cf::lock_acquire. 304Wait until the given lock is available. See cf::lock_acquire.
254 305
257Wait until the given lock is available and then acquires it and returns 308Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 309a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 310for example when the coroutine gets canceled), the lock is automatically
260returned. 311returned.
261 312
313Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro.
315
262Lock names should begin with a unique identifier (for example, cf::map::find 316Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 317uses map_find and cf::map::load uses map_load).
264 318
265=item $locked = cf::lock_active $string 319=item $locked = cf::lock_active $string
266 320
267Return true if the lock is currently active, i.e. somebody has locked it. 321Return true if the lock is currently active, i.e. somebody has locked it.
268 322
269=cut 323=cut
270 324
271our %LOCK; 325our %LOCK;
326our %LOCKER;#d#
272 327
273sub lock_wait($) { 328sub lock_wait($) {
274 my ($key) = @_; 329 my ($key) = @_;
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
275 335
276 # wait for lock, if any 336 # wait for lock, if any
277 while ($LOCK{$key}) { 337 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 338 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 339 Coro::schedule;
285 345
286 # wait, to be sure we are not locked 346 # wait, to be sure we are not locked
287 lock_wait $key; 347 lock_wait $key;
288 348
289 $LOCK{$key} = []; 349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
290 351
291 Coro::guard { 352 Coro::guard {
353 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 354 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 355 $_->ready for @{ delete $LOCK{$key} };
294 } 356 }
295} 357}
296 358
299 361
300 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
301} 363}
302 364
303sub freeze_mainloop { 365sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
305 367
306 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
307 $TICK_WATCHER->start; 369}
370
371=item cf::periodic $interval, $cb
372
373Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer.
375
376=cut
377
378sub periodic($$) {
379 my ($interval, $cb) = @_;
380
381 my $start = rand List::Util::min 180, $interval;
382
383 EV::periodic $start, $interval, 0, $cb
384}
385
386=item cf::get_slot $time[, $priority[, $name]]
387
388Allocate $time seconds of blocking CPU time at priority C<$priority>:
389This call blocks and returns only when you have at least C<$time> seconds
390of cpu time till the next tick. The slot is only valid till the next cede.
391
392The optional C<$name> can be used to identify the job to run. It might be
393used for statistical purposes and should identify the same time-class.
394
395Useful for short background jobs.
396
397=cut
398
399our @SLOT_QUEUE;
400our $SLOT_QUEUE;
401
402$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager");
405
406 my $signal = new Coro::Signal;
407
408 while () {
409 next_job:
410 my $avail = cf::till_tick;
411 if ($avail > 0.01) {
412 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) {
414 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send;
416 Coro::cede;
417 goto next_job;
418 }
419 }
420 }
421
422 if (@SLOT_QUEUE) {
423 # we do not use wait_for_tick() as it returns immediately when tick is inactive
424 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait;
426 } else {
427 Coro::schedule;
428 }
308 }; 429 }
309 $TICK_WATCHER->stop; 430};
310 $guard 431
432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
435 my ($time, $pri, $name) = @_;
436
437 $time = $TICK * .6 if $time > $TICK * .6;
438 my $sig = new Coro::Signal;
439
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready;
443 $sig->wait;
311} 444}
312 445
313=item cf::async { BLOCK } 446=item cf::async { BLOCK }
314 447
315Currently the same as Coro::async_pool, meaning you cannot use 448Currently the same as Coro::async_pool, meaning you cannot use
320 453
321BEGIN { *async = \&Coro::async_pool } 454BEGIN { *async = \&Coro::async_pool }
322 455
323=item cf::sync_job { BLOCK } 456=item cf::sync_job { BLOCK }
324 457
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 458The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 459is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 460partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 461acceptable.
329 462
330If it must be done, put the blocking parts into C<sync_job>. This will run 463If it must be done, put the blocking parts into C<sync_job>. This will run
331the given BLOCK in another coroutine while waiting for the result. The 464the given BLOCK in another coroutine while waiting for the result. The
336 469
337sub sync_job(&) { 470sub sync_job(&) {
338 my ($job) = @_; 471 my ($job) = @_;
339 472
340 if ($Coro::current == $Coro::main) { 473 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 474 my $time = EV::time;
342 475
343 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
345 478
346 # TODO: use suspend/resume instead 479 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 480
348 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
349 482
350 my $busy = 1; 483 my $busy = 1;
351 my @res; 484 my @res;
352 485
353 (async { 486 (async {
487 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 488 @res = eval { $job->() };
355 warn $@ if $@; 489 warn $@ if $@;
356 undef $busy; 490 undef $busy;
357 })->prio (Coro::PRIO_MAX); 491 })->prio (Coro::PRIO_MAX);
358 492
359 while ($busy) { 493 while ($busy) {
360 Coro::cede or Event::one_event; 494 if (Coro::nready) {
495 Coro::cede_notself;
496 } else {
497 EV::loop EV::LOOP_ONESHOT;
361 } 498 }
499 }
362 500
363 $time = Event::time - $time; 501 my $time = EV::time - $time;
364 502
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
369 504
370 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
371 } else { 506 } else {
372 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
373 508
398=item fork_call { }, $args 533=item fork_call { }, $args
399 534
400Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
404 539
405=cut 540=cut
406 541
407sub fork_call(&@) { 542sub fork_call(&@) {
408 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
409 544
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 545 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 546 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 547 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 548
415 if (my $pid = fork) { 549 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 550 reset_signals;
428 local $SIG{__WARN__}; 551 &$cb
429 local $SIG{__DIE__}; 552 }, @args;
430 eval {
431 close $fh1;
432 553
433 my @res = eval { $cb->(@args) }; 554 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 555}
435 };
436 556
437 warn $@ if $@; 557=item $coin = coin_from_name $name
438 _exit 0; 558
439 } 559=cut
560
561our %coin_alias = (
562 "silver" => "silvercoin",
563 "silvercoin" => "silvercoin",
564 "silvercoins" => "silvercoin",
565 "gold" => "goldcoin",
566 "goldcoin" => "goldcoin",
567 "goldcoins" => "goldcoin",
568 "platinum" => "platinacoin",
569 "platinumcoin" => "platinacoin",
570 "platinumcoins" => "platinacoin",
571 "platina" => "platinacoin",
572 "platinacoin" => "platinacoin",
573 "platinacoins" => "platinacoin",
574 "royalty" => "royalty",
575 "royalties" => "royalty",
576);
577
578sub coin_from_name($) {
579 $coin_alias{$_[0]}
580 ? cf::arch::find $coin_alias{$_[0]}
581 : undef
440} 582}
441 583
442=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
443 585
444Returns a single value from the environment database. 586Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 588=item cf::db_put $family => $key => $value
447 589
448Stores the given C<$value> in the family. It can currently store binary 590Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 591data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 592
593=item $db = cf::db_table "name"
594
595Create and/or open a new database table. The string must not be "db" and must be unique
596within each server.
597
451=cut 598=cut
599
600sub db_table($) {
601 my ($name) = @_;
602 my $db = BDB::db_create $DB_ENV;
603
604 eval {
605 $db->set_flags (BDB::CHKSUM);
606
607 utf8::encode $name;
608 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
609 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
610 cf::cleanup "db_open(db): $!" if $!;
611 };
612 cf::cleanup "db_open(db): $@" if $@;
613
614 $db
615}
452 616
453our $DB; 617our $DB;
454 618
455sub db_init { 619sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 620 cf::sync_job {
460 eval { 621 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 622 };
470} 623}
471 624
472sub db_get($$) { 625sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 626 my $key = "$_[0]/$_[1]";
474 627
524 if (1) { 677 if (1) {
525 $md5 = 678 $md5 =
526 join "\x00", 679 join "\x00",
527 $processversion, 680 $processversion,
528 map { 681 map {
529 Coro::cede; 682 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 683 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 684 } 0.. $#$src;
532 685
533 686
534 my $dbmd5 = db_get cache => "$id/md5"; 687 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
580 733
581In the following description, CLASS can be any of C<global>, C<object> 734In the following description, CLASS can be any of C<global>, C<object>
582C<player>, C<client> or C<map> (i.e. the attachable objects in 735C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 736Deliantra).
584 737
585=over 4 738=over 4
586 739
587=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
588 741
840 "; 993 ";
841 die if $@; 994 die if $@;
842} 995}
843 996
844our $override; 997our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 998our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 999
847sub override { 1000sub override {
848 $override = 1; 1001 $override = 1;
849 @invoke_results = (); 1002 @INVOKE_RESULTS = (@_);
850} 1003}
851 1004
852sub do_invoke { 1005sub do_invoke {
853 my $event = shift; 1006 my $event = shift;
854 my $callbacks = shift; 1007 my $callbacks = shift;
855 1008
856 @invoke_results = (); 1009 @INVOKE_RESULTS = ();
857 1010
858 local $override; 1011 local $override;
859 1012
860 for (@$callbacks) { 1013 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1014 eval { &{$_->[1]} };
870 } 1023 }
871 1024
872 0 1025 0
873} 1026}
874 1027
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1029
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1031
879Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
880 1033
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1034This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 1035removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 1036results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1037
885=back 1038=back
886 1039
887=cut 1040=cut
888 1041
889############################################################################# 1042#############################################################################
890# object support 1043# object support
1044
1045sub _object_equal($$);
1046sub _object_equal($$) {
1047 my ($a, $b) = @_;
1048
1049 return 0 unless (ref $a) eq (ref $b);
1050
1051 if ("HASH" eq ref $a) {
1052 my @ka = keys %$a;
1053 my @kb = keys %$b;
1054
1055 return 0 if @ka != @kb;
1056
1057 for (0 .. $#ka) {
1058 return 0 unless $ka[$_] eq $kb[$_];
1059 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1060 }
1061
1062 } elsif ("ARRAY" eq ref $a) {
1063
1064 return 0 if @$a != @$b;
1065
1066 for (0 .. $#$a) {
1067 return 0 unless _object_equal $a->[$_], $b->[$_];
1068 }
1069
1070 } elsif ($a ne $b) {
1071 return 0;
1072 }
1073
1074 1
1075}
1076
1077our $SLOW_MERGES;#d#
1078sub _can_merge {
1079 my ($ob1, $ob2) = @_;
1080
1081 ++$SLOW_MERGES;#d#
1082
1083 # we do the slow way here
1084 return _object_equal $ob1, $ob2
1085}
891 1086
892sub reattach { 1087sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1088 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1089 my ($obj) = @_;
895 1090
916cf::attachable->attach ( 1111cf::attachable->attach (
917 prio => -1000000, 1112 prio => -1000000,
918 on_instantiate => sub { 1113 on_instantiate => sub {
919 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
920 1115
921 $data = from_json $data; 1116 $data = decode_json $data;
922 1117
923 for (@$data) { 1118 for (@$data) {
924 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
925 1120
926 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1137sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1138 my ($filename, $rdata, $objs) = @_;
944 1139
945 sync_job { 1140 sync_job {
946 if (length $$rdata) { 1141 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
949 1145
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1150 aio_close $fh;
955 1151
956 if (@$objs) { 1152 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1158 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
964 } 1160 }
965 } else { 1161 } else {
966 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
967 } 1163 }
972 } 1168 }
973 } else { 1169 } else {
974 aio_unlink $filename; 1170 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
976 } 1172 }
977 } 1173 };
978} 1174}
979 1175
980sub object_freezer_as_string { 1176sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1177 my ($rdata, $objs) = @_;
982 1178
994 or return; 1190 or return;
995 1191
996 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
998 or return; 1194 or return;
1195
999 $av = eval { (Storable::thaw $av)->{objs} }; 1196 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs};
1000 } 1198 }
1001 1199
1200 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1202 $decname, length $data, scalar @{$av || []};
1203
1004 return ($data, $av); 1204 ($data, $av)
1005} 1205}
1006 1206
1007=head2 COMMAND CALLBACKS 1207=head2 COMMAND CALLBACKS
1008 1208
1009=over 4 1209=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1229 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1230}
1031 1231
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1232=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1233
1034Register a callback fro execution when the client sends an extcmd packet. 1234Register a callback for execution when the client sends an (synchronous)
1235extcmd packet. Ext commands will be processed in the order they are
1236received by the server, like other user commands. The first argument is
1237the logged-in player. Ext commands can only be processed after a player
1238has logged in successfully.
1035 1239
1036If the callback returns something, it is sent back as if reply was being 1240If the callback returns something, it is sent back as if reply was being
1037called. 1241called.
1038 1242
1243=item cf::register_exticmd $name => \&callback($ns,$packet);
1244
1245Register a callback for execution when the client sends an (asynchronous)
1246exticmd packet. Exti commands are processed by the server as soon as they
1247are received, i.e. out of order w.r.t. other commands. The first argument
1248is a client socket. Exti commands can be received anytime, even before
1249log-in.
1250
1251If the callback returns something, it is sent back as if reply was being
1252called.
1253
1039=cut 1254=cut
1040 1255
1041sub register_extcmd { 1256sub register_extcmd {
1042 my ($name, $cb) = @_; 1257 my ($name, $cb) = @_;
1043 1258
1044 $EXTCMD{$name} = $cb; 1259 $EXTCMD{$name} = $cb;
1260}
1261
1262sub register_exticmd {
1263 my ($name, $cb) = @_;
1264
1265 $EXTICMD{$name} = $cb;
1045} 1266}
1046 1267
1047cf::player->attach ( 1268cf::player->attach (
1048 on_command => sub { 1269 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1270 my ($pl, $name, $params) = @_;
1058 cf::override; 1279 cf::override;
1059 }, 1280 },
1060 on_extcmd => sub { 1281 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1282 my ($pl, $buf) = @_;
1062 1283
1063 my $msg = eval { from_json $buf }; 1284 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1285
1065 if (ref $msg) { 1286 if (ref $msg) {
1287 my ($type, $reply, @payload) =
1288 "ARRAY" eq ref $msg
1289 ? @$msg
1290 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1291
1292 my @reply;
1293
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1294 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1295 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1296 }
1297
1298 $pl->ext_reply ($reply, @reply)
1299 if $reply;
1300
1071 } else { 1301 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1303 }
1074 1304
1075 cf::override; 1305 cf::override;
1128 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1130 1360
1131 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1362 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1364 }
1136 1365
1137 warn $msg; 1366 warn $msg;
1138 } 1367 }
1139 1368
1164use Coro::AIO; 1393use Coro::AIO;
1165 1394
1166=head3 cf::player 1395=head3 cf::player
1167 1396
1168=over 4 1397=over 4
1398
1399=item cf::player::num_playing
1400
1401Returns the official number of playing players, as per the Crossfire metaserver rules.
1402
1403=cut
1404
1405sub num_playing {
1406 scalar grep
1407 $_->ob->map
1408 && !$_->hidden
1409 && !$_->ob->flag (cf::FLAG_WIZ),
1410 cf::player::list
1411}
1169 1412
1170=item cf::player::find $login 1413=item cf::player::find $login
1171 1414
1172Returns the given player object, loading it if necessary (might block). 1415Returns the given player object, loading it if necessary (might block).
1173 1416
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1452 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1453 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1454 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1455 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1456
1214 my $pl = load_pl path $login 1457 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1458 or return;
1459
1460 my $pl = cf::player::load_pl $f
1461 or return;
1462
1463 local $cf::PLAYER_LOADING{$login} = $pl;
1464 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1217 } 1466 }
1218 } 1467 }
1219} 1468}
1220 1469
1229 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1230 1479
1231 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1233 1482
1483 cf::get_slot 0.01;
1484
1234 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1235 Coro::cede; 1486 cf::cede_to_tick;
1236} 1487}
1237 1488
1238sub new($) { 1489sub new($) {
1239 my ($login) = @_; 1490 my ($login) = @_;
1240 1491
1246 $cf::PLAYER{$login} = $self; 1497 $cf::PLAYER{$login} = $self;
1247 1498
1248 $self 1499 $self
1249} 1500}
1250 1501
1502=item $player->send_msg ($channel, $msg, $color, [extra...])
1503
1504=cut
1505
1506sub send_msg {
1507 my $ns = shift->ns
1508 or return;
1509 $ns->send_msg (@_);
1510}
1511
1251=item $pl->quit_character 1512=item $pl->quit_character
1252 1513
1253Nukes the player without looking back. If logged in, the connection will 1514Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1515be destroyed. May block for a long time.
1255 1516
1263 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1264 $pl->password ("*"); # this should lock out the player until we nuked the dir 1525 $pl->password ("*"); # this should lock out the player until we nuked the dir
1265 1526
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1270 1533
1271 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1308 or return []; 1571 or return [];
1309 1572
1310 my @logins; 1573 my @logins;
1311 1574
1312 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1576 my $path = path $login;
1577
1578 # a .pst is a dead give-away for a valid player
1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1584 }
1316 1585
1317 utf8::decode $login; 1586 utf8::decode $login;
1318 push @logins, $login; 1587 push @logins, $login;
1319 } 1588 }
1320 1589
1347 } 1616 }
1348 1617
1349 \@paths 1618 \@paths
1350} 1619}
1351 1620
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1622
1623Expand crossfire pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713
1352=item $player->ext_reply ($msgid, %msg) 1714=item $player->ext_reply ($msgid, @msg)
1353 1715
1354Sends an ext reply to the player. 1716Sends an ext reply to the player.
1355 1717
1356=cut 1718=cut
1357 1719
1358sub ext_reply($$%) { 1720sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1721 my ($self, $id, @msg) = @_;
1360 1722
1361 $msg{msgid} = $id; 1723 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1724}
1365 1725
1366=item $player->ext_event ($type, %msg) 1726=item $player->ext_msg ($type, @msg)
1367 1727
1368Sends an ext event to the client. 1728Sends an ext event to the client.
1369 1729
1370=cut 1730=cut
1371 1731
1372sub ext_event($$%) { 1732sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1733 my ($self, $type, @msg) = @_;
1374 1734
1375 $self->ns->ext_event ($type, %msg); 1735 $self->ns->ext_msg ($type, @msg);
1376} 1736}
1377 1737
1378=head3 cf::region 1738=head3 cf::region
1379 1739
1380=over 4 1740=over 4
1393 my ($path) = @_; 1753 my ($path) = @_;
1394 1754
1395 my ($match, $specificity); 1755 my ($match, $specificity);
1396 1756
1397 for my $region (list) { 1757 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1758 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1759 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1760 if $region->specificity > $specificity;
1401 } 1761 }
1402 } 1762 }
1403 1763
1424our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1425our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1426 1786
1427sub generate_random_map { 1787sub generate_random_map {
1428 my ($self, $rmp) = @_; 1788 my ($self, $rmp) = @_;
1789
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791
1429 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1430 $self->_create_random_map ( 1793 $self->_create_random_map (
1431 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1432 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1433 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1523 $self->init; # pass $1 etc. 1886 $self->init; # pass $1 etc.
1524 return $self; 1887 return $self;
1525 } 1888 }
1526 } 1889 }
1527 1890
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1891 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1892 ()
1530} 1893}
1531 1894
1532sub init { 1895sub init {
1533 my ($self) = @_; 1896 my ($self) = @_;
1555 1918
1556# the temporary/swap location 1919# the temporary/swap location
1557sub save_path { 1920sub save_path {
1558 my ($self) = @_; 1921 my ($self) = @_;
1559 1922
1560 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1561 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1562} 1925}
1563 1926
1564# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1565sub uniq_path { 1928sub uniq_path {
1566 my ($self) = @_; 1929 my ($self) = @_;
1567 1930
1568 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1569 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1570} 1933}
1571 1934
1572# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1573# all maps in C++... 1936# all maps in C++...
1596 1959
1597sub load_header_from($) { 1960sub load_header_from($) {
1598 my ($self, $path) = @_; 1961 my ($self, $path) = @_;
1599 1962
1600 utf8::encode $path; 1963 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1964 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 or return; 1965 or return;
1966
1967 $self->_load_header ($f)
1968 or return;
1969
1970 local $MAP_LOADING{$self->{path}} = $self;
1971 $f->resolve_delayed_derefs;
1606 1972
1607 $self->{load_path} = $path; 1973 $self->{load_path} = $path;
1608 1974
1609 1 1975 1
1610} 1976}
1664sub find { 2030sub find {
1665 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1666 2032
1667 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1668 2034
2035 cf::lock_wait "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1670 2037
1671 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1672 my $guard = cf::lock_acquire "map_find:$path"; 2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
1673 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1674 or return; 2043 or return;
1675 2044
1676 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1677 2046
1679 or return; 2048 or return;
1680 2049
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
2054 undef $guard1;
1684 $map->reset; 2055 $map->reset;
1685 undef $guard;
1686 return find $path; 2056 return find $path;
1687 } 2057 }
1688 2058
1689 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1690 } 2060 }
1699 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
1700 2070
1701 my $path = $self->{path}; 2071 my $path = $self->{path};
1702 2072
1703 { 2073 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 2074 my $guard = cf::lock_acquire "map_data:$path";
1705 2075
2076 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 2077 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 2078
1708 $self->in_memory (cf::MAP_LOADING); 2079 $self->in_memory (cf::MAP_LOADING);
1709 2080
1710 $self->alloc; 2081 $self->alloc;
1711 2082
1712 $self->pre_load; 2083 $self->pre_load;
1713 Coro::cede; 2084 cf::cede_to_tick;
1714 2085
2086 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 2088 $self->_load_objects ($f)
1716 or return; 2089 or return;
1717 2090
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->post_load_original
1719 if delete $self->{load_original}; 2092 if delete $self->{load_original};
1720 2093
1721 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2095 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2096 unless (aio_stat $uniq) {
2097 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2098 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2099 $self->_load_objects ($f);
2100 $f->resolve_delayed_derefs;
2101 }
1726 } 2102 }
1727 } 2103 }
1728 2104
1729 Coro::cede; 2105 $f->resolve_delayed_derefs;
2106
2107 cf::cede_to_tick;
1730 # now do the right thing for maps 2108 # now do the right thing for maps
1731 $self->link_multipart_objects; 2109 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2110 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2111 unless $self->difficulty;
1734 Coro::cede; 2112 cf::cede_to_tick;
1735 2113
1736 unless ($self->{deny_activate}) { 2114 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2115 $self->decay_objects;
1738 $self->fix_auto_apply; 2116 $self->fix_auto_apply;
1739 $self->update_buttons; 2117 $self->update_buttons;
1740 Coro::cede; 2118 cf::cede_to_tick;
1741 $self->set_darkness_map; 2119 $self->set_darkness_map;
1742 Coro::cede; 2120 cf::cede_to_tick;
1743 $self->activate; 2121 $self->activate;
1744 } 2122 }
1745 2123
2124 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME);
2126
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
1747 } 2128 }
1748 2129
1749 $self->post_load; 2130 $self->post_load;
1750} 2131}
1751 2132
1760 2141
1761 $self 2142 $self
1762} 2143}
1763 2144
1764# find and load all maps in the 3x3 area around a map 2145# find and load all maps in the 3x3 area around a map
1765sub load_diag { 2146sub load_neighbours {
1766 my ($map) = @_; 2147 my ($map) = @_;
1767 2148
1768 my @diag; # diagonal neighbours 2149 my @neigh; # diagonal neighbours
1769 2150
1770 for (0 .. 3) { 2151 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2152 my $neigh = $map->tile_path ($_)
1772 or next; 2153 or next;
1773 $neigh = find $neigh, $map 2154 $neigh = find $neigh, $map
1774 or next; 2155 or next;
1775 $neigh->load; 2156 $neigh->load;
1776 2157
2158 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2159 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2160 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2161 }
1780 2162
1781 for (@diag) { 2163 for (grep defined $_->[0], @neigh) {
2164 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2165 my $neigh = find $path, $origin
1783 or next; 2166 or next;
1784 $neigh->load; 2167 $neigh->load;
1785 } 2168 }
1786} 2169}
1787 2170
1792} 2175}
1793 2176
1794sub do_load_sync { 2177sub do_load_sync {
1795 my ($map) = @_; 2178 my ($map) = @_;
1796 2179
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main;
2182
1797 cf::sync_job { $map->load }; 2183 cf::sync_job { $map->load };
1798} 2184}
1799 2185
1800our %MAP_PREFETCH; 2186our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2187our $MAP_PREFETCHER = undef;
1802 2188
1803sub find_async { 2189sub find_async {
1804 my ($path, $origin) = @_; 2190 my ($path, $origin, $load) = @_;
1805 2191
1806 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
1807 2193
1808 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1810 } 2196 }
1811 2197
1812 undef $MAP_PREFETCH{$path}; 2198 $MAP_PREFETCH{$path} |= $load;
2199
1813 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2201 $Coro::current->{desc} = "map prefetcher";
2202
1814 while (%MAP_PREFETCH) { 2203 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2204 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2205 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2206 $map->load if $v;
2207 }
1819 2208
1820 delete $MAP_PREFETCH{$path}; 2209 delete $MAP_PREFETCH{$k};
1821 } 2210 }
1822 } 2211 }
1823 undef $MAP_PREFETCHER; 2212 undef $MAP_PREFETCHER;
1824 }; 2213 };
1825 $MAP_PREFETCHER->prio (6); 2214 $MAP_PREFETCHER->prio (6);
1828} 2217}
1829 2218
1830sub save { 2219sub save {
1831 my ($self) = @_; 2220 my ($self) = @_;
1832 2221
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2223
1835 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
1836 2225
1837 return unless $self->dirty; 2226 return unless $self->dirty;
1838 2227
1844 return if $self->{deny_save}; 2233 return if $self->{deny_save};
1845 2234
1846 local $self->{last_access} = $self->last_access;#d# 2235 local $self->{last_access} = $self->last_access;#d#
1847 2236
1848 cf::async { 2237 cf::async {
2238 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
1850 }; 2240 };
2241
2242 cf::get_slot 0.02;
1851 2243
1852 if ($uniq) { 2244 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1854 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1855 } else { 2247 } else {
1861 my ($self) = @_; 2253 my ($self) = @_;
1862 2254
1863 # save first because save cedes 2255 # save first because save cedes
1864 $self->save; 2256 $self->save;
1865 2257
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2259
1868 return if $self->players; 2260 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
1870 return if $self->{deny_save}; 2262 return if $self->{deny_save};
1871 2263
2264 $self->in_memory (cf::MAP_SWAPPED);
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2268 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2269}
1875 2270
1876sub reset_at { 2271sub reset_at {
1877 my ($self) = @_; 2272 my ($self) = @_;
1878 2273
1910 if $uniq; 2305 if $uniq;
1911 } 2306 }
1912 2307
1913 delete $cf::MAP{$self->path}; 2308 delete $cf::MAP{$self->path};
1914 2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2312 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2313
1919 $self->unlink_save; 2314 $self->unlink_save;
1920 $self->destroy; 2315 $self->destroy;
1921} 2316}
1922 2317
1923my $nuke_counter = "aaaa"; 2318my $nuke_counter = "aaaa";
1924 2319
1925sub nuke { 2320sub nuke {
1926 my ($self) = @_; 2321 my ($self) = @_;
1927 2322
2323 {
2324 my $lock = cf::lock_acquire "map_data:$self->{path}";
2325
1928 delete $cf::MAP{$self->path}; 2326 delete $cf::MAP{$self->path};
1929 2327
1930 $self->unlink_save; 2328 $self->unlink_save;
1931 2329
1932 bless $self, "cf::map"; 2330 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2331 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2332 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2333 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2335
1938 $cf::MAP{$self->path} = $self; 2336 $cf::MAP{$self->path} = $self;
2337 }
1939 2338
1940 $self->reset; # polite request, might not happen 2339 $self->reset; # polite request, might not happen
1941} 2340}
1942 2341
1943=item $maps = cf::map::tmp_maps 2342=item $maps = cf::map::tmp_maps
1985 2384
1986sub unique_maps() { 2385sub unique_maps() {
1987 [ 2386 [
1988 map { 2387 map {
1989 utf8::decode $_; 2388 utf8::decode $_;
1990 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
1991 ? normalise $_ 2392 : normalise $_
1992 : ()
1993 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
1994 ] 2394 ]
1995} 2395}
1996 2396
1997package cf;
1998
1999=back 2397=back
2000 2398
2001=head3 cf::object 2399=head3 cf::object
2002 2400
2003=cut 2401=cut
2006 2404
2007=over 4 2405=over 4
2008 2406
2009=item $ob->inv_recursive 2407=item $ob->inv_recursive
2010 2408
2011Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2012 2411
2013=cut 2412=cut
2014 2413
2015sub inv_recursive_; 2414sub inv_recursive_;
2016sub inv_recursive_ { 2415sub inv_recursive_ {
2019 2418
2020sub inv_recursive { 2419sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2022} 2421}
2023 2422
2423=item $ref = $ob->ref
2424
2425Creates and returns a persistent reference to an object that can be stored as a string.
2426
2427=item $ob = cf::object::deref ($refstring)
2428
2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2430even if the object actually exists. May block.
2431
2432=cut
2433
2434sub deref {
2435 my ($ref) = @_;
2436
2437 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2438 my ($uuid, $name) = ($1, $2);
2439 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2440 or return;
2441 $pl->ob->uuid eq $uuid
2442 or return;
2443
2444 $pl->ob
2445 } else {
2446 warn "$ref: cannot resolve object reference\n";
2447 undef
2448 }
2449}
2450
2024package cf; 2451package cf;
2025 2452
2026=back 2453=back
2027 2454
2028=head3 cf::object::player 2455=head3 cf::object::player
2034Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2461Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2035can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2036dialogue with the given NPC character. 2463dialogue with the given NPC character.
2037 2464
2038=cut 2465=cut
2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2039 2480
2040# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2041# with dialog boxes. 2482# with dialog boxes.
2042#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2043sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2045 2486
2046 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2487 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
2047 2488
2048 if ($self->{record_replies}) { 2489 if ($self->{record_replies}) {
2049 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2490 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2491
2050 } else { 2492 } else {
2493 my $pl = $self->contr;
2494
2495 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2496 my $dialog = $pl->{npc_dialog};
2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2498
2499 } else {
2051 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2052 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2502 }
2053 } 2503 }
2504}
2505
2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2507
2508=cut
2509
2510sub cf::object::send_msg {
2511 my $pl = shift->contr
2512 or return;
2513 $pl->send_msg (@_);
2054} 2514}
2055 2515
2056=item $player_object->may ("access") 2516=item $player_object->may ("access")
2057 2517
2058Returns wether the given player is authorized to access resource "access" 2518Returns wether the given player is authorized to access resource "access"
2137 # use -1 or undef as default coordinates, not 0, 0 2597 # use -1 or undef as default coordinates, not 0, 0
2138 ($x, $y) = ($map->enter_x, $map->enter_y) 2598 ($x, $y) = ($map->enter_x, $map->enter_y)
2139 if $x <=0 && $y <= 0; 2599 if $x <=0 && $y <= 0;
2140 2600
2141 $map->load; 2601 $map->load;
2142 $map->load_diag; 2602 $map->load_neighbours;
2143 2603
2144 return unless $self->contr->active; 2604 return unless $self->contr->active;
2145 $self->activate_recursive; 2605 $self->activate_recursive;
2146 2606
2147 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2148 $self->enter_map ($map, $x, $y); 2608 $self->enter_map ($map, $x, $y);
2149} 2609}
2150 2610
2151=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2152 2612
2153Moves the player to the given map-path and coordinates by first freezing 2613Moves the player to the given map-path and coordinates by first freezing
2154her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2155that has to return the map if sucecssful, and then unfreezes the player on 2615that has to return the map if sucecssful, and then unfreezes the player on
2156the new (success) or old (failed) map position. 2616the new (success) or old (failed) map position. In either case, $done will
2617be called at the end of this process.
2618
2619Note that $check will be called with a potentially non-loaded map, so if
2620it needs a loaded map it has to call C<< ->load >>.
2157 2621
2158=cut 2622=cut
2159 2623
2160our $GOTOGEN; 2624our $GOTOGEN;
2161 2625
2162sub cf::object::player::goto { 2626sub cf::object::player::goto {
2163 my ($self, $path, $x, $y, $check) = @_; 2627 my ($self, $path, $x, $y, $check, $done) = @_;
2164 2628
2165 # do generation counting so two concurrent goto's will be executed in-order 2629 # do generation counting so two concurrent goto's will be executed in-order
2166 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2630 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2167 2631
2168 $self->enter_link; 2632 $self->enter_link;
2169 2633
2170 (async { 2634 (async {
2635 $Coro::current->{desc} = "player::goto $path $x $y";
2636
2637 # *tag paths override both path and x|y
2638 if ($path =~ /^\*(.*)$/) {
2639 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2640 my $ob = $obs[rand @obs];
2641
2642 # see if we actually can go there
2643 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2644 $ob = $obs[rand @obs];
2645 } else {
2646 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2647 }
2648 # else put us there anyways for now #d#
2649
2650 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2651 } else {
2652 ($path, $x, $y) = (undef, undef, undef);
2653 }
2654 }
2655
2171 my $map = eval { 2656 my $map = eval {
2172 my $map = cf::map::find $path; 2657 my $map = defined $path ? cf::map::find $path : undef;
2173 2658
2174 if ($map) { 2659 if ($map) {
2175 $map = $map->customise_for ($self); 2660 $map = $map->customise_for ($self);
2176 $map = $check->($map) if $check && $map; 2661 $map = $check->($map) if $check && $map;
2177 } else { 2662 } else {
2178 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2663 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2179 } 2664 }
2180 2665
2181 $map 2666 $map
2182 }; 2667 };
2183 2668
2188 2673
2189 if ($gen == $self->{_goto_generation}) { 2674 if ($gen == $self->{_goto_generation}) {
2190 delete $self->{_goto_generation}; 2675 delete $self->{_goto_generation};
2191 $self->leave_link ($map, $x, $y); 2676 $self->leave_link ($map, $x, $y);
2192 } 2677 }
2678
2679 $done->() if $done;
2193 })->prio (1); 2680 })->prio (1);
2194} 2681}
2195 2682
2196=item $player_object->enter_exit ($exit_object) 2683=item $player_object->enter_exit ($exit_object)
2197 2684
2217} 2704}
2218 2705
2219sub prepare_random_map { 2706sub prepare_random_map {
2220 my ($exit) = @_; 2707 my ($exit) = @_;
2221 2708
2222 my $guard = cf::lock_acquire "exit_prepare:$exit";
2223
2224 # all this does is basically replace the /! path by 2709 # all this does is basically replace the /! path by
2225 # a new random map path (?random/...) with a seed 2710 # a new random map path (?random/...) with a seed
2226 # that depends on the exit object 2711 # that depends on the exit object
2227 2712
2228 my $rmp = parse_random_map_params $exit->msg; 2713 my $rmp = parse_random_map_params $exit->msg;
2230 if ($exit->map) { 2715 if ($exit->map) {
2231 $rmp->{region} = $exit->region->name; 2716 $rmp->{region} = $exit->region->name;
2232 $rmp->{origin_map} = $exit->map->path; 2717 $rmp->{origin_map} = $exit->map->path;
2233 $rmp->{origin_x} = $exit->x; 2718 $rmp->{origin_x} = $exit->x;
2234 $rmp->{origin_y} = $exit->y; 2719 $rmp->{origin_y} = $exit->y;
2720
2721 $exit->map->touch;
2235 } 2722 }
2236 2723
2237 $rmp->{random_seed} ||= $exit->random_seed; 2724 $rmp->{random_seed} ||= $exit->random_seed;
2238 2725
2239 my $data = cf::to_json $rmp; 2726 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2240 my $md5 = Digest::MD5::md5_hex $data; 2727 my $md5 = Digest::MD5::md5_hex $data;
2241 my $meta = "$RANDOMDIR/$md5.meta"; 2728 my $meta = "$RANDOMDIR/$md5.meta";
2242 2729
2243 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2730 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2244 aio_write $fh, 0, (length $data), $data, 0; 2731 aio_write $fh, 0, (length $data), $data, 0;
2245 undef $fh; 2732 undef $fh;
2246 aio_rename "$meta~", $meta; 2733 aio_rename "$meta~", $meta;
2247 2734
2735 my $slaying = "?random/$md5";
2736
2737 if ($exit->valid) {
2248 $exit->slaying ("?random/$md5"); 2738 $exit->slaying ("?random/$md5");
2249 $exit->msg (undef); 2739 $exit->msg (undef);
2740 }
2250 } 2741 }
2251} 2742}
2252 2743
2253sub cf::object::player::enter_exit { 2744sub cf::object::player::enter_exit {
2254 my ($self, $exit) = @_; 2745 my ($self, $exit) = @_;
2255 2746
2256 return unless $self->type == cf::PLAYER; 2747 return unless $self->type == cf::PLAYER;
2257 2748
2258 if ($exit->slaying eq "/!") {
2259 #TODO: this should de-fi-ni-te-ly not be a sync-job
2260 # the problem is that $exit might not survive long enough
2261 # so it needs to be done right now, right here
2262 cf::sync_job { prepare_random_map $exit };
2263 }
2264
2265 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2266 my $hp = $exit->stats->hp;
2267 my $sp = $exit->stats->sp;
2268
2269 $self->enter_link; 2749 $self->enter_link;
2270 2750
2271 (async { 2751 (async {
2272 $self->deactivate_recursive; # just to be sure 2752 $Coro::current->{desc} = "enter_exit";
2753
2273 unless (eval { 2754 unless (eval {
2755 $self->deactivate_recursive; # just to be sure
2756
2757 # random map handling
2758 {
2759 my $guard = cf::lock_acquire "exit_prepare:$exit";
2760
2761 prepare_random_map $exit
2762 if $exit->slaying eq "/!";
2763 }
2764
2765 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2766 my $x = $exit->stats->hp;
2767 my $y = $exit->stats->sp;
2768
2274 $self->goto ($slaying, $hp, $sp); 2769 $self->goto ($map, $x, $y);
2275 2770
2771 # if exit is damned, update players death & WoR home-position
2772 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED);
2774
2276 1; 2775 1
2277 }) { 2776 }) {
2278 $self->message ("Something went wrong deep within the crossfire server. " 2777 $self->message ("Something went wrong deep within the crossfire server. "
2279 . "I'll try to bring you back to the map you were before. " 2778 . "I'll try to bring you back to the map you were before. "
2280 . "Please report this to the dungeon master!", 2779 . "Please report this to the dungeon master!",
2281 cf::NDI_UNIQUE | cf::NDI_RED); 2780 cf::NDI_UNIQUE | cf::NDI_RED);
2302 2801
2303 utf8::encode $text; 2802 utf8::encode $text;
2304 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2803 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2305} 2804}
2306 2805
2806=item $client->send_msg ($channel, $msg, $color, [extra...])
2807
2808Send a drawinfo or msg packet to the client, formatting the msg for the
2809client if neccessary. C<$type> should be a string identifying the type of
2810the message, with C<log> being the default. If C<$color> is negative, suppress
2811the message unless the client supports the msg packet.
2812
2813=cut
2814
2815# non-persistent channels (usually the info channel)
2816our %CHANNEL = (
2817 "c/identify" => {
2818 id => "infobox",
2819 title => "Identify",
2820 reply => undef,
2821 tooltip => "Items recently identified",
2822 },
2823 "c/examine" => {
2824 id => "infobox",
2825 title => "Examine",
2826 reply => undef,
2827 tooltip => "Signs and other items you examined",
2828 },
2829 "c/book" => {
2830 id => "infobox",
2831 title => "Book",
2832 reply => undef,
2833 tooltip => "The contents of a note or book",
2834 },
2835 "c/lookat" => {
2836 id => "infobox",
2837 title => "Look",
2838 reply => undef,
2839 tooltip => "What you saw there",
2840 },
2841 "c/who" => {
2842 id => "infobox",
2843 title => "Players",
2844 reply => undef,
2845 tooltip => "Shows players who are currently online",
2846 },
2847 "c/body" => {
2848 id => "infobox",
2849 title => "Body Parts",
2850 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available",
2852 },
2853 "c/uptime" => {
2854 id => "infobox",
2855 title => "Uptime",
2856 reply => undef,
2857 tooltip => "How long the server has been running since last restart",
2858 },
2859 "c/mapinfo" => {
2860 id => "infobox",
2861 title => "Map Info",
2862 reply => undef,
2863 tooltip => "Information related to the maps",
2864 },
2865 "c/party" => {
2866 id => "party",
2867 title => "Party",
2868 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party",
2870 },
2871);
2872
2873sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_;
2875
2876 $msg = $self->pl->expand_cfpod ($msg);
2877
2878 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879
2880 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel};
2883
2884 $self->ext_msg (channel_info => $channel)
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id};
2888
2889 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel)
2894 if $self->can_msg;
2895 }
2896
2897 $channel = $channel->{id};
2898 }
2899
2900 return unless @extra || length $msg;
2901
2902 if ($self->can_msg) {
2903 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF;
2906
2907 $self->send_packet ("msg " . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2909 } else {
2910 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones
2912 for ($msg) {
2913 1 while
2914 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2915 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2916 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2917 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2918 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2919 }
2920
2921 $color &= cf::NDI_COLOR_MASK;
2922
2923 utf8::encode $msg;
2924
2925 if (0 && $msg =~ /\[/) {
2926 # COMMAND/INFO
2927 $self->send_packet ("drawextinfo $color 10 8 $msg")
2928 } else {
2929 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2930 $self->send_packet ("drawinfo $color $msg")
2931 }
2932 }
2933 }
2934}
2935
2307=item $client->ext_event ($type, %msg) 2936=item $client->ext_msg ($type, @msg)
2308 2937
2309Sends an exti event to the client. 2938Sends an ext event to the client.
2310 2939
2311=cut 2940=cut
2312 2941
2313sub cf::client::ext_event($$%) { 2942sub cf::client::ext_msg($$@) {
2314 my ($self, $type, %msg) = @_; 2943 my ($self, $type, @msg) = @_;
2315 2944
2945 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2947 } elsif ($self->extcmd == 1) { # TODO: remove
2316 $msg{msgtype} = "event_$type"; 2948 push @msg, msgtype => "event_$type";
2317 $self->send_packet ("ext " . cf::to_json \%msg); 2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 }
2951}
2952
2953=item $client->ext_reply ($msgid, @msg)
2954
2955Sends an ext reply to the client.
2956
2957=cut
2958
2959sub cf::client::ext_reply($$@) {
2960 my ($self, $id, @msg) = @_;
2961
2962 if ($self->extcmd == 2) {
2963 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2964 } elsif ($self->extcmd == 1) {
2965 #TODO: version 1, remove
2966 unshift @msg, msgtype => "reply", msgid => $id;
2967 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2968 }
2318} 2969}
2319 2970
2320=item $success = $client->query ($flags, "text", \&cb) 2971=item $success = $client->query ($flags, "text", \&cb)
2321 2972
2322Queues a query to the client, calling the given callback with 2973Queues a query to the client, calling the given callback with
2323the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2974the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2324C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2975C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325 2976
2326Queries can fail, so check the return code. Or don't, as queries will become 2977Queries can fail, so check the return code. Or don't, as queries will
2327reliable at some point in the future. 2978become reliable at some point in the future.
2328 2979
2329=cut 2980=cut
2330 2981
2331sub cf::client::query { 2982sub cf::client::query {
2332 my ($self, $flags, $text, $cb) = @_; 2983 my ($self, $flags, $text, $cb) = @_;
2340 utf8::encode $text; 2991 utf8::encode $text;
2341 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2992 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342 2993
2343 $self->send_packet ($self->{query_queue}[0][0]) 2994 $self->send_packet ($self->{query_queue}[0][0])
2344 if @{ $self->{query_queue} } == 1; 2995 if @{ $self->{query_queue} } == 1;
2996
2997 1
2345} 2998}
2346 2999
2347cf::client->attach ( 3000cf::client->attach (
3001 on_connect => sub {
3002 my ($ns) = @_;
3003
3004 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3005 },
2348 on_reply => sub { 3006 on_reply => sub {
2349 my ($ns, $msg) = @_; 3007 my ($ns, $msg) = @_;
2350 3008
2351 # this weird shuffling is so that direct followup queries 3009 # this weird shuffling is so that direct followup queries
2352 # get handled first 3010 # get handled first
2364 } else { 3022 } else {
2365 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3023 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366 } 3024 }
2367 } 3025 }
2368 }, 3026 },
3027 on_exticmd => sub {
3028 my ($ns, $buf) = @_;
3029
3030 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3031
3032 if (ref $msg) {
3033 my ($type, $reply, @payload) =
3034 "ARRAY" eq ref $msg
3035 ? @$msg
3036 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3037
3038 my @reply;
3039
3040 if (my $cb = $EXTICMD{$type}) {
3041 @reply = $cb->($ns, @payload);
3042 }
3043
3044 $ns->ext_reply ($reply, @reply)
3045 if $reply;
3046
3047 } else {
3048 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3049 }
3050
3051 cf::override;
3052 },
2369); 3053);
2370 3054
2371=item $client->async (\&cb) 3055=item $client->async (\&cb)
2372 3056
2373Create a new coroutine, running the specified callback. The coroutine will 3057Create a new coroutine, running the specified callback. The coroutine will
2414our $safe = new Safe "safe"; 3098our $safe = new Safe "safe";
2415our $safe_hole = new Safe::Hole; 3099our $safe_hole = new Safe::Hole;
2416 3100
2417$SIG{FPE} = 'IGNORE'; 3101$SIG{FPE} = 'IGNORE';
2418 3102
2419$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3103$safe->permit_only (Opcode::opset qw(
3104 :base_core :base_mem :base_orig :base_math
3105 grepstart grepwhile mapstart mapwhile
3106 sort time
3107));
2420 3108
2421# here we export the classes and methods available to script code 3109# here we export the classes and methods available to script code
2422 3110
2423=pod 3111=pod
2424 3112
2425The following functions and methods are available within a safe environment: 3113The following functions and methods are available within a safe environment:
2426 3114
2427 cf::object contr pay_amount pay_player map 3115 cf::object
3116 contr pay_amount pay_player map x y force_find force_add destroy
3117 insert remove name archname title slaying race decrease split
3118
2428 cf::object::player player 3119 cf::object::player
2429 cf::player peaceful 3120 player
2430 cf::map trigger 3121
3122 cf::player
3123 peaceful
3124
3125 cf::map
3126 trigger
2431 3127
2432=cut 3128=cut
2433 3129
2434for ( 3130for (
2435 ["cf::object" => qw(contr pay_amount pay_player map)], 3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3132 insert remove inv nrof name archname title slaying race
3133 decrease split destroy change_exp)],
2436 ["cf::object::player" => qw(player)], 3134 ["cf::object::player" => qw(player)],
2437 ["cf::player" => qw(peaceful)], 3135 ["cf::player" => qw(peaceful)],
2438 ["cf::map" => qw(trigger)], 3136 ["cf::map" => qw(trigger)],
2439) { 3137) {
2440 no strict 'refs'; 3138 no strict 'refs';
2516# the server's init and main functions 3214# the server's init and main functions
2517 3215
2518sub load_facedata($) { 3216sub load_facedata($) {
2519 my ($path) = @_; 3217 my ($path) = @_;
2520 3218
3219 # HACK to clear player env face cache, we need some signal framework
3220 # for this (global event?)
3221 %ext::player_env::MUSIC_FACE_CACHE = ();
3222
3223 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3224
2521 warn "loading facedata from $path\n"; 3225 warn "loading facedata from $path\n";
2522 3226
2523 my $facedata; 3227 my $facedata;
2524 0 < aio_load $path, $facedata 3228 0 < aio_load $path, $facedata
2525 or die "$path: $!"; 3229 or die "$path: $!";
2527 $facedata = Coro::Storable::thaw $facedata; 3231 $facedata = Coro::Storable::thaw $facedata;
2528 3232
2529 $facedata->{version} == 2 3233 $facedata->{version} == 2
2530 or cf::cleanup "$path: version mismatch, cannot proceed."; 3234 or cf::cleanup "$path: version mismatch, cannot proceed.";
2531 3235
3236 # patch in the exptable
3237 $facedata->{resource}{"res/exp_table"} = {
3238 type => FT_RSRC,
3239 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3240 };
3241 cf::cede_to_tick;
3242
2532 { 3243 {
2533 my $faces = $facedata->{faceinfo}; 3244 my $faces = $facedata->{faceinfo};
2534 3245
2535 while (my ($face, $info) = each %$faces) { 3246 while (my ($face, $info) = each %$faces) {
2536 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3247 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248
2537 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3249 cf::face::set_visibility $idx, $info->{visibility};
3250 cf::face::set_magicmap $idx, $info->{magicmap};
2538 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2539 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2540 Coro::cede; 3253
3254 cf::cede_to_tick;
2541 } 3255 }
2542 3256
2543 while (my ($face, $info) = each %$faces) { 3257 while (my ($face, $info) = each %$faces) {
2544 next unless $info->{smooth}; 3258 next unless $info->{smooth};
3259
2545 my $idx = cf::face::find $face 3260 my $idx = cf::face::find $face
2546 or next; 3261 or next;
3262
2547 if (my $smooth = cf::face::find $info->{smooth}) { 3263 if (my $smooth = cf::face::find $info->{smooth}) {
3264 cf::face::set_smooth $idx, $smooth;
2548 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2549 } else { 3266 } else {
2550 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3267 warn "smooth face '$info->{smooth}' not found for face '$face'";
2551 } 3268 }
2552 Coro::cede; 3269
3270 cf::cede_to_tick;
2553 } 3271 }
2554 } 3272 }
2555 3273
2556 { 3274 {
2557 my $anims = $facedata->{animinfo}; 3275 my $anims = $facedata->{animinfo};
2558 3276
2559 while (my ($anim, $info) = each %$anims) { 3277 while (my ($anim, $info) = each %$anims) {
2560 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3278 cf::anim::set $anim, $info->{frames}, $info->{facings};
2561 Coro::cede; 3279 cf::cede_to_tick;
2562 } 3280 }
2563 3281
2564 cf::anim::invalidate_all; # d'oh 3282 cf::anim::invalidate_all; # d'oh
2565 } 3283 }
2566 3284
3285 {
3286 # TODO: for gcfclient pleasure, we should give resources
3287 # that gcfclient doesn't grok a >10000 face index.
3288 my $res = $facedata->{resource};
3289
3290 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) {
3292 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
3294
3295 if ($info->{type} & 1) {
3296 # prepend meta info
3297
3298 my $meta = $enc->encode ({
3299 name => $name,
3300 %{ $info->{meta} || {} },
3301 });
3302
3303 $data = pack "(w/a*)*", $meta, $info->{data};
3304 } else {
3305 $data = $info->{data};
3306 }
3307
3308 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3309 cf::face::set_type $idx, $info->{type};
3310 } else {
3311 $RESOURCE{$name} = $info;
3312 }
3313
3314 cf::cede_to_tick;
3315 }
3316 }
3317
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3319
2567 1 3320 1
2568} 3321}
2569 3322
3323cf::global->attach (on_resource_update => sub {
3324 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3325 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3326
3327 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3328 my $sound = $soundconf->{compat}[$_]
3329 or next;
3330
3331 my $face = cf::face::find "sound/$sound->[1]";
3332 cf::sound::set $sound->[0] => $face;
3333 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3334 }
3335
3336 while (my ($k, $v) = each %{$soundconf->{event}}) {
3337 my $face = cf::face::find "sound/$v";
3338 cf::sound::set $k => $face;
3339 }
3340 }
3341});
3342
3343register_exticmd fx_want => sub {
3344 my ($ns, $want) = @_;
3345
3346 while (my ($k, $v) = each %$want) {
3347 $ns->fx_want ($k, $v);
3348 }
3349};
3350
3351sub load_resource_file($) {
3352 my $guard = lock_acquire "load_resource_file";
3353
3354 my $status = load_resource_file_ $_[0];
3355 get_slot 0.1, 100;
3356 cf::arch::commit_load;
3357
3358 $status
3359}
3360
2570sub reload_regions { 3361sub reload_regions {
3362 # HACK to clear player env face cache, we need some signal framework
3363 # for this (global event?)
3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3365
2571 load_resource_file "$MAPDIR/regions" 3366 load_resource_file "$MAPDIR/regions"
2572 or die "unable to load regions file\n"; 3367 or die "unable to load regions file\n";
3368
3369 for (cf::region::list) {
3370 $_->{match} = qr/$_->{match}/
3371 if exists $_->{match};
3372 }
2573} 3373}
2574 3374
2575sub reload_facedata { 3375sub reload_facedata {
2576 load_facedata "$DATADIR/facedata" 3376 load_facedata "$DATADIR/facedata"
2577 or die "unable to load facedata\n"; 3377 or die "unable to load facedata\n";
2588} 3388}
2589 3389
2590sub reload_resources { 3390sub reload_resources {
2591 warn "reloading resource files...\n"; 3391 warn "reloading resource files...\n";
2592 3392
3393 reload_facedata;
3394 reload_archetypes;
2593 reload_regions; 3395 reload_regions;
2594 reload_facedata;
2595 #reload_archetypes;#d#
2596 reload_archetypes;
2597 reload_treasures; 3396 reload_treasures;
2598 3397
2599 warn "finished reloading resource files\n"; 3398 warn "finished reloading resource files\n";
2600} 3399}
2601 3400
2602sub init { 3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
2603 reload_resources; 3406 reload_resources;
2604} 3407}
2605 3408
2606sub cfg_load { 3409sub reload_config {
2607 open my $fh, "<:utf8", "$CONFDIR/config" 3410 open my $fh, "<:utf8", "$CONFDIR/config"
2608 or return; 3411 or return;
2609 3412
2610 local $/; 3413 local $/;
2611 *CFG = YAML::Syck::Load <$fh>; 3414 *CFG = YAML::Load <$fh>;
2612 3415
2613 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2614 3417
2615 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2616 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2627sub main { 3430sub main {
2628 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
2629 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
2630 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2631 (async { 3434 (async {
2632 Event::one_event; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT;
2633 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
2634 }; 3438 };
2635 3439
2636 cfg_load; 3440 {
3441 my $guard = freeze_mainloop;
3442 reload_config;
2637 db_init; 3443 db_init;
2638 load_extensions; 3444 load_extensions;
2639 3445
2640 $TICK_WATCHER->start; 3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3447 }
3448
2641 Event::loop; 3449 EV::loop;
2642} 3450}
2643 3451
2644############################################################################# 3452#############################################################################
2645# initialisation and cleanup 3453# initialisation and cleanup
2646 3454
2647# install some emergency cleanup handlers 3455# install some emergency cleanup handlers
2648BEGIN { 3456BEGIN {
3457 our %SIGWATCHER = ();
2649 for my $signal (qw(INT HUP TERM)) { 3458 for my $signal (qw(INT HUP TERM)) {
2650 Event->signal ( 3459 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2651 reentrant => 0,
2652 data => WF_AUTOCANCEL,
2653 signal => $signal,
2654 prio => 0,
2655 cb => sub {
2656 cf::cleanup "SIG$signal"; 3460 cf::cleanup "SIG$signal";
2657 },
2658 ); 3461 };
2659 } 3462 }
2660} 3463}
2661 3464
2662sub write_runtime { 3465sub write_runtime_sync {
2663 my $runtime = "$LOCALDIR/runtime"; 3466 my $runtime = "$LOCALDIR/runtime";
2664 3467
2665 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
2666 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
2667 3470
2693 and return; 3496 and return;
2694 3497
2695 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
2696 3499
2697 1 3500 1
3501}
3502
3503our $uuid_lock;
3504our $uuid_skip;
3505
3506sub write_uuid_sync($) {
3507 $uuid_skip ||= $_[0];
3508
3509 return if $uuid_lock;
3510 local $uuid_lock = 1;
3511
3512 my $uuid = "$LOCALDIR/uuid";
3513
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return;
3516
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3518 $uuid_skip = 0;
3519
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return;
3522
3523 # always fsync - this file is important
3524 aio_fsync $fh
3525 and return;
3526
3527 close $fh
3528 or return;
3529
3530 aio_rename "$uuid~", $uuid
3531 and return;
3532
3533 warn "uuid file written ($value).\n";
3534
3535 1
3536
3537}
3538
3539sub write_uuid($$) {
3540 my ($skip, $sync) = @_;
3541
3542 $sync ? write_uuid_sync $skip
3543 : async { write_uuid_sync $skip };
2698} 3544}
2699 3545
2700sub emergency_save() { 3546sub emergency_save() {
2701 my $freeze_guard = cf::freeze_mainloop; 3547 my $freeze_guard = cf::freeze_mainloop;
2702 3548
2708 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
2709 warn "begin emergency player save\n"; 3555 warn "begin emergency player save\n";
2710 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
2711 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
2712 $pl->valid or next; 3558 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2713 $pl->save; 3560 $pl->save;
2714 } 3561 }
2715 warn "end emergency player save\n"; 3562 warn "end emergency player save\n";
2716 3563
2717 warn "begin emergency map save\n"; 3564 warn "begin emergency map save\n";
2723 warn "end emergency map save\n"; 3570 warn "end emergency map save\n";
2724 3571
2725 warn "begin emergency database checkpoint\n"; 3572 warn "begin emergency database checkpoint\n";
2726 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
2727 warn "end emergency database checkpoint\n"; 3574 warn "end emergency database checkpoint\n";
3575
3576 warn "begin write uuid\n";
3577 write_uuid_sync 1;
3578 warn "end write uuid\n";
2728 }; 3579 };
2729 3580
2730 warn "leave emergency perl save\n"; 3581 warn "leave emergency perl save\n";
2731} 3582}
2732 3583
2747 warn "reloading..."; 3598 warn "reloading...";
2748 3599
2749 warn "entering sync_job"; 3600 warn "entering sync_job";
2750 3601
2751 cf::sync_job { 3602 cf::sync_job {
2752 cf::write_runtime; # external watchdog should not bark 3603 cf::write_runtime_sync; # external watchdog should not bark
2753 cf::emergency_save; 3604 cf::emergency_save;
2754 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
2755 3606
2756 warn "syncing database to disk"; 3607 warn "syncing database to disk";
2757 BDB::db_env_txn_checkpoint $DB_ENV; 3608 BDB::db_env_txn_checkpoint $DB_ENV;
2758 3609
2759 # if anything goes wrong in here, we should simply crash as we already saved 3610 # if anything goes wrong in here, we should simply crash as we already saved
2760
2761 warn "cancelling all WF_AUTOCANCEL watchers";
2762 for (Event::all_watchers) {
2763 $_->cancel if $_->data & WF_AUTOCANCEL;
2764 }
2765 3611
2766 warn "flushing outstanding aio requests"; 3612 warn "flushing outstanding aio requests";
2767 for (;;) { 3613 for (;;) {
2768 BDB::flush; 3614 BDB::flush;
2769 IO::AIO::flush; 3615 IO::AIO::flush;
2770 Coro::cede; 3616 Coro::cede_notself;
2771 last unless IO::AIO::nreqs || BDB::nreqs; 3617 last unless IO::AIO::nreqs || BDB::nreqs;
2772 warn "iterate..."; 3618 warn "iterate...";
2773 } 3619 }
2774 3620
2775 ++$RELOAD; 3621 ++$RELOAD;
2779 %EXT_CORO = (); 3625 %EXT_CORO = ();
2780 3626
2781 warn "removing commands"; 3627 warn "removing commands";
2782 %COMMAND = (); 3628 %COMMAND = ();
2783 3629
2784 warn "removing ext commands"; 3630 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3631 %EXTCMD = ();
3632 %EXTICMD = ();
2786 3633
2787 warn "unloading/nuking all extensions"; 3634 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3635 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3636 warn "... unloading $pkg";
2790 3637
2833 warn "reloading cf.pm"; 3680 warn "reloading cf.pm";
2834 require cf; 3681 require cf;
2835 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2836 3683
2837 warn "loading config and database again"; 3684 warn "loading config and database again";
2838 cf::cfg_load; 3685 cf::reload_config;
2839 3686
2840 warn "loading extensions"; 3687 warn "loading extensions";
2841 cf::load_extensions; 3688 cf::load_extensions;
2842 3689
2843 warn "reattaching attachments to objects/players"; 3690 warn "reattaching attachments to objects/players";
2850 warn "leaving sync_job"; 3697 warn "leaving sync_job";
2851 3698
2852 1 3699 1
2853 } or do { 3700 } or do {
2854 warn $@; 3701 warn $@;
2855 warn "error while reloading, exiting."; 3702 cf::cleanup "error while reloading, exiting.";
2856 exit 1;
2857 }; 3703 };
2858 3704
2859 warn "reloaded"; 3705 warn "reloaded";
2860}; 3706};
2861 3707
2863 3709
2864sub reload_perl() { 3710sub reload_perl() {
2865 # doing reload synchronously and two reloads happen back-to-back, 3711 # doing reload synchronously and two reloads happen back-to-back,
2866 # coro crashes during coro_state_free->destroy here. 3712 # coro crashes during coro_state_free->destroy here.
2867 3713
2868 $RELOAD_WATCHER ||= Event->timer ( 3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2869 reentrant => 0,
2870 after => 0,
2871 data => WF_AUTOCANCEL,
2872 cb => sub {
2873 do_reload_perl; 3715 do_reload_perl;
2874 undef $RELOAD_WATCHER; 3716 undef $RELOAD_WATCHER;
2875 },
2876 ); 3717 };
2877} 3718}
2878 3719
2879register_command "reload" => sub { 3720register_command "reload" => sub {
2880 my ($who, $arg) = @_; 3721 my ($who, $arg) = @_;
2881 3722
2882 if ($who->flag (FLAG_WIZ)) { 3723 if ($who->flag (FLAG_WIZ)) {
2883 $who->message ("reloading server."); 3724 $who->message ("reloading server.");
3725 async {
3726 $Coro::current->{desc} = "perl_reload";
2884 async { reload_perl }; 3727 reload_perl;
3728 };
2885 } 3729 }
2886}; 3730};
2887 3731
2888unshift @INC, $LIBDIR; 3732unshift @INC, $LIBDIR;
2889 3733
2891 3735
2892our @WAIT_FOR_TICK; 3736our @WAIT_FOR_TICK;
2893our @WAIT_FOR_TICK_BEGIN; 3737our @WAIT_FOR_TICK_BEGIN;
2894 3738
2895sub wait_for_tick { 3739sub wait_for_tick {
2896 return unless $TICK_WATCHER->is_active;
2897 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
2898 3741
2899 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
2900 push @WAIT_FOR_TICK, $signal; 3743 push @WAIT_FOR_TICK, $signal;
2901 $signal->wait; 3744 $signal->wait;
2902} 3745}
2903 3746
2904sub wait_for_tick_begin { 3747sub wait_for_tick_begin {
2905 return unless $TICK_WATCHER->is_active;
2906 return if $Coro::current == $Coro::main; 3748 return if tick_inhibit || $Coro::current == $Coro::main;
2907 3749
2908 my $signal = new Coro::Signal; 3750 my $signal = new Coro::Signal;
2909 push @WAIT_FOR_TICK_BEGIN, $signal; 3751 push @WAIT_FOR_TICK_BEGIN, $signal;
2910 $signal->wait; 3752 $signal->wait;
2911} 3753}
2912 3754
2913 my $min = 1e6;#d# 3755sub tick {
2914 my $avg = 10;
2915$TICK_WATCHER = Event->timer (
2916 reentrant => 0,
2917 parked => 1,
2918 prio => 0,
2919 at => $NEXT_TICK || $TICK,
2920 data => WF_AUTOCANCEL,
2921 cb => sub {
2922 if ($Coro::current != $Coro::main) { 3756 if ($Coro::current != $Coro::main) {
2923 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3757 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2924 unless ++$bug_warning > 10; 3758 unless ++$bug_warning > 10;
2925 return; 3759 return;
2926 } 3760 }
2927 3761
2928 $NOW = $tick_start = Event::time;
2929
2930 cf::server_tick; # one server iteration 3762 cf::server_tick; # one server iteration
2931 3763
2932 0 && sync_job {#d# 3764 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2933 for(1..10) { 3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2934 my $t = Event::time; 3766 Coro::async_pool {
2935 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3767 $Coro::current->{desc} = "runtime saver";
2936 or die; 3768 write_runtime_sync
2937 3769 or warn "ERROR: unable to write runtime file: $!";
2938 $map->width (50);
2939 $map->height (50);
2940 $map->alloc;
2941 $map->_load_objects ("/tmp/x.map", 1);
2942 my $t = Event::time - $t;
2943
2944 #next unless $t < 0.0013;#d#
2945 if ($t < $min) {
2946 $min = $t;
2947 }
2948 $avg = $avg * 0.99 + $t * 0.01;
2949 }
2950 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2951 exit 0;
2952 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2953 }; 3770 };
3771 }
2954 3772
2955 $RUNTIME += $TICK;
2956 $NEXT_TICK += $TICK;
2957
2958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2959 $NEXT_RUNTIME_WRITE = $NOW + 10;
2960 Coro::async_pool {
2961 write_runtime
2962 or warn "ERROR: unable to write runtime file: $!";
2963 };
2964 }
2965
2966# my $AFTER = Event::time;
2967# warn $AFTER - $NOW;#d#
2968
2969 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970 $sig->send; 3774 $sig->send;
2971 } 3775 }
2972 while (my $sig = shift @WAIT_FOR_TICK) { 3776 while (my $sig = shift @WAIT_FOR_TICK) {
2973 $sig->send; 3777 $sig->send;
2974 } 3778 }
2975 3779
2976 $NOW = Event::time; 3780 $LOAD = ($NOW - $TICK_START) / $TICK;
2977
2978 # if we are delayed by four ticks or more, skip them all
2979 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2980
2981 $TICK_WATCHER->at ($NEXT_TICK);
2982 $TICK_WATCHER->start;
2983
2984 $LOAD = ($NOW - $tick_start) / $TICK;
2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3781 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2986 3782
2987 _post_tick; 3783 if (0) {
2988 3784 if ($NEXT_TICK) {
2989 3785 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d#
3788 }
2990 }, 3789 }
2991); 3790}
2992 3791
2993{ 3792{
2994 BDB::max_poll_time $TICK * 0.1; 3793 # configure BDB
2995 $BDB_POLL_WATCHER = Event->io ( 3794
2996 reentrant => 0,
2997 fd => BDB::poll_fileno,
2998 poll => 'r',
2999 prio => 0,
3000 data => WF_AUTOCANCEL,
3001 cb => \&BDB::poll_cb,
3002 );
3003 BDB::min_parallel 8; 3795 BDB::min_parallel 8;
3004 3796 BDB::max_poll_reqs $TICK * 0.1;
3005 BDB::set_sync_prepare { 3797 $AnyEvent::BDB::WATCHER->priority (1);
3006 my $status;
3007 my $current = $Coro::current;
3008 (
3009 sub {
3010 $status = $!;
3011 $current->ready; undef $current;
3012 },
3013 sub {
3014 Coro::schedule while defined $current;
3015 $! = $status;
3016 },
3017 )
3018 };
3019 3798
3020 unless ($DB_ENV) { 3799 unless ($DB_ENV) {
3021 $DB_ENV = BDB::db_env_create; 3800 $DB_ENV = BDB::db_env_create;
3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3802 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3803 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3804 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3805 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3022 3806
3023 cf::sync_job { 3807 cf::sync_job {
3024 eval { 3808 eval {
3025 BDB::db_env_open 3809 BDB::db_env_open
3026 $DB_ENV, 3810 $DB_ENV,
3028 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3812 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3029 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3813 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3030 0666; 3814 0666;
3031 3815
3032 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3816 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3033
3034 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3035 $DB_ENV->set_lk_detect;
3036 }; 3817 };
3037 3818
3038 cf::cleanup "db_env_open(db): $@" if $@; 3819 cf::cleanup "db_env_open(db): $@" if $@;
3039 }; 3820 };
3040 } 3821 }
3822
3823 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3824 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3825 };
3826 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3827 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3828 };
3829 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3830 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3831 };
3041} 3832}
3042 3833
3043{ 3834{
3835 # configure IO::AIO
3836
3044 IO::AIO::min_parallel 8; 3837 IO::AIO::min_parallel 8;
3045
3046 undef $Coro::AIO::WATCHER;
3047 IO::AIO::max_poll_time $TICK * 0.1; 3838 IO::AIO::max_poll_time $TICK * 0.1;
3048 $AIO_POLL_WATCHER = Event->io ( 3839 undef $AnyEvent::AIO::WATCHER;
3049 reentrant => 0,
3050 data => WF_AUTOCANCEL,
3051 fd => IO::AIO::poll_fileno,
3052 poll => 'r',
3053 prio => 6,
3054 cb => \&IO::AIO::poll_cb,
3055 );
3056} 3840}
3057 3841
3058my $_log_backtrace; 3842my $_log_backtrace;
3059 3843
3060sub _log_backtrace { 3844sub _log_backtrace {
3064 3848
3065 # limit the # of concurrent backtraces 3849 # limit the # of concurrent backtraces
3066 if ($_log_backtrace < 2) { 3850 if ($_log_backtrace < 2) {
3067 ++$_log_backtrace; 3851 ++$_log_backtrace;
3068 async { 3852 async {
3853 $Coro::current->{desc} = "abt $msg";
3854
3069 my @bt = fork_call { 3855 my @bt = fork_call {
3070 @addr = map { sprintf "%x", $_ } @addr; 3856 @addr = map { sprintf "%x", $_ } @addr;
3071 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3857 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3072 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3858 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3073 or die "addr2line: $!"; 3859 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines