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.352 by root, Sun Sep 2 04:57:14 2007 UTC vs.
Revision 1.408 by root, Mon Jan 14 10:12:12 2008 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 1.86;
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 (); 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 ();
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
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 43
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 45
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 47
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
75 72
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 74our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 77our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
83 79
84our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 84our $DB_ENV;
86 85
87our %CFG; 86our %CFG;
88 87
89our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 89our $RUNTIME;
90our $NOW;
91 91
92our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
95 95
96# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 98
159 159
160The raw value load value from the last tick. 160The raw value load value from the last tick.
161 161
162=item %cf::CFG 162=item %cf::CFG
163 163
164Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 165from wherever your confdir points to.
166 166
167=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
168 168
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 187 $msg .= "\n"
188 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
189 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 191
192 utf8::encode $msg;
193 LOG llevError, $msg; 192 LOG llevError, $msg;
194 }; 193 };
195} 194}
195
196$Coro::State::DIEHOOK = sub {
197 warn Carp::longmess $_[0];
198 Coro::terminate;
199};
196 200
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
213)) { 217)) {
214 no strict 'refs'; 218 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 220}
217 221
218$Event::DIED = sub { 222$EV::DIED = sub {
219 warn "error in event callback: @_"; 223 warn "error in event callback: @_";
220}; 224};
221 225
222############################################################################# 226#############################################################################
223 227
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 250 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 251 $d
248 } || "[unable to dump $_[0]: '$@']"; 252 } || "[unable to dump $_[0]: '$@']";
249} 253}
250 254
251=item $ref = cf::from_json $json 255=item $ref = cf::decode_json $json
252 256
253Converts a JSON string into the corresponding perl data structure. 257Converts a JSON string into the corresponding perl data structure.
254 258
255=item $json = cf::to_json $ref 259=item $json = cf::encode_json $ref
256 260
257Converts a perl data structure into its JSON representation. 261Converts a perl data structure into its JSON representation.
258 262
259=cut 263=cut
260 264
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 266
263sub to_json ($) { $json_coder->encode ($_[0]) } 267sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 268sub decode_json($) { $json_coder->decode ($_[0]) }
265 269
266=item cf::lock_wait $string 270=item cf::lock_wait $string
267 271
268Wait until the given lock is available. See cf::lock_acquire. 272Wait until the given lock is available. See cf::lock_acquire.
269 273
285Return true if the lock is currently active, i.e. somebody has locked it. 289Return true if the lock is currently active, i.e. somebody has locked it.
286 290
287=cut 291=cut
288 292
289our %LOCK; 293our %LOCK;
294our %LOCKER;#d#
290 295
291sub lock_wait($) { 296sub lock_wait($) {
292 my ($key) = @_; 297 my ($key) = @_;
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
293 303
294 # wait for lock, if any 304 # wait for lock, if any
295 while ($LOCK{$key}) { 305 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 306 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 307 Coro::schedule;
303 313
304 # wait, to be sure we are not locked 314 # wait, to be sure we are not locked
305 lock_wait $key; 315 lock_wait $key;
306 316
307 $LOCK{$key} = []; 317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
308 319
309 Coro::guard { 320 Coro::guard {
321 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 322 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 323 $_->ready for @{ delete $LOCK{$key} };
312 } 324 }
313} 325}
314 326
326 }; 338 };
327 $TICK_WATCHER->stop; 339 $TICK_WATCHER->stop;
328 $guard 340 $guard
329} 341}
330 342
343=item cf::periodic $interval, $cb
344
345Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer.
347
348=cut
349
350sub periodic($$) {
351 my ($interval, $cb) = @_;
352
353 my $start = rand List::Util::min 180, $interval;
354
355 EV::periodic $start, $interval, 0, $cb
356}
357
331=item cf::get_slot $time[, $priority[, $name]] 358=item cf::get_slot $time[, $priority[, $name]]
332 359
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 360Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds 361This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede. 362of cpu time till the next tick. The slot is only valid till the next cede.
344our @SLOT_QUEUE; 371our @SLOT_QUEUE;
345our $SLOT_QUEUE; 372our $SLOT_QUEUE;
346 373
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 374$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 375$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager");
377
349 my $signal = new Coro::Signal; 378 my $signal = new Coro::Signal;
350 379
351 while () { 380 while () {
352 next_job: 381 next_job:
353 my $avail = cf::till_tick; 382 my $avail = cf::till_tick;
361 } 390 }
362 } 391 }
363 } 392 }
364 393
365 if (@SLOT_QUEUE) { 394 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 395 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 396 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 397 $signal->wait;
369 } else { 398 } else {
370 Coro::schedule; 399 Coro::schedule;
371 } 400 }
394 423
395BEGIN { *async = \&Coro::async_pool } 424BEGIN { *async = \&Coro::async_pool }
396 425
397=item cf::sync_job { BLOCK } 426=item cf::sync_job { BLOCK }
398 427
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 428The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 429is always able to handle events or runnable, as Deliantra is only
401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 430partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 431acceptable.
403 432
404If it must be done, put the blocking parts into C<sync_job>. This will run 433If it must be done, put the blocking parts into C<sync_job>. This will run
405the given BLOCK in another coroutine while waiting for the result. The 434the given BLOCK in another coroutine while waiting for the result. The
410 439
411sub sync_job(&) { 440sub sync_job(&) {
412 my ($job) = @_; 441 my ($job) = @_;
413 442
414 if ($Coro::current == $Coro::main) { 443 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 444 my $time = EV::time;
416 445
417 # this is the main coro, too bad, we have to block 446 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 447 # till the operation succeeds, freezing the server :/
419 448
449 LOG llevError, Carp::longmess "sync job";#d#
450
420 # TODO: use suspend/resume instead 451 # TODO: use suspend/resume instead
421 # (but this is cancel-safe) 452 # (but this is cancel-safe)
422 my $freeze_guard = freeze_mainloop; 453 my $freeze_guard = freeze_mainloop;
423 454
424 my $busy = 1; 455 my $busy = 1;
425 my @res; 456 my @res;
426 457
427 (async { 458 (async {
459 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 460 @res = eval { $job->() };
429 warn $@ if $@; 461 warn $@ if $@;
430 undef $busy; 462 undef $busy;
431 })->prio (Coro::PRIO_MAX); 463 })->prio (Coro::PRIO_MAX);
432 464
433 while ($busy) { 465 while ($busy) {
434 Coro::cede or Event::one_event; 466 if (Coro::nready) {
467 Coro::cede_notself;
468 } else {
469 EV::loop EV::LOOP_ONESHOT;
435 } 470 }
471 }
436 472
437 $time = Event::time - $time; 473 $time = EV::time - $time;
438 474
439 LOG llevError | logBacktrace, Carp::longmess "long sync job" 475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441 477
442 $tick_start += $time; # do not account sync jobs to server load 478 $tick_start += $time; # do not account sync jobs to server load
472=item fork_call { }, $args 508=item fork_call { }, $args
473 509
474Executes the given code block with the given arguments in a seperate 510Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 511process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 512Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 513never block itself or use any form of event handling.
478 514
479=cut 515=cut
480 516
481sub fork_call(&@) { 517sub fork_call(&@) {
482 my ($cb, @args) = @_; 518 my ($cb, @args) = @_;
483 519
484 # we seemingly have to make a local copy of the whole thing, 520 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 521 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 522 # TODO: investigate and fix (likely this will be rather laborious)
487 523
488 my @res = Coro::Util::fork_eval { 524 my @res = Coro::Util::fork_eval {
489 reset_signals; 525 reset_signals;
490 &$cb 526 &$cb
491 }, @args; 527 }, @args;
500=item cf::db_put $family => $key => $value 536=item cf::db_put $family => $key => $value
501 537
502Stores the given C<$value> in the family. It can currently store binary 538Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 539data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 540
541=item $db = cf::db_table "name"
542
543Create and/or open a new database table. The string must not be "db" and must be unique
544within each server.
545
505=cut 546=cut
547
548sub db_table($) {
549 my ($name) = @_;
550 my $db = BDB::db_create $DB_ENV;
551
552 eval {
553 $db->set_flags (BDB::CHKSUM);
554
555 utf8::encode $name;
556 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
557 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
558 cf::cleanup "db_open(db): $!" if $!;
559 };
560 cf::cleanup "db_open(db): $@" if $@;
561
562 $db
563}
506 564
507our $DB; 565our $DB;
508 566
509sub db_init { 567sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 568 cf::sync_job {
514 eval { 569 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 570 };
524} 571}
525 572
526sub db_get($$) { 573sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 574 my $key = "$_[0]/$_[1]";
528 575
632attach callbacks/event handlers (a collection of which is called an "attachment") 679attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 680to it. All such attachable objects support the following methods.
634 681
635In the following description, CLASS can be any of C<global>, C<object> 682In the following description, CLASS can be any of C<global>, C<object>
636C<player>, C<client> or C<map> (i.e. the attachable objects in 683C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 684Deliantra).
638 685
639=over 4 686=over 4
640 687
641=item $attachable->attach ($attachment, key => $value...) 688=item $attachable->attach ($attachment, key => $value...)
642 689
924 } 971 }
925 972
926 0 973 0
927} 974}
928 975
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 976=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 977
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 978=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 979
933Generate an object-specific event with the given arguments. 980Generate an object-specific event with the given arguments.
934 981
940 987
941=cut 988=cut
942 989
943############################################################################# 990#############################################################################
944# object support 991# object support
945#
946 992
993sub _object_equal($$);
994sub _object_equal($$) {
995 my ($a, $b) = @_;
996
997 return 0 unless (ref $a) eq (ref $b);
998
999 if ("HASH" eq ref $a) {
1000 my @ka = keys %$a;
1001 my @kb = keys %$b;
1002
1003 return 0 if @ka != @kb;
1004
1005 for (0 .. $#ka) {
1006 return 0 unless $ka[$_] eq $kb[$_];
1007 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1008 }
1009
1010 } elsif ("ARRAY" eq ref $a) {
1011
1012 return 0 if @$a != @$b;
1013
1014 for (0 .. $#$a) {
1015 return 0 unless _object_equal $a->[$_], $b->[$_];
1016 }
1017
1018 } elsif ($a ne $b) {
1019 return 0;
1020 }
1021
1022 1
1023}
1024
1025our $SLOW_MERGES;#d#
947sub _can_merge { 1026sub _can_merge {
948 my ($ob1, $ob2) = @_; 1027 my ($ob1, $ob2) = @_;
949 1028
950 local $Storable::canonical = 1; 1029 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1030
954 $fob1 eq $fob2 1031 # we do the slow way here
1032 return _object_equal $ob1, $ob2
955} 1033}
956 1034
957sub reattach { 1035sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1036 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1037 my ($obj) = @_;
981cf::attachable->attach ( 1059cf::attachable->attach (
982 prio => -1000000, 1060 prio => -1000000,
983 on_instantiate => sub { 1061 on_instantiate => sub {
984 my ($obj, $data) = @_; 1062 my ($obj, $data) = @_;
985 1063
986 $data = from_json $data; 1064 $data = decode_json $data;
987 1065
988 for (@$data) { 1066 for (@$data) {
989 my ($name, $args) = @$_; 1067 my ($name, $args) = @$_;
990 1068
991 $obj->attach ($name, %{$args || {} }); 1069 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1085sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1086 my ($filename, $rdata, $objs) = @_;
1009 1087
1010 sync_job { 1088 sync_job {
1011 if (length $$rdata) { 1089 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1091 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1092 $decname, length $$rdata, scalar @$objs;
1014 1093
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1095 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1097 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1098 close $fh;
1020 1099
1021 if (@$objs) { 1100 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1102 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1104 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1105 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1106 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1107 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1108 }
1037 } 1116 }
1038 } else { 1117 } else {
1039 aio_unlink $filename; 1118 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1119 aio_unlink "$filename.pst";
1041 } 1120 }
1042 } 1121 };
1043} 1122}
1044 1123
1045sub object_freezer_as_string { 1124sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1125 my ($rdata, $objs) = @_;
1047 1126
1059 or return; 1138 or return;
1060 1139
1061 unless (aio_stat "$filename.pst") { 1140 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1141 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1142 or return;
1143
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1144 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs};
1065 } 1146 }
1066 1147
1148 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1149 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1150 $decname, length $data, scalar @{$av || []};
1151
1069 return ($data, $av); 1152 ($data, $av)
1070} 1153}
1071 1154
1072=head2 COMMAND CALLBACKS 1155=head2 COMMAND CALLBACKS
1073 1156
1074=over 4 1157=over 4
1260 1343
1261=head3 cf::player 1344=head3 cf::player
1262 1345
1263=over 4 1346=over 4
1264 1347
1348=item cf::player::num_playing
1349
1350Returns the official number of playing players, as per the Crossfire metaserver rules.
1351
1352=cut
1353
1354sub num_playing {
1355 scalar grep
1356 $_->ob->map
1357 && !$_->hidden
1358 && !$_->ob->flag (cf::FLAG_WIZ),
1359 cf::player::list
1360}
1361
1265=item cf::player::find $login 1362=item cf::player::find $login
1266 1363
1267Returns the given player object, loading it if necessary (might block). 1364Returns the given player object, loading it if necessary (might block).
1268 1365
1269=cut 1366=cut
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1401 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1402 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1403 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1404 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1405
1309 my $pl = load_pl path $login 1406 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1407 or return;
1408
1409 my $pl = cf::player::load_pl $f
1410 or return;
1411 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1413 $cf::PLAYER{$login} = $pl
1312 } 1414 }
1313 } 1415 }
1314} 1416}
1315 1417
1413 or return []; 1515 or return [];
1414 1516
1415 my @logins; 1517 my @logins;
1416 1518
1417 for my $login (@$dirs) { 1519 for my $login (@$dirs) {
1520 my $path = path $login;
1521
1522 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1525 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1526 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 }
1421 1528
1422 utf8::decode $login; 1529 utf8::decode $login;
1423 push @logins, $login; 1530 push @logins, $login;
1424 } 1531 }
1425 1532
1458 1565
1459Expand crossfire pod fragments into protocol xml. 1566Expand crossfire pod fragments into protocol xml.
1460 1567
1461=cut 1568=cut
1462 1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1463sub expand_cfpod { 1581sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1582 my ($self, $pod) = @_;
1465 1583
1466 # escape & and < 1584 my $xml;
1467 s/&/&amp;/g;
1468 s/(?<![BIUGHT])</&lt;/g;
1469 1585
1470 # this is buggy, it needs to properly take care of nested <'s 1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1471 1589
1472 1 while 1590 $group =~ s/&/&amp;/g;
1473 # replace B<>, I<>, U<> etc. 1591 $group =~ s/</&lt;/g;
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1592
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1593 $xml .= $group;
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1594 } elsif ($pod =~ m%\G
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1595 ([BCGHITU])
1478 # replace G<male|female> tags 1596 <
1479 || s{G<([^>|]*)\|([^>]*)>}{ 1597 (?:
1480 $self->gender ? $2 : $1 1598 ([^<>]*) (?{ $group = $^N })
1481 }ge 1599 | < $interior >
1482 # replace H<hint text> 1600 )
1483 || s{H<([^\>]*)>} 1601 >
1602 %gcsx
1484 { 1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "") 1623 "")
1488 [$self->{hintmode}] 1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1489 }ge; 1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1490 1635
1636 for ($xml) {
1491 # create single paragraphs (very hackish) 1637 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g; 1638 s/(?<=\S)\n(?=\w)/ /g;
1493 1639
1494 # compress some whitespace 1640 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends 1641 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines 1642 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines 1643 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines 1644 s/\n+$//; # ending lines
1645 }
1499 1646
1500 $_ 1647 $xml
1501} 1648}
1649
1650no re 'eval';
1502 1651
1503sub hintmode { 1652sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1; 1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode} 1654 $_[0]{hintmode}
1506} 1655}
1750 1899
1751sub load_header_from($) { 1900sub load_header_from($) {
1752 my ($self, $path) = @_; 1901 my ($self, $path) = @_;
1753 1902
1754 utf8::encode $path; 1903 utf8::encode $path;
1755 #aio_open $path, O_RDONLY, 0 1904 my $f = new_from_file cf::object::thawer $path
1756 # or return;
1757
1758 $self->_load_header ($path)
1759 or return; 1905 or return;
1906
1907 $self->_load_header ($f)
1908 or return;
1909
1910 local $MAP_LOADING{$self->{path}} = $self;
1911 $f->resolve_delayed_derefs;
1760 1912
1761 $self->{load_path} = $path; 1913 $self->{load_path} = $path;
1762 1914
1763 1 1915 1
1764} 1916}
1818sub find { 1970sub find {
1819 my ($path, $origin) = @_; 1971 my ($path, $origin) = @_;
1820 1972
1821 $path = normalise $path, $origin && $origin->path; 1973 $path = normalise $path, $origin && $origin->path;
1822 1974
1975 cf::lock_wait "map_data:$path";#d#remove
1823 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1824 1977
1825 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1826 my $guard = cf::lock_acquire "map_find:$path"; 1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1827 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1828 or return; 1983 or return;
1829 1984
1830 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1831 1986
1833 or return; 1988 or return;
1834 1989
1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1836 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1837 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard1;
1994 undef $guard2;
1838 $map->reset; 1995 $map->reset;
1839 undef $guard;
1840 return find $path; 1996 return find $path;
1841 } 1997 }
1842 1998
1843 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1844 } 2000 }
1853 local $self->{deny_reset} = 1; # loading can take a long time 2009 local $self->{deny_reset} = 1; # loading can take a long time
1854 2010
1855 my $path = $self->{path}; 2011 my $path = $self->{path};
1856 2012
1857 { 2013 {
1858 my $guard1 = cf::lock_acquire "map_data:$path"; 2014 my $guard = cf::lock_acquire "map_data:$path";
1859 my $guard2 = cf::lock_acquire "map_load:$path";
1860 2015
2016 return unless $self->valid;
1861 return if $self->in_memory != cf::MAP_SWAPPED; 2017 return unless $self->in_memory == cf::MAP_SWAPPED;
1862 2018
1863 $self->in_memory (cf::MAP_LOADING); 2019 $self->in_memory (cf::MAP_LOADING);
1864 2020
1865 $self->alloc; 2021 $self->alloc;
1866 2022
1867 $self->pre_load; 2023 $self->pre_load;
1868 cf::cede_to_tick; 2024 cf::cede_to_tick;
1869 2025
2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block;
1870 $self->_load_objects ($self->{load_path}, 1) 2028 $self->_load_objects ($f)
1871 or return; 2029 or return;
1872 2030
1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1874 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1875 2033
1876 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1877 utf8::encode $uniq; 2035 utf8::encode $uniq;
1878 if (aio_open $uniq, O_RDONLY, 0) { 2036 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) {
1879 $self->clear_unique_items; 2038 $self->clear_unique_items;
1880 $self->_load_objects ($uniq, 0); 2039 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs;
2041 }
1881 } 2042 }
1882 } 2043 }
2044
2045 $f->resolve_delayed_derefs;
1883 2046
1884 cf::cede_to_tick; 2047 cf::cede_to_tick;
1885 # now do the right thing for maps 2048 # now do the right thing for maps
1886 $self->link_multipart_objects; 2049 $self->link_multipart_objects;
1887 $self->difficulty ($self->estimate_difficulty) 2050 $self->difficulty ($self->estimate_difficulty)
1973 } 2136 }
1974 2137
1975 $MAP_PREFETCH{$path} |= $load; 2138 $MAP_PREFETCH{$path} |= $load;
1976 2139
1977 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
1978 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
1979 while (my ($k, $v) = each %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
1980 if (my $map = find $k) { 2145 if (my $map = find $k) {
1981 $map->load if $v; 2146 $map->load if $v;
1982 } 2147 }
2008 return if $self->{deny_save}; 2173 return if $self->{deny_save};
2009 2174
2010 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
2011 2176
2012 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
2013 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2014 }; 2180 };
2015 2181
2016 if ($uniq) { 2182 if ($uniq) {
2017 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2031 2197
2032 return if $self->players; 2198 return if $self->players;
2033 return if $self->in_memory != cf::MAP_IN_MEMORY; 2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
2034 return if $self->{deny_save}; 2200 return if $self->{deny_save};
2035 2201
2202 $self->in_memory (cf::MAP_SWAPPED);
2203
2204 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP;
2036 $self->clear; 2206 $self->clear;
2037 $self->in_memory (cf::MAP_SWAPPED);
2038} 2207}
2039 2208
2040sub reset_at { 2209sub reset_at {
2041 my ($self) = @_; 2210 my ($self) = @_;
2042 2211
2074 if $uniq; 2243 if $uniq;
2075 } 2244 }
2076 2245
2077 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
2078 2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2250 $self->clear;
2080
2081 $_->clear_links_to ($self) for values %cf::MAP;
2082 2251
2083 $self->unlink_save; 2252 $self->unlink_save;
2084 $self->destroy; 2253 $self->destroy;
2085} 2254}
2086 2255
2187 2356
2188sub inv_recursive { 2357sub inv_recursive {
2189 inv_recursive_ inv $_[0] 2358 inv_recursive_ inv $_[0]
2190} 2359}
2191 2360
2361=item $ref = $ob->ref
2362
2363creates and returns a persistent reference to an objetc that can be stored as a string.
2364
2365=item $ob = cf::object::deref ($refstring)
2366
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block.
2369
2370=cut
2371
2372sub deref {
2373 my ($ref) = @_;
2374
2375 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2376 my ($uuid, $name) = ($1, $2);
2377 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2378 or return;
2379 $pl->ob->uuid eq $uuid
2380 or return;
2381
2382 $pl->ob
2383 } else {
2384 warn "$ref: cannot resolve object reference\n";
2385 undef
2386 }
2387}
2388
2192package cf; 2389package cf;
2193 2390
2194=back 2391=back
2195 2392
2196=head3 cf::object::player 2393=head3 cf::object::player
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2355 2552
2356 $self->enter_link; 2553 $self->enter_link;
2357 2554
2358 (async { 2555 (async {
2556 $Coro::current->{desc} = "player::goto $path $x $y";
2557
2558 # *tag paths override both path and x|y
2559 if ($path =~ /^\*(.*)$/) {
2560 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2561 my $ob = $obs[rand @obs];
2562
2563 # see if we actually can go there
2564 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2565 $ob = $obs[rand @obs];
2566 } else {
2567 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2568 }
2569 # else put us there anyways for now #d#
2570
2571 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2572 } else {
2573 ($path, $x, $y) = (undef, undef, undef);
2574 }
2575 }
2576
2359 my $map = eval { 2577 my $map = eval {
2360 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2361 2579
2362 if ($map) { 2580 if ($map) {
2363 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2365 } else { 2583 } else {
2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2367 } 2585 }
2368 2586
2369 $map 2587 $map
2370 }; 2588 };
2371 2589
2424 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2425 } 2643 }
2426 2644
2427 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2428 2646
2429 my $data = cf::to_json $rmp; 2647 my $data = cf::encode_json $rmp;
2430 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2431 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2432 2650
2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2434 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2461 # if exit is damned, update players death & WoR home-position 2679 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp) 2680 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED); 2681 if $exit->flag (FLAG_DAMNED);
2464 2682
2465 (async { 2683 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2685
2466 $self->deactivate_recursive; # just to be sure 2686 $self->deactivate_recursive; # just to be sure
2467 unless (eval { 2687 unless (eval {
2468 $self->goto ($slaying, $hp, $sp); 2688 $self->goto ($slaying, $hp, $sp);
2469 2689
2470 1; 2690 1;
2505the message, with C<log> being the default. If C<$color> is negative, suppress 2725the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet. 2726the message unless the client supports the msg packet.
2507 2727
2508=cut 2728=cut
2509 2729
2730# non-persistent channels (usually the info channel)
2510our %CHANNEL = ( 2731our %CHANNEL = (
2511 "c/identify" => { 2732 "c/identify" => {
2512 id => "identify", 2733 id => "infobox",
2513 title => "Identify", 2734 title => "Identify",
2514 reply => undef, 2735 reply => undef,
2515 tooltip => "Items recently identified", 2736 tooltip => "Items recently identified",
2516 }, 2737 },
2517 "c/examine" => { 2738 "c/examine" => {
2518 id => "examine", 2739 id => "infobox",
2519 title => "Examine", 2740 title => "Examine",
2520 reply => undef, 2741 reply => undef,
2521 tooltip => "Signs and other items you examined", 2742 tooltip => "Signs and other items you examined",
2522 }, 2743 },
2744 "c/book" => {
2745 id => "infobox",
2746 title => "Book",
2747 reply => undef,
2748 tooltip => "The contents of a note or book",
2749 },
2750 "c/lookat" => {
2751 id => "infobox",
2752 title => "Look",
2753 reply => undef,
2754 tooltip => "What you saw there",
2755 },
2756 "c/who" => {
2757 id => "infobox",
2758 title => "Players",
2759 reply => undef,
2760 tooltip => "Shows players who are currently online",
2761 },
2762 "c/body" => {
2763 id => "infobox",
2764 title => "Body Parts",
2765 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available",
2767 },
2768 "c/uptime" => {
2769 id => "infobox",
2770 title => "Uptime",
2771 reply => undef,
2772 tooltip => "How long the server has been running since last restart",
2773 },
2774 "c/mapinfo" => {
2775 id => "infobox",
2776 title => "Map Info",
2777 reply => undef,
2778 tooltip => "Information related to the maps",
2779 },
2523); 2780);
2524 2781
2525sub cf::client::send_msg { 2782sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_; 2783 my ($self, $channel, $msg, $color, @extra) = @_;
2527 2784
2528 $msg = $self->pl->expand_cfpod ($msg); 2785 $msg = $self->pl->expand_cfpod ($msg);
2529 2786
2530 $color &= cf::NDI_CLIENT_MASK; # just in case... 2787 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531 2788
2532 # check predefined channels, for the benefit of C 2789 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2790 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel};
2534 2792
2793 $self->ext_msg (channel_info => $channel)
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id};
2797
2535 if (ref $channel) { 2798 } elsif (ref $channel) {
2536 # send meta info to client, if not yet sent 2799 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) { 2800 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel; 2801 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel); 2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2540 } 2804 }
2541 2805
2542 $channel = $channel->{id}; 2806 $channel = $channel->{id};
2543 } 2807 }
2544 2808
2756=pod 3020=pod
2757 3021
2758The following functions and methods are available within a safe environment: 3022The following functions and methods are available within a safe environment:
2759 3023
2760 cf::object 3024 cf::object
2761 contr pay_amount pay_player map x y force_find force_add 3025 contr pay_amount pay_player map x y force_find force_add destroy
2762 insert remove name archname title slaying race decrease_ob_nr 3026 insert remove name archname title slaying race decrease_ob_nr
2763 3027
2764 cf::object::player 3028 cf::object::player
2765 player 3029 player
2766 3030
2773=cut 3037=cut
2774 3038
2775for ( 3039for (
2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race 3041 insert remove inv name archname title slaying race
2778 decrease_ob_nr)], 3042 decrease_ob_nr destroy)],
2779 ["cf::object::player" => qw(player)], 3043 ["cf::object::player" => qw(player)],
2780 ["cf::player" => qw(peaceful)], 3044 ["cf::player" => qw(peaceful)],
2781 ["cf::map" => qw(trigger)], 3045 ["cf::map" => qw(trigger)],
2782) { 3046) {
2783 no strict 'refs'; 3047 no strict 'refs';
2888 { 3152 {
2889 my $faces = $facedata->{faceinfo}; 3153 my $faces = $facedata->{faceinfo};
2890 3154
2891 while (my ($face, $info) = each %$faces) { 3155 while (my ($face, $info) = each %$faces) {
2892 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3156 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157
2893 cf::face::set_visibility $idx, $info->{visibility}; 3158 cf::face::set_visibility $idx, $info->{visibility};
2894 cf::face::set_magicmap $idx, $info->{magicmap}; 3159 cf::face::set_magicmap $idx, $info->{magicmap};
2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2897 3162
2898 cf::cede_to_tick; 3163 cf::cede_to_tick;
2899 } 3164 }
2900 3165
2901 while (my ($face, $info) = each %$faces) { 3166 while (my ($face, $info) = each %$faces) {
2902 next unless $info->{smooth}; 3167 next unless $info->{smooth};
3168
2903 my $idx = cf::face::find $face 3169 my $idx = cf::face::find $face
2904 or next; 3170 or next;
3171
2905 if (my $smooth = cf::face::find $info->{smooth}) { 3172 if (my $smooth = cf::face::find $info->{smooth}) {
2906 cf::face::set_smooth $idx, $smooth; 3173 cf::face::set_smooth $idx, $smooth;
2907 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2908 } else { 3175 } else {
2909 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3176 warn "smooth face '$info->{smooth}' not found for face '$face'";
2927 { 3194 {
2928 # TODO: for gcfclient pleasure, we should give resources 3195 # TODO: for gcfclient pleasure, we should give resources
2929 # that gcfclient doesn't grok a >10000 face index. 3196 # that gcfclient doesn't grok a >10000 face index.
2930 my $res = $facedata->{resource}; 3197 my $res = $facedata->{resource};
2931 3198
2932 my $soundconf = delete $res->{"res/sound.conf"};
2933
2934 while (my ($name, $info) = each %$res) { 3199 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) {
2935 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3201 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data; 3202 my $data;
2937 3203
2938 if ($info->{type} & 1) { 3204 if ($info->{type} & 1) {
2939 # prepend meta info 3205 # prepend meta info
2940 3206
2941 my $meta = $enc->encode ({ 3207 my $meta = $enc->encode ({
2942 name => $name, 3208 name => $name,
2943 %{ $info->{meta} || {} }, 3209 %{ $info->{meta} || {} },
2944 }); 3210 });
2945 3211
2946 $data = pack "(w/a*)*", $meta, $info->{data}; 3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type};
2947 } else { 3219 } else {
2948 $data = $info->{data}; 3220 $RESOURCE{$name} = $info;
2949 } 3221 }
2950 3222
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2954 cf::cede_to_tick; 3223 cf::cede_to_tick;
2955 } 3224 }
2956
2957 if ($soundconf) {
2958 $soundconf = $enc->decode (delete $soundconf->{data});
2959
2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2961 my $sound = $soundconf->{compat}[$_]
2962 or next;
2963
2964 my $face = cf::face::find "sound/$sound->[1]";
2965 cf::sound::set $sound->[0] => $face;
2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2967 }
2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2972 }
2973 }
2974 } 3225 }
3226
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2975 3228
2976 1 3229 1
2977} 3230}
3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
2978 3251
2979register_exticmd fx_want => sub { 3252register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_; 3253 my ($ns, $want) = @_;
2981 3254
2982 while (my ($k, $v) = each %$want) { 3255 while (my ($k, $v) = each %$want) {
3037sub reload_config { 3310sub reload_config {
3038 open my $fh, "<:utf8", "$CONFDIR/config" 3311 open my $fh, "<:utf8", "$CONFDIR/config"
3039 or return; 3312 or return;
3040 3313
3041 local $/; 3314 local $/;
3042 *CFG = YAML::Syck::Load <$fh>; 3315 *CFG = YAML::Load <$fh>;
3043 3316
3044 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3045 3318
3046 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3047 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3320 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3058sub main { 3331sub main {
3059 # we must not ever block the main coroutine 3332 # we must not ever block the main coroutine
3060 local $Coro::idle = sub { 3333 local $Coro::idle = sub {
3061 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3062 (async { 3335 (async {
3063 Event::one_event; 3336 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT;
3064 })->prio (Coro::PRIO_MAX); 3338 })->prio (Coro::PRIO_MAX);
3065 }; 3339 };
3066 3340
3067 reload_config; 3341 reload_config;
3068 db_init; 3342 db_init;
3069 load_extensions; 3343 load_extensions;
3070 3344
3071 $TICK_WATCHER->start; 3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3072 Event::loop; 3347 EV::loop;
3073} 3348}
3074 3349
3075############################################################################# 3350#############################################################################
3076# initialisation and cleanup 3351# initialisation and cleanup
3077 3352
3078# install some emergency cleanup handlers 3353# install some emergency cleanup handlers
3079BEGIN { 3354BEGIN {
3355 our %SIGWATCHER = ();
3080 for my $signal (qw(INT HUP TERM)) { 3356 for my $signal (qw(INT HUP TERM)) {
3081 Event->signal ( 3357 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3082 reentrant => 0,
3083 data => WF_AUTOCANCEL,
3084 signal => $signal,
3085 prio => 0,
3086 cb => sub {
3087 cf::cleanup "SIG$signal"; 3358 cf::cleanup "SIG$signal";
3088 },
3089 ); 3359 };
3090 } 3360 }
3091} 3361}
3092 3362
3093sub write_runtime { 3363sub write_runtime {
3094 my $runtime = "$LOCALDIR/runtime"; 3364 my $runtime = "$LOCALDIR/runtime";
3139 # and maps saved/destroyed asynchronously. 3409 # and maps saved/destroyed asynchronously.
3140 warn "begin emergency player save\n"; 3410 warn "begin emergency player save\n";
3141 for my $login (keys %cf::PLAYER) { 3411 for my $login (keys %cf::PLAYER) {
3142 my $pl = $cf::PLAYER{$login} or next; 3412 my $pl = $cf::PLAYER{$login} or next;
3143 $pl->valid or next; 3413 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3144 $pl->save; 3415 $pl->save;
3145 } 3416 }
3146 warn "end emergency player save\n"; 3417 warn "end emergency player save\n";
3147 3418
3148 warn "begin emergency map save\n"; 3419 warn "begin emergency map save\n";
3187 warn "syncing database to disk"; 3458 warn "syncing database to disk";
3188 BDB::db_env_txn_checkpoint $DB_ENV; 3459 BDB::db_env_txn_checkpoint $DB_ENV;
3189 3460
3190 # if anything goes wrong in here, we should simply crash as we already saved 3461 # if anything goes wrong in here, we should simply crash as we already saved
3191 3462
3192 warn "cancelling all WF_AUTOCANCEL watchers";
3193 for (Event::all_watchers) {
3194 $_->cancel if $_->data & WF_AUTOCANCEL;
3195 }
3196
3197 warn "flushing outstanding aio requests"; 3463 warn "flushing outstanding aio requests";
3198 for (;;) { 3464 for (;;) {
3199 BDB::flush; 3465 BDB::flush;
3200 IO::AIO::flush; 3466 IO::AIO::flush;
3201 Coro::cede; 3467 Coro::cede_notself;
3202 last unless IO::AIO::nreqs || BDB::nreqs; 3468 last unless IO::AIO::nreqs || BDB::nreqs;
3203 warn "iterate..."; 3469 warn "iterate...";
3204 } 3470 }
3205 3471
3206 ++$RELOAD; 3472 ++$RELOAD;
3295 3561
3296sub reload_perl() { 3562sub reload_perl() {
3297 # doing reload synchronously and two reloads happen back-to-back, 3563 # doing reload synchronously and two reloads happen back-to-back,
3298 # coro crashes during coro_state_free->destroy here. 3564 # coro crashes during coro_state_free->destroy here.
3299 3565
3300 $RELOAD_WATCHER ||= Event->timer ( 3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3301 reentrant => 0,
3302 after => 0,
3303 data => WF_AUTOCANCEL,
3304 cb => sub {
3305 do_reload_perl;
3306 undef $RELOAD_WATCHER; 3567 undef $RELOAD_WATCHER;
3307 }, 3568 do_reload_perl;
3308 ); 3569 };
3309} 3570}
3310 3571
3311register_command "reload" => sub { 3572register_command "reload" => sub {
3312 my ($who, $arg) = @_; 3573 my ($who, $arg) = @_;
3313 3574
3314 if ($who->flag (FLAG_WIZ)) { 3575 if ($who->flag (FLAG_WIZ)) {
3315 $who->message ("reloading server."); 3576 $who->message ("reloading server.");
3577 async {
3578 $Coro::current->{desc} = "perl_reload";
3316 async { reload_perl }; 3579 reload_perl;
3580 };
3317 } 3581 }
3318}; 3582};
3319 3583
3320unshift @INC, $LIBDIR; 3584unshift @INC, $LIBDIR;
3321 3585
3340 my $signal = new Coro::Signal; 3604 my $signal = new Coro::Signal;
3341 push @WAIT_FOR_TICK_BEGIN, $signal; 3605 push @WAIT_FOR_TICK_BEGIN, $signal;
3342 $signal->wait; 3606 $signal->wait;
3343} 3607}
3344 3608
3345 my $min = 1e6;#d# 3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3346 my $avg = 10;
3347$TICK_WATCHER = Event->timer (
3348 reentrant => 0,
3349 parked => 1,
3350 prio => 0,
3351 at => $NEXT_TICK || $TICK,
3352 data => WF_AUTOCANCEL,
3353 cb => sub {
3354 if ($Coro::current != $Coro::main) { 3610 if ($Coro::current != $Coro::main) {
3355 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3356 unless ++$bug_warning > 10; 3612 unless ++$bug_warning > 10;
3357 return; 3613 return;
3358 } 3614 }
3359 3615
3360 $NOW = $tick_start = Event::time; 3616 $NOW = $tick_start = EV::now;
3361 3617
3362 cf::server_tick; # one server iteration 3618 cf::server_tick; # one server iteration
3363 3619
3364 0 && sync_job {#d# 3620 $RUNTIME += $TICK;
3365 for(1..10) { 3621 $NEXT_TICK = $_[0]->at;
3366 my $t = Event::time;
3367 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3368 or die;
3369 3622
3370 $map->width (50); 3623 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3371 $map->height (50); 3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3372 $map->alloc; 3625 Coro::async_pool {
3373 $map->_load_objects ("/tmp/x.map", 1); 3626 $Coro::current->{desc} = "runtime saver";
3374 my $t = Event::time - $t; 3627 write_runtime
3375 3628 or warn "ERROR: unable to write runtime file: $!";
3376 #next unless $t < 0.0013;#d#
3377 if ($t < $min) {
3378 $min = $t;
3379 }
3380 $avg = $avg * 0.99 + $t * 0.01;
3381 }
3382 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3383 exit 0;
3384 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3385 }; 3629 };
3630 }
3386 3631
3387 $RUNTIME += $TICK;
3388 $NEXT_TICK += $TICK;
3389
3390 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3391 $NEXT_RUNTIME_WRITE = $NOW + 10;
3392 Coro::async_pool {
3393 write_runtime
3394 or warn "ERROR: unable to write runtime file: $!";
3395 };
3396 }
3397
3398# my $AFTER = Event::time;
3399# warn $AFTER - $NOW;#d#
3400
3401 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3402 $sig->send; 3633 $sig->send;
3403 } 3634 }
3404 while (my $sig = shift @WAIT_FOR_TICK) { 3635 while (my $sig = shift @WAIT_FOR_TICK) {
3405 $sig->send; 3636 $sig->send;
3406 } 3637 }
3407 3638
3408 $NOW = Event::time;
3409
3410 # if we are delayed by four ticks or more, skip them all
3411 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3412
3413 $TICK_WATCHER->at ($NEXT_TICK);
3414 $TICK_WATCHER->start;
3415
3416 $LOAD = ($NOW - $tick_start) / $TICK; 3639 $LOAD = ($NOW - $tick_start) / $TICK;
3417 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3418 3641
3419 _post_tick; 3642 _post_tick;
3420 3643};
3421 3644$TICK_WATCHER->priority (EV::MAXPRI);
3422 },
3423);
3424 3645
3425{ 3646{
3426 BDB::max_poll_time $TICK * 0.1; 3647 # configure BDB
3427 $BDB_POLL_WATCHER = Event->io ( 3648
3428 reentrant => 0,
3429 fd => BDB::poll_fileno,
3430 poll => 'r',
3431 prio => 0,
3432 data => WF_AUTOCANCEL,
3433 cb => \&BDB::poll_cb,
3434 );
3435 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
3436 3650 BDB::max_poll_reqs $TICK * 0.1;
3437 BDB::set_sync_prepare { 3651 $Coro::BDB::WATCHER->priority (1);
3438 my $status;
3439 my $current = $Coro::current;
3440 (
3441 sub {
3442 $status = $!;
3443 $current->ready; undef $current;
3444 },
3445 sub {
3446 Coro::schedule while defined $current;
3447 $! = $status;
3448 },
3449 )
3450 };
3451 3652
3452 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3453 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3656 | BDB::LOG_AUTOREMOVE, 1);
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3454 3659
3455 cf::sync_job { 3660 cf::sync_job {
3456 eval { 3661 eval {
3457 BDB::db_env_open 3662 BDB::db_env_open
3458 $DB_ENV, 3663 $DB_ENV,
3460 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3665 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3461 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3462 0666; 3667 0666;
3463 3668
3464 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3465
3466 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3467 $DB_ENV->set_lk_detect;
3468 }; 3670 };
3469 3671
3470 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3471 }; 3673 };
3472 } 3674 }
3675
3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3678 };
3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3681 };
3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 };
3473} 3685}
3474 3686
3475{ 3687{
3688 # configure IO::AIO
3689
3476 IO::AIO::min_parallel 8; 3690 IO::AIO::min_parallel 8;
3477
3478 undef $Coro::AIO::WATCHER;
3479 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3480 $AIO_POLL_WATCHER = Event->io ( 3692 $Coro::AIO::WATCHER->priority (1);
3481 reentrant => 0,
3482 data => WF_AUTOCANCEL,
3483 fd => IO::AIO::poll_fileno,
3484 poll => 'r',
3485 prio => 6,
3486 cb => \&IO::AIO::poll_cb,
3487 );
3488} 3693}
3489 3694
3490my $_log_backtrace; 3695my $_log_backtrace;
3491 3696
3492sub _log_backtrace { 3697sub _log_backtrace {
3496 3701
3497 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3498 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3499 ++$_log_backtrace; 3704 ++$_log_backtrace;
3500 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3501 my @bt = fork_call { 3708 my @bt = fork_call {
3502 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3503 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3504 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3711 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3505 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines