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.410 by root, Tue Jan 15 12:02:24 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 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
196 210
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
213)) { 227)) {
214 no strict 'refs'; 228 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 230}
217 231
218$Event::DIED = sub { 232$EV::DIED = sub {
219 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
220}; 234};
221 235
222############################################################################# 236#############################################################################
223 237
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 261 $d
248 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
249} 263}
250 264
251=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
252 266
253Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
254 268
255=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
256 270
257Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
258 272
259=cut 273=cut
260 274
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 276
263sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
265 279
266=item cf::lock_wait $string 280=item cf::lock_wait $string
267 281
268Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
269 283
285Return true if the lock is currently active, i.e. somebody has locked it. 299Return true if the lock is currently active, i.e. somebody has locked it.
286 300
287=cut 301=cut
288 302
289our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
290 305
291sub lock_wait($) { 306sub lock_wait($) {
292 my ($key) = @_; 307 my ($key) = @_;
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
293 313
294 # wait for lock, if any 314 # wait for lock, if any
295 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 317 Coro::schedule;
303 323
304 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
305 lock_wait $key; 325 lock_wait $key;
306 326
307 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
308 329
309 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
312 } 334 }
313} 335}
314 336
326 }; 348 };
327 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
328 $guard 350 $guard
329} 351}
330 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
331=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
332 369
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds 371This 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. 372of cpu time till the next tick. The slot is only valid till the next cede.
344our @SLOT_QUEUE; 381our @SLOT_QUEUE;
345our $SLOT_QUEUE; 382our $SLOT_QUEUE;
346 383
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
349 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
350 389
351 while () { 390 while () {
352 next_job: 391 next_job:
353 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
361 } 400 }
362 } 401 }
363 } 402 }
364 403
365 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 407 $signal->wait;
369 } else { 408 } else {
370 Coro::schedule; 409 Coro::schedule;
371 } 410 }
394 433
395BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
396 435
397=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
398 437
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 439is 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 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 441acceptable.
403 442
404If it must be done, put the blocking parts into C<sync_job>. This will run 443If 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 444the given BLOCK in another coroutine while waiting for the result. The
410 449
411sub sync_job(&) { 450sub sync_job(&) {
412 my ($job) = @_; 451 my ($job) = @_;
413 452
414 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 454 my $time = EV::time;
416 455
417 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
419 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
420 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
421 # (but this is cancel-safe) 462 # (but this is cancel-safe)
422 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
423 464
424 my $busy = 1; 465 my $busy = 1;
425 my @res; 466 my @res;
426 467
427 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 470 @res = eval { $job->() };
429 warn $@ if $@; 471 warn $@ if $@;
430 undef $busy; 472 undef $busy;
431 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
432 474
433 while ($busy) { 475 while ($busy) {
434 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
435 } 480 }
481 }
436 482
437 $time = Event::time - $time; 483 $time = EV::time - $time;
438 484
439 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441 487
442 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
472=item fork_call { }, $args 518=item fork_call { }, $args
473 519
474Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
478 524
479=cut 525=cut
480 526
481sub fork_call(&@) { 527sub fork_call(&@) {
482 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
483 529
484 # we seemingly have to make a local copy of the whole thing, 530 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 531 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 532 # TODO: investigate and fix (likely this will be rather laborious)
487 533
488 my @res = Coro::Util::fork_eval { 534 my @res = Coro::Util::fork_eval {
489 reset_signals; 535 reset_signals;
490 &$cb 536 &$cb
491 }, @args; 537 }, @args;
500=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
501 547
502Stores the given C<$value> in the family. It can currently store binary 548Stores 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). 549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
505=cut 556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
506 574
507our $DB; 575our $DB;
508 576
509sub db_init { 577sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 578 cf::sync_job {
514 eval { 579 $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 } 580 };
524} 581}
525 582
526sub db_get($$) { 583sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
528 585
632attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
634 691
635In the following description, CLASS can be any of C<global>, C<object> 692In 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 693C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 694Deliantra).
638 695
639=over 4 696=over 4
640 697
641=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
642 699
924 } 981 }
925 982
926 0 983 0
927} 984}
928 985
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 987
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 989
933Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
934 991
940 997
941=cut 998=cut
942 999
943############################################################################# 1000#############################################################################
944# object support 1001# object support
945#
946 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
947sub _can_merge { 1036sub _can_merge {
948 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
949 1038
950 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1040
954 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
955} 1043}
956 1044
957sub reattach { 1045sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1047 my ($obj) = @_;
981cf::attachable->attach ( 1069cf::attachable->attach (
982 prio => -1000000, 1070 prio => -1000000,
983 on_instantiate => sub { 1071 on_instantiate => sub {
984 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
985 1073
986 $data = from_json $data; 1074 $data = decode_json $data;
987 1075
988 for (@$data) { 1076 for (@$data) {
989 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
990 1078
991 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1095sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
1009 1097
1010 sync_job { 1098 sync_job {
1011 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
1014 1103
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1108 close $fh;
1020 1109
1021 if (@$objs) { 1110 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1116 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1118 }
1037 } 1126 }
1038 } else { 1127 } else {
1039 aio_unlink $filename; 1128 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1041 } 1130 }
1042 } 1131 };
1043} 1132}
1044 1133
1045sub object_freezer_as_string { 1134sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1047 1136
1059 or return; 1148 or return;
1060 1149
1061 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1152 or return;
1153
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1065 } 1156 }
1066 1157
1158 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1069 return ($data, $av); 1162 ($data, $av)
1070} 1163}
1071 1164
1072=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1073 1166
1074=over 4 1167=over 4
1260 1353
1261=head3 cf::player 1354=head3 cf::player
1262 1355
1263=over 4 1356=over 4
1264 1357
1358=item cf::player::num_playing
1359
1360Returns the official number of playing players, as per the Crossfire metaserver rules.
1361
1362=cut
1363
1364sub num_playing {
1365 scalar grep
1366 $_->ob->map
1367 && !$_->hidden
1368 && !$_->ob->flag (cf::FLAG_WIZ),
1369 cf::player::list
1370}
1371
1265=item cf::player::find $login 1372=item cf::player::find $login
1266 1373
1267Returns the given player object, loading it if necessary (might block). 1374Returns the given player object, loading it if necessary (might block).
1268 1375
1269=cut 1376=cut
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1411 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1412 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1413 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1414 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1415
1309 my $pl = load_pl path $login 1416 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1417 or return;
1418
1419 my $pl = cf::player::load_pl $f
1420 or return;
1421 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1423 $cf::PLAYER{$login} = $pl
1312 } 1424 }
1313 } 1425 }
1314} 1426}
1315 1427
1413 or return []; 1525 or return [];
1414 1526
1415 my @logins; 1527 my @logins;
1416 1528
1417 for my $login (@$dirs) { 1529 for my $login (@$dirs) {
1530 my $path = path $login;
1531
1532 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1535 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1536 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 }
1421 1538
1422 utf8::decode $login; 1539 utf8::decode $login;
1423 push @logins, $login; 1540 push @logins, $login;
1424 } 1541 }
1425 1542
1458 1575
1459Expand crossfire pod fragments into protocol xml. 1576Expand crossfire pod fragments into protocol xml.
1460 1577
1461=cut 1578=cut
1462 1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1463sub expand_cfpod { 1591sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1592 my ($self, $pod) = @_;
1465 1593
1466 # escape & and < 1594 my $xml;
1467 s/&/&amp;/g;
1468 s/(?<![BIUGHT])</&lt;/g;
1469 1595
1470 # this is buggy, it needs to properly take care of nested <'s 1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1471 1599
1472 1 while 1600 $group =~ s/&/&amp;/g;
1473 # replace B<>, I<>, U<> etc. 1601 $group =~ s/</&lt;/g;
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1602
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1603 $xml .= $group;
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1604 } elsif ($pod =~ m%\G
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1605 ([BCGHITU])
1478 # replace G<male|female> tags 1606 <
1479 || s{G<([^>|]*)\|([^>]*)>}{ 1607 (?:
1480 $self->gender ? $2 : $1 1608 ([^<>]*) (?{ $group = $^N })
1481 }ge 1609 | < $interior >
1482 # replace H<hint text> 1610 )
1483 || s{H<([^\>]*)>} 1611 >
1612 %gcsx
1484 { 1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "") 1633 "")
1488 [$self->{hintmode}] 1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1489 }ge; 1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1490 1645
1646 for ($xml) {
1491 # create single paragraphs (very hackish) 1647 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g; 1648 s/(?<=\S)\n(?=\w)/ /g;
1493 1649
1494 # compress some whitespace 1650 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends 1651 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines 1652 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines 1653 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines 1654 s/\n+$//; # ending lines
1655 }
1499 1656
1500 $_ 1657 $xml
1501} 1658}
1659
1660no re 'eval';
1502 1661
1503sub hintmode { 1662sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1; 1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode} 1664 $_[0]{hintmode}
1506} 1665}
1750 1909
1751sub load_header_from($) { 1910sub load_header_from($) {
1752 my ($self, $path) = @_; 1911 my ($self, $path) = @_;
1753 1912
1754 utf8::encode $path; 1913 utf8::encode $path;
1755 #aio_open $path, O_RDONLY, 0 1914 my $f = new_from_file cf::object::thawer $path
1756 # or return;
1757
1758 $self->_load_header ($path)
1759 or return; 1915 or return;
1916
1917 $self->_load_header ($f)
1918 or return;
1919
1920 local $MAP_LOADING{$self->{path}} = $self;
1921 $f->resolve_delayed_derefs;
1760 1922
1761 $self->{load_path} = $path; 1923 $self->{load_path} = $path;
1762 1924
1763 1 1925 1
1764} 1926}
1818sub find { 1980sub find {
1819 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1820 1982
1821 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1822 1984
1985 cf::lock_wait "map_data:$path";#d#remove
1823 cf::lock_wait "map_find:$path"; 1986 cf::lock_wait "map_find:$path";
1824 1987
1825 $cf::MAP{$path} || do { 1988 $cf::MAP{$path} || do {
1826 my $guard = cf::lock_acquire "map_find:$path"; 1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1827 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1828 or return; 1993 or return;
1829 1994
1830 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1831 1996
1833 or return; 1998 or return;
1834 1999
1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1836 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1837 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard1;
2004 undef $guard2;
1838 $map->reset; 2005 $map->reset;
1839 undef $guard;
1840 return find $path; 2006 return find $path;
1841 } 2007 }
1842 2008
1843 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
1844 } 2010 }
1853 local $self->{deny_reset} = 1; # loading can take a long time 2019 local $self->{deny_reset} = 1; # loading can take a long time
1854 2020
1855 my $path = $self->{path}; 2021 my $path = $self->{path};
1856 2022
1857 { 2023 {
1858 my $guard1 = cf::lock_acquire "map_data:$path"; 2024 my $guard = cf::lock_acquire "map_data:$path";
1859 my $guard2 = cf::lock_acquire "map_load:$path";
1860 2025
2026 return unless $self->valid;
1861 return if $self->in_memory != cf::MAP_SWAPPED; 2027 return unless $self->in_memory == cf::MAP_SWAPPED;
1862 2028
1863 $self->in_memory (cf::MAP_LOADING); 2029 $self->in_memory (cf::MAP_LOADING);
1864 2030
1865 $self->alloc; 2031 $self->alloc;
1866 2032
1867 $self->pre_load; 2033 $self->pre_load;
1868 cf::cede_to_tick; 2034 cf::cede_to_tick;
1869 2035
2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block;
1870 $self->_load_objects ($self->{load_path}, 1) 2038 $self->_load_objects ($f)
1871 or return; 2039 or return;
1872 2040
1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1874 if delete $self->{load_original}; 2042 if delete $self->{load_original};
1875 2043
1876 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
1877 utf8::encode $uniq; 2045 utf8::encode $uniq;
1878 if (aio_open $uniq, O_RDONLY, 0) { 2046 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) {
1879 $self->clear_unique_items; 2048 $self->clear_unique_items;
1880 $self->_load_objects ($uniq, 0); 2049 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs;
2051 }
1881 } 2052 }
1882 } 2053 }
2054
2055 $f->resolve_delayed_derefs;
1883 2056
1884 cf::cede_to_tick; 2057 cf::cede_to_tick;
1885 # now do the right thing for maps 2058 # now do the right thing for maps
1886 $self->link_multipart_objects; 2059 $self->link_multipart_objects;
1887 $self->difficulty ($self->estimate_difficulty) 2060 $self->difficulty ($self->estimate_difficulty)
1973 } 2146 }
1974 2147
1975 $MAP_PREFETCH{$path} |= $load; 2148 $MAP_PREFETCH{$path} |= $load;
1976 2149
1977 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
1978 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
1979 while (my ($k, $v) = each %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
1980 if (my $map = find $k) { 2155 if (my $map = find $k) {
1981 $map->load if $v; 2156 $map->load if $v;
1982 } 2157 }
2008 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2009 2184
2010 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
2011 2186
2012 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
2013 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2014 }; 2190 };
2015 2191
2016 if ($uniq) { 2192 if ($uniq) {
2017 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2031 2207
2032 return if $self->players; 2208 return if $self->players;
2033 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_IN_MEMORY;
2034 return if $self->{deny_save}; 2210 return if $self->{deny_save};
2035 2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP;
2036 $self->clear; 2216 $self->clear;
2037 $self->in_memory (cf::MAP_SWAPPED);
2038} 2217}
2039 2218
2040sub reset_at { 2219sub reset_at {
2041 my ($self) = @_; 2220 my ($self) = @_;
2042 2221
2074 if $uniq; 2253 if $uniq;
2075 } 2254 }
2076 2255
2077 delete $cf::MAP{$self->path}; 2256 delete $cf::MAP{$self->path};
2078 2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2260 $self->clear;
2080
2081 $_->clear_links_to ($self) for values %cf::MAP;
2082 2261
2083 $self->unlink_save; 2262 $self->unlink_save;
2084 $self->destroy; 2263 $self->destroy;
2085} 2264}
2086 2265
2187 2366
2188sub inv_recursive { 2367sub inv_recursive {
2189 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2190} 2369}
2191 2370
2371=item $ref = $ob->ref
2372
2373creates and returns a persistent reference to an objetc that can be stored as a string.
2374
2375=item $ob = cf::object::deref ($refstring)
2376
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block.
2379
2380=cut
2381
2382sub deref {
2383 my ($ref) = @_;
2384
2385 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2386 my ($uuid, $name) = ($1, $2);
2387 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2388 or return;
2389 $pl->ob->uuid eq $uuid
2390 or return;
2391
2392 $pl->ob
2393 } else {
2394 warn "$ref: cannot resolve object reference\n";
2395 undef
2396 }
2397}
2398
2192package cf; 2399package cf;
2193 2400
2194=back 2401=back
2195 2402
2196=head3 cf::object::player 2403=head3 cf::object::player
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2355 2562
2356 $self->enter_link; 2563 $self->enter_link;
2357 2564
2358 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
2359 my $map = eval { 2587 my $map = eval {
2360 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2361 2589
2362 if ($map) { 2590 if ($map) {
2363 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2365 } else { 2593 } else {
2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2367 } 2595 }
2368 2596
2369 $map 2597 $map
2370 }; 2598 };
2371 2599
2424 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2425 } 2653 }
2426 2654
2427 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2428 2656
2429 my $data = cf::to_json $rmp; 2657 my $data = cf::encode_json $rmp;
2430 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2431 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2432 2660
2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2434 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2461 # if exit is damned, update players death & WoR home-position 2689 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp) 2690 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED); 2691 if $exit->flag (FLAG_DAMNED);
2464 2692
2465 (async { 2693 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2695
2466 $self->deactivate_recursive; # just to be sure 2696 $self->deactivate_recursive; # just to be sure
2467 unless (eval { 2697 unless (eval {
2468 $self->goto ($slaying, $hp, $sp); 2698 $self->goto ($slaying, $hp, $sp);
2469 2699
2470 1; 2700 1;
2505the message, with C<log> being the default. If C<$color> is negative, suppress 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2507 2737
2508=cut 2738=cut
2509 2739
2740# non-persistent channels (usually the info channel)
2510our %CHANNEL = ( 2741our %CHANNEL = (
2511 "c/identify" => { 2742 "c/identify" => {
2512 id => "identify", 2743 id => "infobox",
2513 title => "Identify", 2744 title => "Identify",
2514 reply => undef, 2745 reply => undef,
2515 tooltip => "Items recently identified", 2746 tooltip => "Items recently identified",
2516 }, 2747 },
2517 "c/examine" => { 2748 "c/examine" => {
2518 id => "examine", 2749 id => "infobox",
2519 title => "Examine", 2750 title => "Examine",
2520 reply => undef, 2751 reply => undef,
2521 tooltip => "Signs and other items you examined", 2752 tooltip => "Signs and other items you examined",
2522 }, 2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2760 "c/lookat" => {
2761 id => "infobox",
2762 title => "Look",
2763 reply => undef,
2764 tooltip => "What you saw there",
2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/uptime" => {
2779 id => "infobox",
2780 title => "Uptime",
2781 reply => undef,
2782 tooltip => "How long the server has been running since last restart",
2783 },
2784 "c/mapinfo" => {
2785 id => "infobox",
2786 title => "Map Info",
2787 reply => undef,
2788 tooltip => "Information related to the maps",
2789 },
2523); 2790);
2524 2791
2525sub cf::client::send_msg { 2792sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_; 2793 my ($self, $channel, $msg, $color, @extra) = @_;
2527 2794
2528 $msg = $self->pl->expand_cfpod ($msg); 2795 $msg = $self->pl->expand_cfpod ($msg);
2529 2796
2530 $color &= cf::NDI_CLIENT_MASK; # just in case... 2797 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531 2798
2532 # check predefined channels, for the benefit of C 2799 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2800 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel};
2534 2802
2803 $self->ext_msg (channel_info => $channel)
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id};
2807
2535 if (ref $channel) { 2808 } elsif (ref $channel) {
2536 # send meta info to client, if not yet sent 2809 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) { 2810 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel; 2811 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel); 2812 $self->ext_msg (channel_info => $channel)
2813 if $self->can_msg;
2540 } 2814 }
2541 2815
2542 $channel = $channel->{id}; 2816 $channel = $channel->{id};
2543 } 2817 }
2544 2818
2756=pod 3030=pod
2757 3031
2758The following functions and methods are available within a safe environment: 3032The following functions and methods are available within a safe environment:
2759 3033
2760 cf::object 3034 cf::object
2761 contr pay_amount pay_player map x y force_find force_add 3035 contr pay_amount pay_player map x y force_find force_add destroy
2762 insert remove name archname title slaying race decrease_ob_nr 3036 insert remove name archname title slaying race decrease_ob_nr
2763 3037
2764 cf::object::player 3038 cf::object::player
2765 player 3039 player
2766 3040
2773=cut 3047=cut
2774 3048
2775for ( 3049for (
2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race 3051 insert remove inv name archname title slaying race
2778 decrease_ob_nr)], 3052 decrease_ob_nr destroy)],
2779 ["cf::object::player" => qw(player)], 3053 ["cf::object::player" => qw(player)],
2780 ["cf::player" => qw(peaceful)], 3054 ["cf::player" => qw(peaceful)],
2781 ["cf::map" => qw(trigger)], 3055 ["cf::map" => qw(trigger)],
2782) { 3056) {
2783 no strict 'refs'; 3057 no strict 'refs';
2888 { 3162 {
2889 my $faces = $facedata->{faceinfo}; 3163 my $faces = $facedata->{faceinfo};
2890 3164
2891 while (my ($face, $info) = each %$faces) { 3165 while (my ($face, $info) = each %$faces) {
2892 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3166 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167
2893 cf::face::set_visibility $idx, $info->{visibility}; 3168 cf::face::set_visibility $idx, $info->{visibility};
2894 cf::face::set_magicmap $idx, $info->{magicmap}; 3169 cf::face::set_magicmap $idx, $info->{magicmap};
2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3170 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}; 3171 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2897 3172
2898 cf::cede_to_tick; 3173 cf::cede_to_tick;
2899 } 3174 }
2900 3175
2901 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2902 next unless $info->{smooth}; 3177 next unless $info->{smooth};
3178
2903 my $idx = cf::face::find $face 3179 my $idx = cf::face::find $face
2904 or next; 3180 or next;
3181
2905 if (my $smooth = cf::face::find $info->{smooth}) { 3182 if (my $smooth = cf::face::find $info->{smooth}) {
2906 cf::face::set_smooth $idx, $smooth; 3183 cf::face::set_smooth $idx, $smooth;
2907 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2908 } else { 3185 } else {
2909 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3186 warn "smooth face '$info->{smooth}' not found for face '$face'";
2927 { 3204 {
2928 # TODO: for gcfclient pleasure, we should give resources 3205 # TODO: for gcfclient pleasure, we should give resources
2929 # that gcfclient doesn't grok a >10000 face index. 3206 # that gcfclient doesn't grok a >10000 face index.
2930 my $res = $facedata->{resource}; 3207 my $res = $facedata->{resource};
2931 3208
2932 my $soundconf = delete $res->{"res/sound.conf"};
2933
2934 while (my ($name, $info) = each %$res) { 3209 while (my ($name, $info) = each %$res) {
3210 if (defined $info->{type}) {
2935 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3211 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data; 3212 my $data;
2937 3213
2938 if ($info->{type} & 1) { 3214 if ($info->{type} & 1) {
2939 # prepend meta info 3215 # prepend meta info
2940 3216
2941 my $meta = $enc->encode ({ 3217 my $meta = $enc->encode ({
2942 name => $name, 3218 name => $name,
2943 %{ $info->{meta} || {} }, 3219 %{ $info->{meta} || {} },
2944 }); 3220 });
2945 3221
2946 $data = pack "(w/a*)*", $meta, $info->{data}; 3222 $data = pack "(w/a*)*", $meta, $info->{data};
3223 } else {
3224 $data = $info->{data};
3225 }
3226
3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type};
2947 } else { 3229 } else {
2948 $data = $info->{data}; 3230 $RESOURCE{$name} = $info;
2949 } 3231 }
2950 3232
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; 3233 cf::cede_to_tick;
2955 } 3234 }
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 } 3235 }
3236
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2975 3238
2976 1 3239 1
2977} 3240}
3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
2978 3261
2979register_exticmd fx_want => sub { 3262register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_; 3263 my ($ns, $want) = @_;
2981 3264
2982 while (my ($k, $v) = each %$want) { 3265 while (my ($k, $v) = each %$want) {
3037sub reload_config { 3320sub reload_config {
3038 open my $fh, "<:utf8", "$CONFDIR/config" 3321 open my $fh, "<:utf8", "$CONFDIR/config"
3039 or return; 3322 or return;
3040 3323
3041 local $/; 3324 local $/;
3042 *CFG = YAML::Syck::Load <$fh>; 3325 *CFG = YAML::Load <$fh>;
3043 3326
3044 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3045 3328
3046 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3329 $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}; 3330 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3058sub main { 3341sub main {
3059 # we must not ever block the main coroutine 3342 # we must not ever block the main coroutine
3060 local $Coro::idle = sub { 3343 local $Coro::idle = sub {
3061 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3062 (async { 3345 (async {
3063 Event::one_event; 3346 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT;
3064 })->prio (Coro::PRIO_MAX); 3348 })->prio (Coro::PRIO_MAX);
3065 }; 3349 };
3066 3350
3067 reload_config; 3351 reload_config;
3068 db_init; 3352 db_init;
3069 load_extensions; 3353 load_extensions;
3070 3354
3071 $TICK_WATCHER->start; 3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3072 Event::loop; 3357 EV::loop;
3073} 3358}
3074 3359
3075############################################################################# 3360#############################################################################
3076# initialisation and cleanup 3361# initialisation and cleanup
3077 3362
3078# install some emergency cleanup handlers 3363# install some emergency cleanup handlers
3079BEGIN { 3364BEGIN {
3365 our %SIGWATCHER = ();
3080 for my $signal (qw(INT HUP TERM)) { 3366 for my $signal (qw(INT HUP TERM)) {
3081 Event->signal ( 3367 $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"; 3368 cf::cleanup "SIG$signal";
3088 },
3089 ); 3369 };
3090 } 3370 }
3091} 3371}
3092 3372
3093sub write_runtime { 3373sub write_runtime {
3094 my $runtime = "$LOCALDIR/runtime"; 3374 my $runtime = "$LOCALDIR/runtime";
3139 # and maps saved/destroyed asynchronously. 3419 # and maps saved/destroyed asynchronously.
3140 warn "begin emergency player save\n"; 3420 warn "begin emergency player save\n";
3141 for my $login (keys %cf::PLAYER) { 3421 for my $login (keys %cf::PLAYER) {
3142 my $pl = $cf::PLAYER{$login} or next; 3422 my $pl = $cf::PLAYER{$login} or next;
3143 $pl->valid or next; 3423 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3144 $pl->save; 3425 $pl->save;
3145 } 3426 }
3146 warn "end emergency player save\n"; 3427 warn "end emergency player save\n";
3147 3428
3148 warn "begin emergency map save\n"; 3429 warn "begin emergency map save\n";
3187 warn "syncing database to disk"; 3468 warn "syncing database to disk";
3188 BDB::db_env_txn_checkpoint $DB_ENV; 3469 BDB::db_env_txn_checkpoint $DB_ENV;
3189 3470
3190 # if anything goes wrong in here, we should simply crash as we already saved 3471 # if anything goes wrong in here, we should simply crash as we already saved
3191 3472
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"; 3473 warn "flushing outstanding aio requests";
3198 for (;;) { 3474 for (;;) {
3199 BDB::flush; 3475 BDB::flush;
3200 IO::AIO::flush; 3476 IO::AIO::flush;
3201 Coro::cede; 3477 Coro::cede_notself;
3202 last unless IO::AIO::nreqs || BDB::nreqs; 3478 last unless IO::AIO::nreqs || BDB::nreqs;
3203 warn "iterate..."; 3479 warn "iterate...";
3204 } 3480 }
3205 3481
3206 ++$RELOAD; 3482 ++$RELOAD;
3295 3571
3296sub reload_perl() { 3572sub reload_perl() {
3297 # doing reload synchronously and two reloads happen back-to-back, 3573 # doing reload synchronously and two reloads happen back-to-back,
3298 # coro crashes during coro_state_free->destroy here. 3574 # coro crashes during coro_state_free->destroy here.
3299 3575
3300 $RELOAD_WATCHER ||= Event->timer ( 3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3301 reentrant => 0,
3302 after => 0,
3303 data => WF_AUTOCANCEL,
3304 cb => sub {
3305 do_reload_perl; 3577 do_reload_perl;
3306 undef $RELOAD_WATCHER; 3578 undef $RELOAD_WATCHER;
3307 },
3308 ); 3579 };
3309} 3580}
3310 3581
3311register_command "reload" => sub { 3582register_command "reload" => sub {
3312 my ($who, $arg) = @_; 3583 my ($who, $arg) = @_;
3313 3584
3314 if ($who->flag (FLAG_WIZ)) { 3585 if ($who->flag (FLAG_WIZ)) {
3315 $who->message ("reloading server."); 3586 $who->message ("reloading server.");
3587 async {
3588 $Coro::current->{desc} = "perl_reload";
3316 async { reload_perl }; 3589 reload_perl;
3590 };
3317 } 3591 }
3318}; 3592};
3319 3593
3320unshift @INC, $LIBDIR; 3594unshift @INC, $LIBDIR;
3321 3595
3340 my $signal = new Coro::Signal; 3614 my $signal = new Coro::Signal;
3341 push @WAIT_FOR_TICK_BEGIN, $signal; 3615 push @WAIT_FOR_TICK_BEGIN, $signal;
3342 $signal->wait; 3616 $signal->wait;
3343} 3617}
3344 3618
3345 my $min = 1e6;#d# 3619$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) { 3620 if ($Coro::current != $Coro::main) {
3355 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3356 unless ++$bug_warning > 10; 3622 unless ++$bug_warning > 10;
3357 return; 3623 return;
3358 } 3624 }
3359 3625
3360 $NOW = $tick_start = Event::time; 3626 $NOW = $tick_start = EV::now;
3361 3627
3362 cf::server_tick; # one server iteration 3628 cf::server_tick; # one server iteration
3363 3629
3364 0 && sync_job {#d# 3630 $RUNTIME += $TICK;
3365 for(1..10) { 3631 $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 3632
3370 $map->width (50); 3633 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3371 $map->height (50); 3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3372 $map->alloc; 3635 Coro::async_pool {
3373 $map->_load_objects ("/tmp/x.map", 1); 3636 $Coro::current->{desc} = "runtime saver";
3374 my $t = Event::time - $t; 3637 write_runtime
3375 3638 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 }; 3639 };
3640 }
3386 3641
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) { 3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3402 $sig->send; 3643 $sig->send;
3403 } 3644 }
3404 while (my $sig = shift @WAIT_FOR_TICK) { 3645 while (my $sig = shift @WAIT_FOR_TICK) {
3405 $sig->send; 3646 $sig->send;
3406 } 3647 }
3407 3648
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; 3649 $LOAD = ($NOW - $tick_start) / $TICK;
3417 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3418 3651
3419 _post_tick; 3652 _post_tick;
3420 3653};
3421 3654$TICK_WATCHER->priority (EV::MAXPRI);
3422 },
3423);
3424 3655
3425{ 3656{
3426 BDB::max_poll_time $TICK * 0.1; 3657 # configure BDB
3427 $BDB_POLL_WATCHER = Event->io ( 3658
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; 3659 BDB::min_parallel 8;
3436 3660 BDB::max_poll_reqs $TICK * 0.1;
3437 BDB::set_sync_prepare { 3661 $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 3662
3452 unless ($DB_ENV) { 3663 unless ($DB_ENV) {
3453 $DB_ENV = BDB::db_env_create; 3664 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3666 | BDB::LOG_AUTOREMOVE, 1);
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3454 3669
3455 cf::sync_job { 3670 cf::sync_job {
3456 eval { 3671 eval {
3457 BDB::db_env_open 3672 BDB::db_env_open
3458 $DB_ENV, 3673 $DB_ENV,
3460 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3675 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3461 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3676 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3462 0666; 3677 0666;
3463 3678
3464 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3679 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 }; 3680 };
3469 3681
3470 cf::cleanup "db_env_open(db): $@" if $@; 3682 cf::cleanup "db_env_open(db): $@" if $@;
3471 }; 3683 };
3472 } 3684 }
3685
3686 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3687 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3688 };
3689 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3690 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3691 };
3692 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3693 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3694 };
3473} 3695}
3474 3696
3475{ 3697{
3698 # configure IO::AIO
3699
3476 IO::AIO::min_parallel 8; 3700 IO::AIO::min_parallel 8;
3477
3478 undef $Coro::AIO::WATCHER;
3479 IO::AIO::max_poll_time $TICK * 0.1; 3701 IO::AIO::max_poll_time $TICK * 0.1;
3480 $AIO_POLL_WATCHER = Event->io ( 3702 $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} 3703}
3489 3704
3490my $_log_backtrace; 3705my $_log_backtrace;
3491 3706
3492sub _log_backtrace { 3707sub _log_backtrace {
3496 3711
3497 # limit the # of concurrent backtraces 3712 # limit the # of concurrent backtraces
3498 if ($_log_backtrace < 2) { 3713 if ($_log_backtrace < 2) {
3499 ++$_log_backtrace; 3714 ++$_log_backtrace;
3500 async { 3715 async {
3716 $Coro::current->{desc} = "abt $msg";
3717
3501 my @bt = fork_call { 3718 my @bt = fork_call {
3502 @addr = map { sprintf "%x", $_ } @addr; 3719 @addr = map { sprintf "%x", $_ } @addr;
3503 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3720 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3504 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3721 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3505 or die "addr2line: $!"; 3722 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines