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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.404 by root, Mon Dec 17 07:27:58 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 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::Syck ();
32use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 43
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
47 46
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 76our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 79our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
83 81
84our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 83our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 84our $BDB_CHECKPOINT_WATCHER;
89 87
90our %CFG; 88our %CFG;
91 89
92our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 91our $RUNTIME;
92our $NOW;
94 93
95our (%PLAYER, %PLAYER_LOADING); # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 95our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
98 97
162 161
163The raw value load value from the last tick. 162The raw value load value from the last tick.
164 163
165=item %cf::CFG 164=item %cf::CFG
166 165
167Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 167from wherever your confdir points to.
169 168
170=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
171 170
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
215)) { 214)) {
216 no strict 'refs'; 215 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 217}
219 218
220$Event::DIED = sub { 219$EV::DIED = sub {
221 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
222}; 221};
223 222
224############################################################################# 223#############################################################################
225 224
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 248 $d
250 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
251} 250}
252 251
253=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
254 253
255Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
256 255
257=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
258 257
259Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
260 259
261=cut 260=cut
262 261
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 263
265sub to_json ($) { $json_coder->encode ($_[0]) } 264sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 265sub decode_json($) { $json_coder->decode ($_[0]) }
267 266
268=item cf::lock_wait $string 267=item cf::lock_wait $string
269 268
270Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
271 270
336 }; 335 };
337 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
338 $guard 337 $guard
339} 338}
340 339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
353}
354
341=item cf::get_slot $time[, $priority[, $name]] 355=item cf::get_slot $time[, $priority[, $name]]
342 356
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 357Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds 358This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede. 359of cpu time till the next tick. The slot is only valid till the next cede.
354our @SLOT_QUEUE; 368our @SLOT_QUEUE;
355our $SLOT_QUEUE; 369our $SLOT_QUEUE;
356 370
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
359 my $signal = new Coro::Signal; 375 my $signal = new Coro::Signal;
360 376
361 while () { 377 while () {
362 next_job: 378 next_job:
363 my $avail = cf::till_tick; 379 my $avail = cf::till_tick;
371 } 387 }
372 } 388 }
373 } 389 }
374 390
375 if (@SLOT_QUEUE) { 391 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 393 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 394 $signal->wait;
379 } else { 395 } else {
380 Coro::schedule; 396 Coro::schedule;
381 } 397 }
404 420
405BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
406 422
407=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
408 424
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 425The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 426is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 428acceptable.
413 429
414If it must be done, put the blocking parts into C<sync_job>. This will run 430If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
420 436
421sub sync_job(&) { 437sub sync_job(&) {
422 my ($job) = @_; 438 my ($job) = @_;
423 439
424 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 441 my $time = EV::time;
426 442
427 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
429 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
430 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
431 # (but this is cancel-safe) 449 # (but this is cancel-safe)
432 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
433 451
434 my $busy = 1; 452 my $busy = 1;
435 my @res; 453 my @res;
436 454
437 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 457 @res = eval { $job->() };
439 warn $@ if $@; 458 warn $@ if $@;
440 undef $busy; 459 undef $busy;
441 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
442 461
443 while ($busy) { 462 while ($busy) {
444 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
445 } 467 }
468 }
446 469
447 $time = Event::time - $time; 470 $time = EV::time - $time;
448 471
449 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451 474
452 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
482=item fork_call { }, $args 505=item fork_call { }, $args
483 506
484Executes the given code block with the given arguments in a seperate 507Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 508process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 509Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 510never block itself or use any form of event handling.
488 511
489=cut 512=cut
490 513
491sub fork_call(&@) { 514sub fork_call(&@) {
492 my ($cb, @args) = @_; 515 my ($cb, @args) = @_;
653attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
655 678
656In the following description, CLASS can be any of C<global>, C<object> 679In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 680C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 681Deliantra).
659 682
660=over 4 683=over 4
661 684
662=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
663 686
961 984
962=cut 985=cut
963 986
964############################################################################# 987#############################################################################
965# object support 988# object support
966#
967 989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
968sub _can_merge { 1023sub _can_merge {
969 my ($ob1, $ob2) = @_; 1024 my ($ob1, $ob2) = @_;
970 1025
971 local $Storable::canonical = 1; 1026 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1027
975 $fob1 eq $fob2 1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
976} 1030}
977 1031
978sub reattach { 1032sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1034 my ($obj) = @_;
1002cf::attachable->attach ( 1056cf::attachable->attach (
1003 prio => -1000000, 1057 prio => -1000000,
1004 on_instantiate => sub { 1058 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
1006 1060
1007 $data = from_json $data; 1061 $data = decode_json $data;
1008 1062
1009 for (@$data) { 1063 for (@$data) {
1010 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
1011 1065
1012 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
1025 }, 1079 },
1026); 1080);
1027 1081
1028sub object_freezer_save { 1082sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1084
1033 sync_job { 1085 sync_job {
1034 if (length $$rdata) { 1086 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1087 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
1043 close $fh; 1095 close $fh;
1044 1096
1045 if (@$objs) { 1097 if (@$objs) {
1046 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1047 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
1051 close $fh; 1103 close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1105 }
1062 } else { 1114 } else {
1063 aio_unlink $filename; 1115 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
1065 } 1117 }
1066 }; 1118 };
1067
1068 undef $guard;
1069} 1119}
1070 1120
1071sub object_freezer_as_string { 1121sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
1073 1123
1078 1128
1079sub object_thawer_load { 1129sub object_thawer_load {
1080 my ($filename) = @_; 1130 my ($filename) = @_;
1081 1131
1082 my ($data, $av); 1132 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1133
1086 (aio_load $filename, $data) >= 0 1134 (aio_load $filename, $data) >= 0
1087 or return; 1135 or return;
1088 1136
1089 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1139 or return;
1092 1140
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
1095 } 1143 }
1096 1144
1097 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1402
1355 my $f = new_from_file cf::object::thawer path $login 1403 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1404 or return;
1357 1405
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1406 my $pl = cf::player::load_pl $f
1360 or return; 1407 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1408 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1409 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1515 1562
1516Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1517 1564
1518=cut 1565=cut
1519 1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1520sub expand_cfpod { 1578sub expand_cfpod {
1521 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1522 1580
1523 # escape & and < 1581 my $xml;
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526 1582
1527 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1528 1586
1529 1 while 1587 $group =~ s/&/&amp;/g;
1530 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1531 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1532 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1533 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1592 ([BCGHITU])
1535 # replace G<male|female> tags 1593 <
1536 || s{G<([^>|]*)\|([^>]*)>}{ 1594 (?:
1537 $self->gender ? $2 : $1 1595 ([^<>]*) (?{ $group = $^N })
1538 }ge 1596 | < $interior >
1539 # replace H<hint text> 1597 )
1540 || s{H<([^\>]*)>} 1598 >
1599 %gcsx
1541 { 1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1542 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "") 1620 "")
1545 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1546 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1547 1632
1633 for ($xml) {
1548 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1550 1636
1551 # compress some whitespace 1637 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1556 1643
1557 $_ 1644 $xml
1558} 1645}
1646
1647no re 'eval';
1559 1648
1560sub hintmode { 1649sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode} 1651 $_[0]{hintmode}
1563} 1652}
2044 } 2133 }
2045 2134
2046 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2047 2136
2048 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
2049 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2142 if (my $map = find $k) {
2052 $map->load if $v; 2143 $map->load if $v;
2053 } 2144 }
2079 return if $self->{deny_save}; 2170 return if $self->{deny_save};
2080 2171
2081 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
2082 2173
2083 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2085 }; 2177 };
2086 2178
2087 if ($uniq) { 2179 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2275=cut 2367=cut
2276 2368
2277sub deref { 2369sub deref {
2278 my ($ref) = @_; 2370 my ($ref) = @_;
2279 2371
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2373 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2375 or return;
2287 $pl->ob->uuid eq $uuid 2376 $pl->ob->uuid eq $uuid
2288 or return; 2377 or return;
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2549
2461 $self->enter_link; 2550 $self->enter_link;
2462 2551
2463 (async { 2552 (async {
2553 $Coro::current->{desc} = "player::goto $path $x $y";
2554
2464 # *tag paths override both path and x|y 2555 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2556 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2557 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2558 my $ob = $obs[rand @obs];
2468 2559
2548 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2549 } 2640 }
2550 2641
2551 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2552 2643
2553 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2554 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2556 2647
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
2585 # if exit is damned, update players death & WoR home-position 2676 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp) 2677 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED); 2678 if $exit->flag (FLAG_DAMNED);
2588 2679
2589 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2590 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2591 unless (eval { 2684 unless (eval {
2592 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2593 2686
2594 1; 2687 1;
2629the message, with C<log> being the default. If C<$color> is negative, suppress 2722the message, with C<log> being the default. If C<$color> is negative, suppress
2630the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2631 2724
2632=cut 2725=cut
2633 2726
2727# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2728our %CHANNEL = (
2635 "c/identify" => { 2729 "c/identify" => {
2636 id => "identify", 2730 id => "infobox",
2637 title => "Identify", 2731 title => "Identify",
2638 reply => undef, 2732 reply => undef,
2639 tooltip => "Items recently identified", 2733 tooltip => "Items recently identified",
2640 }, 2734 },
2641 "c/examine" => { 2735 "c/examine" => {
2642 id => "examine", 2736 id => "infobox",
2643 title => "Examine", 2737 title => "Examine",
2644 reply => undef, 2738 reply => undef,
2645 tooltip => "Signs and other items you examined", 2739 tooltip => "Signs and other items you examined",
2646 }, 2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2747 "c/lookat" => {
2748 id => "infobox",
2749 title => "Look",
2750 reply => undef,
2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2776 },
2647); 2777);
2648 2778
2649sub cf::client::send_msg { 2779sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
2651 2781
2652 $msg = $self->pl->expand_cfpod ($msg); 2782 $msg = $self->pl->expand_cfpod ($msg);
2653 2783
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 2785
2656 # check predefined channels, for the benefit of C 2786 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2658 2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2659 if (ref $channel) { 2795 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 2796 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 2797 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 2798 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 2799 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg; 2800 if $self->can_msg;
2881=pod 3017=pod
2882 3018
2883The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2884 3020
2885 cf::object 3021 cf::object
2886 contr pay_amount pay_player map x y force_find force_add 3022 contr pay_amount pay_player map x y force_find force_add destroy
2887 insert remove name archname title slaying race decrease_ob_nr 3023 insert remove name archname title slaying race decrease_ob_nr
2888 3024
2889 cf::object::player 3025 cf::object::player
2890 player 3026 player
2891 3027
2898=cut 3034=cut
2899 3035
2900for ( 3036for (
2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race 3038 insert remove inv name archname title slaying race
2903 decrease_ob_nr)], 3039 decrease_ob_nr destroy)],
2904 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2906 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2907) { 3043) {
2908 no strict 'refs'; 3044 no strict 'refs';
3183sub main { 3319sub main {
3184 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3323 (async {
3188 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
3190 }; 3327 };
3191 3328
3192 reload_config; 3329 reload_config;
3193 db_init; 3330 db_init;
3194 load_extensions; 3331 load_extensions;
3195 3332
3196 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3197 Event::loop; 3335 EV::loop;
3198} 3336}
3199 3337
3200############################################################################# 3338#############################################################################
3201# initialisation and cleanup 3339# initialisation and cleanup
3202 3340
3203# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
3204BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 signal => $signal,
3210 prio => 0,
3211 cb => sub {
3212 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
3213 },
3214 ); 3347 };
3215 } 3348 }
3216} 3349}
3217 3350
3218sub write_runtime { 3351sub write_runtime {
3219 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
3264 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
3266 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3403 $pl->save;
3270 } 3404 }
3271 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
3272 3406
3273 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
3312 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3313 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3314 3448
3315 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
3316 3450
3317 warn "cancelling all WF_AUTOCANCEL watchers";
3318 for (Event::all_watchers) {
3319 $_->cancel if $_->data & WF_AUTOCANCEL;
3320 }
3321
3322 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3323 for (;;) { 3452 for (;;) {
3324 BDB::flush; 3453 BDB::flush;
3325 IO::AIO::flush; 3454 IO::AIO::flush;
3326 Coro::cede; 3455 Coro::cede_notself;
3327 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3328 warn "iterate..."; 3457 warn "iterate...";
3329 } 3458 }
3330 3459
3331 ++$RELOAD; 3460 ++$RELOAD;
3420 3549
3421sub reload_perl() { 3550sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3424 3553
3425 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3426 reentrant => 0,
3427 after => 0,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 do_reload_perl;
3431 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3432 }, 3556 do_reload_perl;
3433 ); 3557 };
3434} 3558}
3435 3559
3436register_command "reload" => sub { 3560register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3438 3562
3439 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3567 reload_perl;
3568 };
3442 } 3569 }
3443}; 3570};
3444 3571
3445unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3446 3573
3465 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 3594 $signal->wait;
3468} 3595}
3469 3596
3470$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3471 reentrant => 0,
3472 parked => 1,
3473 prio => 0,
3474 at => $NEXT_TICK || $TICK,
3475 data => WF_AUTOCANCEL,
3476 cb => sub {
3477 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3478 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3479 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3480 return; 3601 return;
3481 } 3602 }
3482 3603
3483 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3484 3605
3485 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3486 3607
3487 $RUNTIME += $TICK; 3608 $RUNTIME += $TICK;
3488 $NEXT_TICK += $TICK; 3609 $NEXT_TICK = $_[0]->at;
3489 3610
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3613 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3615 write_runtime
3494 or warn "ERROR: unable to write runtime file: $!"; 3616 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3617 };
3618 }
3497 3619
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3621 $sig->send;
3500 } 3622 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3624 $sig->send;
3503 } 3625 }
3504 3626
3505 $NOW = Event::time;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3629
3516 _post_tick; 3630 _post_tick;
3517 }, 3631};
3518); 3632$TICK_WATCHER->priority (EV::MAXPRI);
3519 3633
3520{ 3634{
3635 # configure BDB
3636
3521 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
3522 BDB::max_poll_time $TICK * 0.1; 3638 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 3639 $Coro::BDB::WATCHER->priority (1);
3524 reentrant => 0,
3525 fd => BDB::poll_fileno,
3526 poll => 'r',
3527 prio => 0,
3528 data => WF_AUTOCANCEL,
3529 cb => \&BDB::poll_cb,
3530 );
3531
3532 BDB::set_sync_prepare {
3533 my $status;
3534 my $current = $Coro::current;
3535 (
3536 sub {
3537 $status = $!;
3538 $current->ready; undef $current;
3539 },
3540 sub {
3541 Coro::schedule while defined $current;
3542 $! = $status;
3543 },
3544 )
3545 };
3546 3640
3547 unless ($DB_ENV) { 3641 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 3642 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3550 | BDB::LOG_AUTOREMOVE, 1); 3644 | BDB::LOG_AUTOREMOVE, 1);
3565 3659
3566 cf::cleanup "db_env_open(db): $@" if $@; 3660 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 3661 };
3568 } 3662 }
3569 3663
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 3664 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3665 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 ); 3666 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3667 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3668 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 3669 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 3670 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3671 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 3672 };
3600} 3673}
3601 3674
3602{ 3675{
3676 # configure IO::AIO
3677
3603 IO::AIO::min_parallel 8; 3678 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 3679 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 3680 $Coro::AIO::WATCHER->priority (1);
3608 reentrant => 0,
3609 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno,
3611 poll => 'r',
3612 prio => 6,
3613 cb => \&IO::AIO::poll_cb,
3614 );
3615} 3681}
3616 3682
3617my $_log_backtrace; 3683my $_log_backtrace;
3618 3684
3619sub _log_backtrace { 3685sub _log_backtrace {
3623 3689
3624 # limit the # of concurrent backtraces 3690 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3691 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3692 ++$_log_backtrace;
3627 async { 3693 async {
3694 $Coro::current->{desc} = "abt $msg";
3695
3628 my @bt = fork_call { 3696 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3697 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3698 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3699 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 3700 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines