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.342 by root, Sun Aug 26 15:31:02 2007 UTC vs.
Revision 1.403 by root, Mon Dec 17 07:09:18 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS 1.4 (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML::Syck ();
32use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 43
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
47 46
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 76our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 79our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
83 81
84our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 86our $DB_ENV;
86 87
87our %CFG; 88our %CFG;
88 89
89our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 91our $RUNTIME;
92our $NOW;
91 93
92our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
95 97
96# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 100
159 161
160The raw value load value from the last tick. 162The raw value load value from the last tick.
161 163
162=item %cf::CFG 164=item %cf::CFG
163 165
164Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 167from wherever your confdir points to.
166 168
167=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
168 170
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 189 $msg .= "\n"
188 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
189 191
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 193
192 utf8::encode $msg;
193 LOG llevError, $msg; 194 LOG llevError, $msg;
194 }; 195 };
195} 196}
196 197
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
213)) { 214)) {
214 no strict 'refs'; 215 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 217}
217 218
218$Event::DIED = sub { 219$EV::DIED = sub {
219 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
220}; 221};
221 222
222############################################################################# 223#############################################################################
223 224
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 248 $d
248 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
249} 250}
250 251
251=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
252 253
253Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
254 255
255=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
256 257
257Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
258 259
259=cut 260=cut
260 261
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 263
263sub to_json ($) { $json_coder->encode ($_[0]) } 264sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 265sub decode_json($) { $json_coder->decode ($_[0]) }
265 266
266=item cf::lock_wait $string 267=item cf::lock_wait $string
267 268
268Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
269 270
272Wait until the given lock is available and then acquires it and returns 273Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
275returned. 276returned.
276 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
277Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
279 283
280=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
281 285
282Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
283 287
284=cut 288=cut
285 289
286our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
287 292
288sub lock_wait($) { 293sub lock_wait($) {
289 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
290 300
291 # wait for lock, if any 301 # wait for lock, if any
292 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 304 Coro::schedule;
300 310
301 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
302 lock_wait $key; 312 lock_wait $key;
303 313
304 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
305 316
306 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
309 } 321 }
310} 322}
311 323
323 }; 335 };
324 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
325 $guard 337 $guard
326} 338}
327 339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
353}
354
328=item cf::get_slot $time[, $priority[, $name]] 355=item cf::get_slot $time[, $priority[, $name]]
329 356
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 357Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds 358This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede. 359of cpu time till the next tick. The slot is only valid till the next cede.
341our @SLOT_QUEUE; 368our @SLOT_QUEUE;
342our $SLOT_QUEUE; 369our $SLOT_QUEUE;
343 370
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
346 my $signal = new Coro::Signal; 375 my $signal = new Coro::Signal;
347 376
348 while () { 377 while () {
349 next_job: 378 next_job:
350 my $avail = cf::till_tick; 379 my $avail = cf::till_tick;
358 } 387 }
359 } 388 }
360 } 389 }
361 390
362 if (@SLOT_QUEUE) { 391 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 393 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 394 $signal->wait;
366 } else { 395 } else {
367 Coro::schedule; 396 Coro::schedule;
368 } 397 }
391 420
392BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
393 422
394=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
395 424
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 425The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 426is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 428acceptable.
400 429
401If it must be done, put the blocking parts into C<sync_job>. This will run 430If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
407 436
408sub sync_job(&) { 437sub sync_job(&) {
409 my ($job) = @_; 438 my ($job) = @_;
410 439
411 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 441 my $time = EV::time;
413 442
414 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
416 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
417 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
418 # (but this is cancel-safe) 449 # (but this is cancel-safe)
419 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
420 451
421 my $busy = 1; 452 my $busy = 1;
422 my @res; 453 my @res;
423 454
424 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 457 @res = eval { $job->() };
426 warn $@ if $@; 458 warn $@ if $@;
427 undef $busy; 459 undef $busy;
428 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
429 461
430 while ($busy) { 462 while ($busy) {
431 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
432 } 467 }
468 }
433 469
434 $time = Event::time - $time; 470 $time = EV::time - $time;
435 471
436 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438 474
439 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
469=item fork_call { }, $args 505=item fork_call { }, $args
470 506
471Executes the given code block with the given arguments in a seperate 507Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 508process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 509Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 510never block itself or use any form of event handling.
475 511
476=cut 512=cut
477 513
478sub fork_call(&@) { 514sub fork_call(&@) {
479 my ($cb, @args) = @_; 515 my ($cb, @args) = @_;
480 516
481 # we seemingly have to make a local copy of the whole thing, 517 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 518 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 519 # TODO: investigate and fix (likely this will be rather laborious)
484 520
485 my @res = Coro::Util::fork_eval { 521 my @res = Coro::Util::fork_eval {
486 reset_signals; 522 reset_signals;
487 &$cb 523 &$cb
488 }, @args; 524 }, @args;
497=item cf::db_put $family => $key => $value 533=item cf::db_put $family => $key => $value
498 534
499Stores the given C<$value> in the family. It can currently store binary 535Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 536data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 537
538=item $db = cf::db_table "name"
539
540Create and/or open a new database table. The string must not be "db" and must be unique
541within each server.
542
502=cut 543=cut
544
545sub db_table($) {
546 my ($name) = @_;
547 my $db = BDB::db_create $DB_ENV;
548
549 eval {
550 $db->set_flags (BDB::CHKSUM);
551
552 utf8::encode $name;
553 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
554 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
555 cf::cleanup "db_open(db): $!" if $!;
556 };
557 cf::cleanup "db_open(db): $@" if $@;
558
559 $db
560}
503 561
504our $DB; 562our $DB;
505 563
506sub db_init { 564sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 565 cf::sync_job {
511 eval { 566 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 567 };
521} 568}
522 569
523sub db_get($$) { 570sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 571 my $key = "$_[0]/$_[1]";
525 572
575 if (1) { 622 if (1) {
576 $md5 = 623 $md5 =
577 join "\x00", 624 join "\x00",
578 $processversion, 625 $processversion,
579 map { 626 map {
580 Coro::cede; 627 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 628 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 629 } 0.. $#$src;
583 630
584 631
585 my $dbmd5 = db_get cache => "$id/md5"; 632 my $dbmd5 = db_get cache => "$id/md5";
629attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
631 678
632In the following description, CLASS can be any of C<global>, C<object> 679In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 680C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 681Deliantra).
635 682
636=over 4 683=over 4
637 684
638=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
639 686
937 984
938=cut 985=cut
939 986
940############################################################################# 987#############################################################################
941# object support 988# object support
942#
943 989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
944sub _can_merge { 1023sub _can_merge {
945 my ($ob1, $ob2) = @_; 1024 my ($ob1, $ob2) = @_;
946 1025
947 local $Storable::canonical = 1; 1026 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1027
951 $fob1 eq $fob2 1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
952} 1030}
953 1031
954sub reattach { 1032sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1034 my ($obj) = @_;
978cf::attachable->attach ( 1056cf::attachable->attach (
979 prio => -1000000, 1057 prio => -1000000,
980 on_instantiate => sub { 1058 on_instantiate => sub {
981 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
982 1060
983 $data = from_json $data; 1061 $data = decode_json $data;
984 1062
985 for (@$data) { 1063 for (@$data) {
986 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
987 1065
988 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1082sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
1006 1084
1007 sync_job { 1085 sync_job {
1008 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
1011 1090
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1095 close $fh;
1017 1096
1018 if (@$objs) { 1097 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1103 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1105 }
1034 } 1113 }
1035 } else { 1114 } else {
1036 aio_unlink $filename; 1115 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
1038 } 1117 }
1039 } 1118 };
1040} 1119}
1041 1120
1042sub object_freezer_as_string { 1121sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
1044 1123
1056 or return; 1135 or return;
1057 1136
1058 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1139 or return;
1140
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
1062 } 1143 }
1063 1144
1145 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
1148
1066 return ($data, $av); 1149 ($data, $av)
1067} 1150}
1068 1151
1069=head2 COMMAND CALLBACKS 1152=head2 COMMAND CALLBACKS
1070 1153
1071=over 4 1154=over 4
1257 1340
1258=head3 cf::player 1341=head3 cf::player
1259 1342
1260=over 4 1343=over 4
1261 1344
1345=item cf::player::num_playing
1346
1347Returns the official number of playing players, as per the Crossfire metaserver rules.
1348
1349=cut
1350
1351sub num_playing {
1352 scalar grep
1353 $_->ob->map
1354 && !$_->hidden
1355 && !$_->ob->flag (cf::FLAG_WIZ),
1356 cf::player::list
1357}
1358
1262=item cf::player::find $login 1359=item cf::player::find $login
1263 1360
1264Returns the given player object, loading it if necessary (might block). 1361Returns the given player object, loading it if necessary (might block).
1265 1362
1266=cut 1363=cut
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1398 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1399 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1400 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1402
1306 my $pl = load_pl path $login 1403 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1404 or return;
1405
1406 my $pl = cf::player::load_pl $f
1407 or return;
1408 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1309 } 1411 }
1310 } 1412 }
1311} 1413}
1312 1414
1322 1424
1323 aio_mkdir playerdir $pl, 0770; 1425 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1426 $pl->{last_save} = $cf::RUNTIME;
1325 1427
1326 $pl->save_pl ($path); 1428 $pl->save_pl ($path);
1327 Coro::cede; 1429 cf::cede_to_tick;
1328} 1430}
1329 1431
1330sub new($) { 1432sub new($) {
1331 my ($login) = @_; 1433 my ($login) = @_;
1332 1434
1410 or return []; 1512 or return [];
1411 1513
1412 my @logins; 1514 my @logins;
1413 1515
1414 for my $login (@$dirs) { 1516 for my $login (@$dirs) {
1517 my $path = path $login;
1518
1519 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1522 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1523 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 }
1418 1525
1419 utf8::decode $login; 1526 utf8::decode $login;
1420 push @logins, $login; 1527 push @logins, $login;
1421 } 1528 }
1422 1529
1455 1562
1456Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1457 1564
1458=cut 1565=cut
1459 1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1460sub expand_cfpod { 1578sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1462 1580
1463 # escape & and < 1581 my $xml;
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466 1582
1467 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1468 1586
1469 1 while 1587 $group =~ s/&/&amp;/g;
1470 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1474 # replace G<male|female> tags 1592 ([BCGHITU])
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1593 <
1476 $self->gender ? $2 : $1 1594 (?:
1477 }ge 1595 ([^<>]*) (?{ $group = $^N })
1478 # replace H<hint text> 1596 | < $interior >
1479 || s{H<([^\>]*)>} 1597 )
1598 >
1599 %gcsx
1480 { 1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "") 1620 "")
1484 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1485 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1486 1632
1633 for ($xml) {
1487 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1489 1636
1490 # compress some whitespace 1637 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1495 1643
1496 $_ 1644 $xml
1497} 1645}
1646
1647no re 'eval';
1498 1648
1499sub hintmode { 1649sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode} 1651 $_[0]{hintmode}
1502} 1652}
1746 1896
1747sub load_header_from($) { 1897sub load_header_from($) {
1748 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1749 1899
1750 utf8::encode $path; 1900 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1756 1909
1757 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1758 1911
1759 1 1912 1
1760} 1913}
1814sub find { 1967sub find {
1815 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1816 1969
1817 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1818 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1820 1974
1821 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path"; 1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1823 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1824 or return; 1980 or return;
1825 1981
1826 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1827 1983
1829 or return; 1985 or return;
1830 1986
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard1;
1991 undef $guard2;
1834 $map->reset; 1992 $map->reset;
1835 undef $guard;
1836 return find $path; 1993 return find $path;
1837 } 1994 }
1838 1995
1839 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1840 } 1997 }
1849 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1850 2007
1851 my $path = $self->{path}; 2008 my $path = $self->{path};
1852 2009
1853 { 2010 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1855 2012
2013 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2015
1858 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1859 2017
1860 $self->alloc; 2018 $self->alloc;
1861 2019
1862 $self->pre_load; 2020 $self->pre_load;
1863 Coro::cede; 2021 cf::cede_to_tick;
1864 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1866 or return; 2026 or return;
1867 2027
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1870 2030
1871 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2032 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2035 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1876 } 2039 }
1877 } 2040 }
1878 2041
1879 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1880 # now do the right thing for maps 2045 # now do the right thing for maps
1881 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2048 unless $self->difficulty;
1884 Coro::cede; 2049 cf::cede_to_tick;
1885 2050
1886 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2052 $self->decay_objects;
1888 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1889 $self->update_buttons; 2054 $self->update_buttons;
1890 Coro::cede; 2055 cf::cede_to_tick;
1891 $self->set_darkness_map; 2056 $self->set_darkness_map;
1892 Coro::cede; 2057 cf::cede_to_tick;
1893 $self->activate; 2058 $self->activate;
1894 } 2059 }
1895 2060
1896 $self->{last_save} = $cf::RUNTIME; 2061 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2062 $self->last_access ($cf::RUNTIME);
1968 } 2133 }
1969 2134
1970 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
1971 2136
1972 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1973 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2142 if (my $map = find $k) {
1976 $map->load if $v; 2143 $map->load if $v;
1977 } 2144 }
1987} 2154}
1988 2155
1989sub save { 2156sub save {
1990 my ($self) = @_; 2157 my ($self) = @_;
1991 2158
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2160
1994 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
1995 2162
1996 return unless $self->dirty; 2163 return unless $self->dirty;
1997 2164
2003 return if $self->{deny_save}; 2170 return if $self->{deny_save};
2004 2171
2005 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
2006 2173
2007 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2009 }; 2177 };
2010 2178
2011 if ($uniq) { 2179 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2020 my ($self) = @_; 2188 my ($self) = @_;
2021 2189
2022 # save first because save cedes 2190 # save first because save cedes
2023 $self->save; 2191 $self->save;
2024 2192
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2193 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2194
2027 return if $self->players; 2195 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2197 return if $self->{deny_save};
2030 2198
2199 $self->in_memory (cf::MAP_SWAPPED);
2200
2201 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2203 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2204}
2034 2205
2035sub reset_at { 2206sub reset_at {
2036 my ($self) = @_; 2207 my ($self) = @_;
2037 2208
2069 if $uniq; 2240 if $uniq;
2070 } 2241 }
2071 2242
2072 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
2073 2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2247 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2248
2078 $self->unlink_save; 2249 $self->unlink_save;
2079 $self->destroy; 2250 $self->destroy;
2080} 2251}
2081 2252
2082my $nuke_counter = "aaaa"; 2253my $nuke_counter = "aaaa";
2083 2254
2084sub nuke { 2255sub nuke {
2085 my ($self) = @_; 2256 my ($self) = @_;
2086 2257
2258 {
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2087 delete $cf::MAP{$self->path}; 2261 delete $cf::MAP{$self->path};
2088 2262
2089 $self->unlink_save; 2263 $self->unlink_save;
2090 2264
2091 bless $self, "cf::map"; 2265 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2266 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2267 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2268 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2269 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2270
2097 $cf::MAP{$self->path} = $self; 2271 $cf::MAP{$self->path} = $self;
2272 }
2098 2273
2099 $self->reset; # polite request, might not happen 2274 $self->reset; # polite request, might not happen
2100} 2275}
2101 2276
2102=item $maps = cf::map::tmp_maps 2277=item $maps = cf::map::tmp_maps
2178 2353
2179sub inv_recursive { 2354sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2355 inv_recursive_ inv $_[0]
2181} 2356}
2182 2357
2358=item $ref = $ob->ref
2359
2360creates and returns a persistent reference to an objetc that can be stored as a string.
2361
2362=item $ob = cf::object::deref ($refstring)
2363
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block.
2366
2367=cut
2368
2369sub deref {
2370 my ($ref) = @_;
2371
2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2373 my ($uuid, $name) = ($1, $2);
2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2375 or return;
2376 $pl->ob->uuid eq $uuid
2377 or return;
2378
2379 $pl->ob
2380 } else {
2381 warn "$ref: cannot resolve object reference\n";
2382 undef
2383 }
2384}
2385
2183package cf; 2386package cf;
2184 2387
2185=back 2388=back
2186 2389
2187=head3 cf::object::player 2390=head3 cf::object::player
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2549
2347 $self->enter_link; 2550 $self->enter_link;
2348 2551
2349 (async { 2552 (async {
2553 $Coro::current->{desc} = "player::goto $path $x $y";
2554
2555 # *tag paths override both path and x|y
2556 if ($path =~ /^\*(.*)$/) {
2557 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2558 my $ob = $obs[rand @obs];
2559
2560 # see if we actually can go there
2561 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2562 $ob = $obs[rand @obs];
2563 } else {
2564 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 }
2566 # else put us there anyways for now #d#
2567
2568 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2569 } else {
2570 ($path, $x, $y) = (undef, undef, undef);
2571 }
2572 }
2573
2350 my $map = eval { 2574 my $map = eval {
2351 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2352 2576
2353 if ($map) { 2577 if ($map) {
2354 $map = $map->customise_for ($self); 2578 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2579 $map = $check->($map) if $check && $map;
2356 } else { 2580 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2581 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2582 }
2359 2583
2360 $map 2584 $map
2361 }; 2585 };
2362 2586
2415 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2416 } 2640 }
2417 2641
2418 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2419 2643
2420 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2421 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2422 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2423 2647
2424 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2425 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
2452 # if exit is damned, update players death & WoR home-position 2676 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp) 2677 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED); 2678 if $exit->flag (FLAG_DAMNED);
2455 2679
2456 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2457 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2458 unless (eval { 2684 unless (eval {
2459 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2460 2686
2461 1; 2687 1;
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2722the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2498 2724
2499=cut 2725=cut
2500 2726
2727# non-persistent channels (usually the info channel)
2728our %CHANNEL = (
2729 "c/identify" => {
2730 id => "infobox",
2731 title => "Identify",
2732 reply => undef,
2733 tooltip => "Items recently identified",
2734 },
2735 "c/examine" => {
2736 id => "infobox",
2737 title => "Examine",
2738 reply => undef,
2739 tooltip => "Signs and other items you examined",
2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2747 "c/lookat" => {
2748 id => "infobox",
2749 title => "Look",
2750 reply => undef,
2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2776 },
2777);
2778
2501sub cf::client::send_msg { 2779sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2781
2504 $msg = $self->pl->expand_cfpod ($msg); 2782 $msg = $self->pl->expand_cfpod ($msg);
2505 2783
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 2785
2786 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2508 if (ref $channel) { 2795 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2796 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2797 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2798 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2799 $self->ext_msg (channel_info => $channel)
2800 if $self->can_msg;
2513 } 2801 }
2514 2802
2515 $channel = $channel->{id}; 2803 $channel = $channel->{id};
2516 } 2804 }
2517 2805
2558=cut 2846=cut
2559 2847
2560sub cf::client::ext_msg($$@) { 2848sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2849 my ($self, $type, @msg) = @_;
2562 2850
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2851 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2853 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2854 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2856 }
2571} 2857}
2572 2858
2579sub cf::client::ext_reply($$@) { 2865sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2866 my ($self, $id, @msg) = @_;
2581 2867
2582 if ($self->extcmd == 2) { 2868 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2870 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2871 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2872 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2874 }
2589} 2875}
2731=pod 3017=pod
2732 3018
2733The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2734 3020
2735 cf::object 3021 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 3022 contr pay_amount pay_player map x y force_find force_add destroy
2737 insert remove name archname title slaying race decrease_ob_nr 3023 insert remove name archname title slaying race decrease_ob_nr
2738 3024
2739 cf::object::player 3025 cf::object::player
2740 player 3026 player
2741 3027
2748=cut 3034=cut
2749 3035
2750for ( 3036for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race 3038 insert remove inv name archname title slaying race
2753 decrease_ob_nr)], 3039 decrease_ob_nr destroy)],
2754 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2755 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2756 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2757) { 3043) {
2758 no strict 'refs'; 3044 no strict 'refs';
2834# the server's init and main functions 3120# the server's init and main functions
2835 3121
2836sub load_facedata($) { 3122sub load_facedata($) {
2837 my ($path) = @_; 3123 my ($path) = @_;
2838 3124
3125 # HACK to clear player env face cache, we need some signal framework
3126 # for this (global event?)
3127 %ext::player_env::MUSIC_FACE_CACHE = ();
3128
2839 my $enc = JSON::XS->new->utf8->canonical; 3129 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2840 3130
2841 warn "loading facedata from $path\n"; 3131 warn "loading facedata from $path\n";
2842 3132
2843 my $facedata; 3133 my $facedata;
2844 0 < aio_load $path, $facedata 3134 0 < aio_load $path, $facedata
2954 $ns->fx_want ($k, $v); 3244 $ns->fx_want ($k, $v);
2955 } 3245 }
2956}; 3246};
2957 3247
2958sub reload_regions { 3248sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = ();
3252
2959 load_resource_file "$MAPDIR/regions" 3253 load_resource_file "$MAPDIR/regions"
2960 or die "unable to load regions file\n"; 3254 or die "unable to load regions file\n";
2961 3255
2962 for (cf::region::list) { 3256 for (cf::region::list) {
2963 $_->{match} = qr/$_->{match}/ 3257 $_->{match} = qr/$_->{match}/
2999 3293
3000sub init { 3294sub init {
3001 reload_resources; 3295 reload_resources;
3002} 3296}
3003 3297
3004sub cfg_load { 3298sub reload_config {
3005 open my $fh, "<:utf8", "$CONFDIR/config" 3299 open my $fh, "<:utf8", "$CONFDIR/config"
3006 or return; 3300 or return;
3007 3301
3008 local $/; 3302 local $/;
3009 *CFG = YAML::Syck::Load <$fh>; 3303 *CFG = YAML::Syck::Load <$fh>;
3025sub main { 3319sub main {
3026 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
3027 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
3028 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3029 (async { 3323 (async {
3030 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
3031 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
3032 }; 3327 };
3033 3328
3034 cfg_load; 3329 reload_config;
3035 db_init; 3330 db_init;
3036 load_extensions; 3331 load_extensions;
3037 3332
3038 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3039 Event::loop; 3335 EV::loop;
3040} 3336}
3041 3337
3042############################################################################# 3338#############################################################################
3043# initialisation and cleanup 3339# initialisation and cleanup
3044 3340
3045# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
3046BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
3047 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
3048 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3049 reentrant => 0,
3050 data => WF_AUTOCANCEL,
3051 signal => $signal,
3052 prio => 0,
3053 cb => sub {
3054 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
3055 },
3056 ); 3347 };
3057 } 3348 }
3058} 3349}
3059 3350
3060sub write_runtime { 3351sub write_runtime {
3061 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
3106 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
3107 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
3108 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
3109 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
3110 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3111 $pl->save; 3403 $pl->save;
3112 } 3404 }
3113 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
3114 3406
3115 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
3154 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3155 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3156 3448
3157 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
3158 3450
3159 warn "cancelling all WF_AUTOCANCEL watchers";
3160 for (Event::all_watchers) {
3161 $_->cancel if $_->data & WF_AUTOCANCEL;
3162 }
3163
3164 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3165 for (;;) { 3452 for (;;) {
3166 BDB::flush; 3453 BDB::flush;
3167 IO::AIO::flush; 3454 IO::AIO::flush;
3168 Coro::cede; 3455 Coro::cede_notself;
3169 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3170 warn "iterate..."; 3457 warn "iterate...";
3171 } 3458 }
3172 3459
3173 ++$RELOAD; 3460 ++$RELOAD;
3232 warn "reloading cf.pm"; 3519 warn "reloading cf.pm";
3233 require cf; 3520 require cf;
3234 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3235 3522
3236 warn "loading config and database again"; 3523 warn "loading config and database again";
3237 cf::cfg_load; 3524 cf::reload_config;
3238 3525
3239 warn "loading extensions"; 3526 warn "loading extensions";
3240 cf::load_extensions; 3527 cf::load_extensions;
3241 3528
3242 warn "reattaching attachments to objects/players"; 3529 warn "reattaching attachments to objects/players";
3262 3549
3263sub reload_perl() { 3550sub reload_perl() {
3264 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3265 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3266 3553
3267 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3268 reentrant => 0,
3269 after => 0,
3270 data => WF_AUTOCANCEL,
3271 cb => sub {
3272 do_reload_perl;
3273 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3274 }, 3556 do_reload_perl;
3275 ); 3557 };
3276} 3558}
3277 3559
3278register_command "reload" => sub { 3560register_command "reload" => sub {
3279 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3280 3562
3281 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3282 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3283 async { reload_perl }; 3567 reload_perl;
3568 };
3284 } 3569 }
3285}; 3570};
3286 3571
3287unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3288 3573
3307 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3308 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3309 $signal->wait; 3594 $signal->wait;
3310} 3595}
3311 3596
3312 my $min = 1e6;#d# 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3313 my $avg = 10;
3314$TICK_WATCHER = Event->timer (
3315 reentrant => 0,
3316 parked => 1,
3317 prio => 0,
3318 at => $NEXT_TICK || $TICK,
3319 data => WF_AUTOCANCEL,
3320 cb => sub {
3321 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3322 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3323 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3324 return; 3601 return;
3325 } 3602 }
3326 3603
3327 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3328 3605
3329 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3330 3607
3331 0 && sync_job {#d# 3608 $RUNTIME += $TICK;
3332 for(1..10) { 3609 $NEXT_TICK += $TICK;
3333 my $t = Event::time;
3334 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3335 or die;
3336 3610
3337 $map->width (50); 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3338 $map->height (50); 3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3339 $map->alloc; 3613 Coro::async_pool {
3340 $map->_load_objects ("/tmp/x.map", 1); 3614 $Coro::current->{desc} = "runtime saver";
3341 my $t = Event::time - $t; 3615 write_runtime
3342 3616 or warn "ERROR: unable to write runtime file: $!";
3343 #next unless $t < 0.0013;#d#
3344 if ($t < $min) {
3345 $min = $t;
3346 }
3347 $avg = $avg * 0.99 + $t * 0.01;
3348 }
3349 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3350 exit 0;
3351 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3352 }; 3617 };
3618 }
3353 3619
3354 $RUNTIME += $TICK;
3355 $NEXT_TICK += $TICK;
3356
3357 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3358 $NEXT_RUNTIME_WRITE = $NOW + 10;
3359 Coro::async_pool {
3360 write_runtime
3361 or warn "ERROR: unable to write runtime file: $!";
3362 };
3363 }
3364
3365# my $AFTER = Event::time;
3366# warn $AFTER - $NOW;#d#
3367
3368 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3369 $sig->send; 3621 $sig->send;
3370 } 3622 }
3371 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3372 $sig->send; 3624 $sig->send;
3373 } 3625 }
3374 3626
3375 $NOW = Event::time;
3376
3377 # if we are delayed by four ticks or more, skip them all
3378 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3379
3380 $TICK_WATCHER->at ($NEXT_TICK);
3381 $TICK_WATCHER->start;
3382
3383 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3384 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3385 3629
3386 _post_tick; 3630 _post_tick;
3387 3631};
3388 3632$TICK_WATCHER->priority (EV::MAXPRI);
3389 },
3390);
3391 3633
3392{ 3634{
3393 BDB::max_poll_time $TICK * 0.1; 3635 # configure BDB
3394 $BDB_POLL_WATCHER = Event->io ( 3636
3395 reentrant => 0,
3396 fd => BDB::poll_fileno,
3397 poll => 'r',
3398 prio => 0,
3399 data => WF_AUTOCANCEL,
3400 cb => \&BDB::poll_cb,
3401 );
3402 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
3403 3638 BDB::max_poll_reqs $TICK * 0.1;
3404 BDB::set_sync_prepare { 3639 $Coro::BDB::WATCHER->priority (1);
3405 my $status;
3406 my $current = $Coro::current;
3407 (
3408 sub {
3409 $status = $!;
3410 $current->ready; undef $current;
3411 },
3412 sub {
3413 Coro::schedule while defined $current;
3414 $! = $status;
3415 },
3416 )
3417 };
3418 3640
3419 unless ($DB_ENV) { 3641 unless ($DB_ENV) {
3420 $DB_ENV = BDB::db_env_create; 3642 $DB_ENV = BDB::db_env_create;
3643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3644 | BDB::LOG_AUTOREMOVE, 1);
3645 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3646 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3421 3647
3422 cf::sync_job { 3648 cf::sync_job {
3423 eval { 3649 eval {
3424 BDB::db_env_open 3650 BDB::db_env_open
3425 $DB_ENV, 3651 $DB_ENV,
3427 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3653 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3428 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3654 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3429 0666; 3655 0666;
3430 3656
3431 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3657 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3432
3433 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3434 $DB_ENV->set_lk_detect;
3435 }; 3658 };
3436 3659
3437 cf::cleanup "db_env_open(db): $@" if $@; 3660 cf::cleanup "db_env_open(db): $@" if $@;
3438 }; 3661 };
3439 } 3662 }
3663
3664 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3665 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3666 };
3667 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3668 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3669 };
3670 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3671 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3672 };
3440} 3673}
3441 3674
3442{ 3675{
3676 # configure IO::AIO
3677
3443 IO::AIO::min_parallel 8; 3678 IO::AIO::min_parallel 8;
3444
3445 undef $Coro::AIO::WATCHER;
3446 IO::AIO::max_poll_time $TICK * 0.1; 3679 IO::AIO::max_poll_time $TICK * 0.1;
3447 $AIO_POLL_WATCHER = Event->io ( 3680 $Coro::AIO::WATCHER->priority (1);
3448 reentrant => 0,
3449 data => WF_AUTOCANCEL,
3450 fd => IO::AIO::poll_fileno,
3451 poll => 'r',
3452 prio => 6,
3453 cb => \&IO::AIO::poll_cb,
3454 );
3455} 3681}
3456 3682
3457my $_log_backtrace; 3683my $_log_backtrace;
3458 3684
3459sub _log_backtrace { 3685sub _log_backtrace {
3463 3689
3464 # limit the # of concurrent backtraces 3690 # limit the # of concurrent backtraces
3465 if ($_log_backtrace < 2) { 3691 if ($_log_backtrace < 2) {
3466 ++$_log_backtrace; 3692 ++$_log_backtrace;
3467 async { 3693 async {
3694 $Coro::current->{desc} = "abt $msg";
3695
3468 my @bt = fork_call { 3696 my @bt = fork_call {
3469 @addr = map { sprintf "%x", $_ } @addr; 3697 @addr = map { sprintf "%x", $_ } @addr;
3470 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3698 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3471 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3699 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3472 or die "addr2line: $!"; 3700 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines