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.412 by root, Wed Apr 2 11:13:55 2008 UTC vs.
Revision 1.454 by root, Thu Sep 25 12:14:32 2008 UTC

19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict "vars", "subs";
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV 1.86; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
36use Coro 4.32 (); 37use Coro ();
37use Coro::State; 38use Coro::State;
38use Coro::Handle; 39use Coro::Handle;
39use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
40use Coro::Timer; 42use Coro::Timer;
41use Coro::Signal; 43use Coro::Signal;
42use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
43use Coro::AIO; 46use Coro::AIO;
44use Coro::BDB; 47use Coro::BDB 1.6;
45use Coro::Storable; 48use Coro::Storable;
46use Coro::Util (); 49use Coro::Util ();
47 50
48use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
49use BDB (); 52use BDB ();
50use Data::Dumper; 53use Data::Dumper;
51use Digest::MD5; 54use Digest::MD5;
52use Fcntl; 55use Fcntl;
53use YAML (); 56use YAML ();
54use IO::AIO 2.51 (); 57use IO::AIO ();
55use Time::HiRes; 58use Time::HiRes;
56use Compress::LZF; 59use Compress::LZF;
57use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
58 63
59# configure various modules to our taste 64# configure various modules to our taste
60# 65#
61$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66 74
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 76
69our %COMMAND = (); 77our %COMMAND = ();
70our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
73our %EXTCMD = (); 81our %EXTCMD = ();
74our %EXTICMD = (); 82our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
77 85
78our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 87our @EVENT;
80 88
81our $CONFDIR = confdir; 89our $CONFDIR = confdir;
82our $DATADIR = datadir; 90our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
92our %RESOURCE; 103our %RESOURCE;
93 104
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 107our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
99 109
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 113our $DB_ENV;
105 114
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 130our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
123 132
133our @POST_INIT;
134
124binmode STDOUT; 135binmode STDOUT;
125binmode STDERR; 136binmode STDERR;
126 137
127# read virtual server time, if available 138# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
132} 143}
133 144
134mkdir $_ 145mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
242for my $pkg (qw( 253for my $pkg (qw(
243 cf::global cf::attachable 254 cf::global cf::attachable
244 cf::object cf::object::player 255 cf::object cf::object::player
245 cf::client cf::player 256 cf::client cf::player
246 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
247 cf::map cf::party cf::region 259 cf::party cf::region
248)) { 260)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 262}
252 263
253$EV::DIED = sub { 264$EV::DIED = sub {
254 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 308
298sub encode_json($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
300 311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
325
301=item cf::lock_wait $string 326=item cf::lock_wait $string
302 327
303Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
304 329
305=item my $lock = cf::lock_acquire $string 330=item my $lock = cf::lock_acquire $string
332 return;#d# 357 return;#d#
333 }#d# 358 }#d#
334 359
335 # wait for lock, if any 360 # wait for lock, if any
336 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
337 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule; 364 Coro::schedule;
339 } 365 }
340} 366}
341 367
427 } 453 }
428 } 454 }
429}; 455};
430 456
431sub get_slot($;$$) { 457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
432 my ($time, $pri, $name) = @_; 460 my ($time, $pri, $name) = @_;
433 461
434 $time = $TICK * .6 if $time > $TICK * .6; 462 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 463 my $sig = new Coro::Signal;
436 464
547 reset_signals; 575 reset_signals;
548 &$cb 576 &$cb
549 }, @args; 577 }, @args;
550 578
551 wantarray ? @res : $res[-1] 579 wantarray ? @res : $res[-1]
580}
581
582=item $coin = coin_from_name $name
583
584=cut
585
586our %coin_alias = (
587 "silver" => "silvercoin",
588 "silvercoin" => "silvercoin",
589 "silvercoins" => "silvercoin",
590 "gold" => "goldcoin",
591 "goldcoin" => "goldcoin",
592 "goldcoins" => "goldcoin",
593 "platinum" => "platinacoin",
594 "platinumcoin" => "platinacoin",
595 "platinumcoins" => "platinacoin",
596 "platina" => "platinacoin",
597 "platinacoin" => "platinacoin",
598 "platinacoins" => "platinacoin",
599 "royalty" => "royalty",
600 "royalties" => "royalty",
601);
602
603sub coin_from_name($) {
604 $coin_alias{$_[0]}
605 ? cf::arch::find $coin_alias{$_[0]}
606 : undef
552} 607}
553 608
554=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
555 610
556Returns a single value from the environment database. 611Returns a single value from the environment database.
695 750
696############################################################################# 751#############################################################################
697 752
698=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
699 754
700Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
701attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
703 758
704In the following description, CLASS can be any of C<global>, C<object> 759In the following description, CLASS can be any of C<global>, C<object>
705C<player>, C<client> or C<map> (i.e. the attachable objects in 760C<player>, C<client> or C<map> (i.e. the attachable objects in
755=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
756 811
757Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
759 814
760Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
761that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
762 817
763These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
764 819
765=over 4 820=over 4
1056 1111
1057sub reattach { 1112sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1114 my ($obj) = @_;
1060 1115
1116 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1118
1063 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1064 1120
1065 @$registry = (); 1121 @$registry = ();
1066 1122
1112 utf8::decode (my $decname = $filename); 1168 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1115 1171
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1120 close $fh; 1176 aio_close $fh;
1121 1177
1122 if (@$objs) { 1178 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1128 close $fh; 1184 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1186 }
1131 } else { 1187 } else {
1132 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1133 } 1189 }
1302 1358
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1361
1306 $ext{source} = 1362 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1309 . $source 1365 . $source
1310 . "\n};\n1"; 1366 . "\n};\n1";
1311 1367
1312 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
1352 1408
1353=back 1409=back
1354 1410
1355=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1356 1412
1357Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1358 1414
1359=cut 1415=cut
1360 1416
1361package cf::player; 1417package cf::player;
1362 1418
1405 1461
1406sub exists($) { 1462sub exists($) {
1407 my ($login) = @_; 1463 my ($login) = @_;
1408 1464
1409 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1411} 1467}
1412 1468
1413sub find($) { 1469sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1471 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1483 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1484 or return;
1429 1485
1430 my $pl = cf::player::load_pl $f 1486 my $pl = cf::player::load_pl $f
1431 or return; 1487 or return;
1488
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1489 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1490 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1435 } 1492 }
1436 } 1493 }
1446 1503
1447 return if $pl->{deny_save}; 1504 return if $pl->{deny_save};
1448 1505
1449 aio_mkdir playerdir $pl, 0770; 1506 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1507 $pl->{last_save} = $cf::RUNTIME;
1508
1509 cf::get_slot 0.01;
1451 1510
1452 $pl->save_pl ($path); 1511 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1512 cf::cede_to_tick;
1454} 1513}
1455 1514
1487 my ($pl) = @_; 1546 my ($pl) = @_;
1488 1547
1489 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1490 1549
1491 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1552
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1498 1559
1499 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 1600
1540 for my $login (@$dirs) { 1601 for my $login (@$dirs) {
1541 my $path = path $login; 1602 my $path = path $login;
1542 1603
1543 # a .pst is a dead give-away for a valid player 1604 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1605 # if no pst file found, open and chekc for blocked users
1606 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1610 }
1549 1611
1580 } 1642 }
1581 1643
1582 \@paths 1644 \@paths
1583} 1645}
1584 1646
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1648
1587Expand crossfire pod fragments into protocol xml. 1649Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1650
1678=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1679 1652
1680Sends an ext reply to the player. 1653Sends an ext reply to the player.
1681 1654
1748our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1750 1723
1751sub generate_random_map { 1724sub generate_random_map {
1752 my ($self, $rmp) = @_; 1725 my ($self, $rmp) = @_;
1726
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728
1753 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1730 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1879 1855
1880# the temporary/swap location 1856# the temporary/swap location
1881sub save_path { 1857sub save_path {
1882 my ($self) = @_; 1858 my ($self) = @_;
1883 1859
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1886} 1862}
1887 1863
1888# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1889sub uniq_path { 1865sub uniq_path {
1890 my ($self) = @_; 1866 my ($self) = @_;
1891 1867
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1894} 1870}
1895 1871
1896# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1897# all maps in C++... 1873# all maps in C++...
1995 1971
1996 cf::lock_wait "map_data:$path";#d#remove 1972 cf::lock_wait "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1998 1974
1999 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
2002 1978
2003 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
2004 or return; 1980 or return;
2005 1981
2006 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
2009 or return; 1985 or return;
2010 1986
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
2014 undef $guard1; 1991 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 1992 $map->reset;
2017 return find $path; 1993 return find $path;
2018 } 1994 }
2019 1995
2020 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2024 $f->skip_block;
2049 $self->_load_objects ($f) 2025 $self->_load_objects ($f)
2050 or return; 2026 or return;
2051 2027
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
2053 if delete $self->{load_original}; 2029 if delete $self->{load_original};
2054 2030
2055 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2032 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2033 unless (aio_stat $uniq) {
2083 } 2059 }
2084 2060
2085 $self->{last_save} = $cf::RUNTIME; 2061 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2062 $self->last_access ($cf::RUNTIME);
2087 2063
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2065 }
2090 2066
2091 $self->post_load; 2067 $self->post_load;
2092} 2068}
2093 2069
2151 my ($path, $origin, $load) = @_; 2127 my ($path, $origin, $load) = @_;
2152 2128
2153 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
2154 2130
2155 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2133 }
2158 2134
2159 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2160 2136
2161 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2198 cf::async { 2174 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2175 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2201 }; 2177 };
2202 2178
2179 cf::get_slot 0.02;
2180
2203 if ($uniq) { 2181 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2184 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2215 $self->save; 2193 $self->save;
2216 2194
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2196
2219 return if $self->players; 2197 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2199 return if $self->{deny_save};
2222 2200
2223 $self->in_memory (cf::MAP_SWAPPED); 2201 $self->in_memory (cf::MAP_SWAPPED);
2224 2202
2225 $self->deactivate; 2203 $self->deactivate;
2343 2321
2344sub unique_maps() { 2322sub unique_maps() {
2345 [ 2323 [
2346 map { 2324 map {
2347 utf8::decode $_; 2325 utf8::decode $_;
2348 /\.map$/ 2326 s/\.map$//; # TODO future compatibility hack
2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2328 ? ()
2349 ? normalise $_ 2329 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2330 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2331 ]
2353} 2332}
2354 2333
2355package cf;
2356
2357=back 2334=back
2358 2335
2359=head3 cf::object 2336=head3 cf::object
2360 2337
2361=cut 2338=cut
2364 2341
2365=over 4 2342=over 4
2366 2343
2367=item $ob->inv_recursive 2344=item $ob->inv_recursive
2368 2345
2369Returns the inventory of the object _and_ their inventories, recursively. 2346Returns the inventory of the object I<and> their inventories, recursively,
2347but I<not> the object itself.
2370 2348
2371=cut 2349=cut
2372 2350
2373sub inv_recursive_; 2351sub inv_recursive_;
2374sub inv_recursive_ { 2352sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
2380} 2358}
2381 2359
2382=item $ref = $ob->ref 2360=item $ref = $ob->ref
2383 2361
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2362Creates and returns a persistent reference to an object that can be stored as a string.
2385 2363
2386=item $ob = cf::object::deref ($refstring) 2364=item $ob = cf::object::deref ($refstring)
2387 2365
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2366returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2367even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2399can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2400dialogue with the given NPC character.
2423 2401
2424=cut 2402=cut
2425 2403
2404our $SAY_CHANNEL = {
2405 id => "say",
2406 title => "Map",
2407 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2409};
2410
2411our $CHAT_CHANNEL = {
2412 id => "chat",
2413 title => "Chat",
2414 reply => "chat ",
2415 tooltip => "Player chat and shouts, global to the server.",
2416};
2417
2426# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2419# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2420#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2422 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2434 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2435
2444 } else { 2436 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2439 }
2448 } 2440 }
2449} 2441}
2450 2442
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2443=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2468
2477=item $player_object->enter_link 2469=item $player_object->enter_link
2478 2470
2479Freezes the player and moves him/her to a special map (C<{link}>). 2471Freezes the player and moves him/her to a special map (C<{link}>).
2480 2472
2481The player should be reasonably safe there for short amounts of time. You 2473The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2474for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link
2476map.
2483 2477
2484Will never block. 2478Will never block.
2485 2479
2486=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2487 2481
2545 2539
2546 $map->load; 2540 $map->load;
2547 $map->load_neighbours; 2541 $map->load_neighbours;
2548 2542
2549 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2550 $self->activate_recursive; 2545 $self->activate_recursive;
2551 2546
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2554} 2549}
2558Moves the player to the given map-path and coordinates by first freezing 2553Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2555that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2556the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2557be called at the end of this process.
2558
2559Note that $check will be called with a potentially non-loaded map, so if
2560it needs a loaded map it has to call C<< ->load >>.
2563 2561
2564=cut 2562=cut
2565 2563
2566our $GOTOGEN; 2564our $GOTOGEN;
2567 2565
2646} 2644}
2647 2645
2648sub prepare_random_map { 2646sub prepare_random_map {
2649 my ($exit) = @_; 2647 my ($exit) = @_;
2650 2648
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2651 # that depends on the exit object
2656 2652
2657 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2655 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2664 } 2662 }
2665 2663
2666 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2667 2665
2668 my $data = cf::encode_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2671 2669
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2672 undef $fh;
2675 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2676 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2679 } 2681 }
2680} 2682}
2681 2683
2682sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2684 2686
2685 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2686 2688
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2689 $self->enter_link;
2699 2690
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2691 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2692 $Coro::current->{desc} = "enter_exit";
2706 2693
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2694 unless (eval {
2695 $self->deactivate_recursive; # just to be sure
2696
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2706 my $x = $exit->stats->hp;
2707 my $y = $exit->stats->sp;
2708
2709 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2710 2710
2711 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y)
2713 if $exit->flag (cf::FLAG_DAMNED);
2714
2711 1; 2715 1
2712 }) { 2716 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2718 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2721
2718 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
2784 id => "infobox", 2788 id => "infobox",
2785 title => "Body Parts", 2789 title => "Body Parts",
2786 reply => undef, 2790 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2791 tooltip => "Shows which body parts you posess and are available",
2788 }, 2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2789 "c/uptime" => { 2799 "c/uptime" => {
2790 id => "infobox", 2800 id => "infobox",
2791 title => "Uptime", 2801 title => "Uptime",
2792 reply => undef, 2802 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2803 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 2806 id => "infobox",
2797 title => "Map Info", 2807 title => "Map Info",
2798 reply => undef, 2808 reply => undef,
2799 tooltip => "Information related to the maps", 2809 tooltip => "Information related to the maps",
2800 }, 2810 },
2811 "c/party" => {
2812 id => "party",
2813 title => "Party",
2814 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party",
2816 },
2801); 2817);
2802 2818
2803sub cf::client::send_msg { 2819sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2821
2806 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2807 2824
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 2826
2810 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2828 if ($CHANNEL{$channel}) {
2832 if ($self->can_msg) { 2849 if ($self->can_msg) {
2833 # default colour, mask it out 2850 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2836 2853
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 );
2858
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt);
2839 } else { 2870 } else {
2840 if ($color >= 0) { 2871 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2842 for ($msg) { 2873 for ($msg) {
2843 1 while 2874 1 while
3042 3073
3043The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3044 3075
3045 cf::object 3076 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3077 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
3048 3079
3049 cf::object::player 3080 cf::object::player
3050 player 3081 player
3051 3082
3052 cf::player 3083 cf::player
3057 3088
3058=cut 3089=cut
3059 3090
3060for ( 3091for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3093 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3094 decrease split destroy change_exp)],
3064 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
3066 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
3067) { 3098) {
3068 no strict 'refs'; 3099 no strict 'refs';
3276 while (my ($k, $v) = each %$want) { 3307 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3308 $ns->fx_want ($k, $v);
3278 } 3309 }
3279}; 3310};
3280 3311
3312sub load_resource_file($) {
3313 my $guard = lock_acquire "load_resource_file";
3314
3315 my $status = load_resource_file_ $_[0];
3316 get_slot 0.1, 100;
3317 cf::arch::commit_load;
3318
3319 $status
3320}
3321
3281sub reload_regions { 3322sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3323 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3324 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3325 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3326
3298} 3339}
3299 3340
3300sub reload_archetypes { 3341sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3342 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3343 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3344}
3309 3345
3310sub reload_treasures { 3346sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3347 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3348 or die "unable to load treasurelists\n";
3313} 3349}
3314 3350
3315sub reload_resources { 3351sub reload_resources {
3316 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
3317 3353
3354 reload_facedata;
3355 reload_archetypes;
3318 reload_regions; 3356 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3357 reload_treasures;
3323 3358
3324 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3325}
3326
3327sub init {
3328 reload_resources;
3329} 3360}
3330 3361
3331sub reload_config { 3362sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3333 or return; 3364 or return;
3347 }; 3378 };
3348 warn $@ if $@; 3379 warn $@ if $@;
3349 } 3380 }
3350} 3381}
3351 3382
3383sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!";
3386 flock $fh, &Fcntl::LOCK_EX
3387 or die "$PIDFILE: flock: $!";
3388 $fh
3389}
3390
3391# make sure only one server instance is running at any one time
3392sub atomic {
3393 my $fh = pidfile;
3394
3395 my $pid = <$fh>;
3396 kill 9, $pid if $pid > 0;
3397
3398 seek $fh, 0, 0;
3399 print $fh $$;
3400}
3401
3352sub main { 3402sub main {
3403 cf::init_globals; # initialise logging
3404
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417
3353 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3421 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3423 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3360 }; 3425 };
3361 3426
3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3362 reload_config; 3431 reload_config;
3363 db_init; 3432 db_init;
3433
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid;
3437 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills;
3440
3441 cf::init_beforeplay;
3442
3443 atomic;
3444
3364 load_extensions; 3445 load_extensions;
3365 3446
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3447 utime time, time, $RUNTIMEFILE;
3367 evthread_start; 3448
3449 # no (long-running) fork's whatsoever before this point(!)
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451
3452 (pop @POST_INIT)->(0) while @POST_INIT;
3453 };
3454
3368 EV::loop; 3455 EV::loop;
3369} 3456}
3370 3457
3371############################################################################# 3458#############################################################################
3372# initialisation and cleanup 3459# initialisation and cleanup
3379 cf::cleanup "SIG$signal"; 3466 cf::cleanup "SIG$signal";
3380 }; 3467 };
3381 } 3468 }
3382} 3469}
3383 3470
3384sub write_runtime { 3471sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime";
3386
3387 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3389 3474
3390 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3476
3392 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3393 3478
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3395 or return; 3480 or return;
3396 3481
3397 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3410 3495
3411 close $fh 3496 close $fh
3412 or return; 3497 or return;
3413 3498
3414 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3500 and return;
3416 3501
3417 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3418 3503
3419 1 3504 1
3505}
3506
3507our $uuid_lock;
3508our $uuid_skip;
3509
3510sub write_uuid_sync($) {
3511 $uuid_skip ||= $_[0];
3512
3513 return if $uuid_lock;
3514 local $uuid_lock = 1;
3515
3516 my $uuid = "$LOCALDIR/uuid";
3517
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return;
3520
3521 my $value = uuid_seq uuid_cur;
3522
3523 if ($value < 1024) {
3524 warn "cowardly refusing to write low uuid value ($value)!\n";
3525 return;
3526 }
3527
3528 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0;
3530
3531 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3532 and return;
3533
3534 # always fsync - this file is important
3535 aio_fsync $fh
3536 and return;
3537
3538 close $fh
3539 or return;
3540
3541 aio_rename "$uuid~", $uuid
3542 and return;
3543
3544 warn "uuid file written ($value).\n";
3545
3546 1
3547
3548}
3549
3550sub write_uuid($$) {
3551 my ($skip, $sync) = @_;
3552
3553 $sync ? write_uuid_sync $skip
3554 : async { write_uuid_sync $skip };
3420} 3555}
3421 3556
3422sub emergency_save() { 3557sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3558 my $freeze_guard = cf::freeze_mainloop;
3424 3559
3446 warn "end emergency map save\n"; 3581 warn "end emergency map save\n";
3447 3582
3448 warn "begin emergency database checkpoint\n"; 3583 warn "begin emergency database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3584 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3585 warn "end emergency database checkpoint\n";
3586
3587 warn "begin write uuid\n";
3588 write_uuid_sync 1;
3589 warn "end write uuid\n";
3451 }; 3590 };
3452 3591
3453 warn "leave emergency perl save\n"; 3592 warn "leave emergency perl save\n";
3454} 3593}
3455 3594
3456sub post_cleanup { 3595sub post_cleanup {
3457 my ($make_core) = @_; 3596 my ($make_core) = @_;
3458 3597
3459 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3599 if $make_core;
3600
3601 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$;
3603}
3604
3605# a safer delete_package, copied from Symbol
3606sub clear_package($) {
3607 my $pkg = shift;
3608
3609 # expand to full symbol table name if needed
3610 unless ($pkg =~ /^main::.*::$/) {
3611 $pkg = "main$pkg" if $pkg =~ /^::/;
3612 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3613 $pkg .= '::' unless $pkg =~ /::$/;
3614 }
3615
3616 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3617 my $stem_symtab = *{$stem}{HASH};
3618
3619 defined $stem_symtab and exists $stem_symtab->{$leaf}
3620 or return;
3621
3622 # clear all symbols
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 }
3628 warn "cleared package $pkg\n";#d#
3461} 3629}
3462 3630
3463sub do_reload_perl() { 3631sub do_reload_perl() {
3464 # can/must only be called in main 3632 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3467 return; 3635 return;
3468 } 3636 }
3469 3637
3638 return if $RELOAD++;
3639
3640 while ($RELOAD) {
3470 warn "reloading..."; 3641 warn "reloading...";
3471 3642
3472 warn "entering sync_job"; 3643 warn "entering sync_job";
3473 3644
3474 cf::sync_job { 3645 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3646 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3647 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
3478 3649
3479 warn "syncing database to disk"; 3650 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3651 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3652
3482 # if anything goes wrong in here, we should simply crash as we already saved 3653 # if anything goes wrong in here, we should simply crash as we already saved
3483 3654
3484 warn "flushing outstanding aio requests"; 3655 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs; 3656 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = ();
3498
3499 warn "removing commands";
3500 %COMMAND = ();
3501
3502 warn "removing ext/exti commands";
3503 %EXTCMD = ();
3504 %EXTICMD = ();
3505
3506 warn "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg";
3509
3510 if (my $cb = $pkg->can ("unload")) {
3511 eval {
3512 $cb->($pkg);
3513 1
3514 } or warn "$pkg unloaded, but with errors: $@";
3515 } 3658 }
3516 3659
3517 warn "... nuking $pkg"; 3660 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3661 $_->cancel for values %EXT_CORO;
3519 } 3662 %EXT_CORO = ();
3520 3663
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3664 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3665 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3666
3667 warn "removing ext/exti commands";
3668 %EXTCMD = ();
3669 %EXTICMD = ();
3670
3671 warn "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3673 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3674
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3675 if (my $cb = $pkg->can ("unload")) {
3676 eval {
3532 $cb->(); 3677 $cb->($pkg);
3678 1
3679 } or warn "$pkg unloaded, but with errors: $@";
3680 }
3681
3682 warn "... clearing $pkg";
3683 clear_package $pkg;
3533 } 3684 }
3534 3685
3535 Symbol::delete_package $k; 3686 warn "unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689
3690 warn "... unloading $k";
3691 delete $INC{$k};
3692
3693 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g;
3695
3696 if (my $cb = $k->can ("unload_module")) {
3697 $cb->();
3698 }
3699
3700 clear_package $k;
3536 } 3701 }
3537 3702
3538 warn "getting rid of safe::, as good as possible"; 3703 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3704 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3706
3542 warn "unloading cf.pm \"a bit\""; 3707 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3708 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3709 delete $INC{"cf/pod.pm"};
3545 3710
3546 # don't, removes xs symbols, too, 3711 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3712 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3713 #clear_package __PACKAGE__;
3549 3714
3550 warn "unload completed, starting to reload now"; 3715 warn "unload completed, starting to reload now";
3551 3716
3552 warn "reloading cf.pm"; 3717 warn "reloading cf.pm";
3553 require cf; 3718 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3555 3720
3556 warn "loading config and database again"; 3721 warn "loading config and database again";
3557 cf::reload_config; 3722 cf::reload_config;
3558 3723
3559 warn "loading extensions"; 3724 warn "loading extensions";
3560 cf::load_extensions; 3725 cf::load_extensions;
3561 3726
3562 warn "reattaching attachments to objects/players"; 3727 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3728 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
3568 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
3569 warn "leaving sync_job"; 3737 warn "leaving sync_job";
3570 3738
3571 1 3739 1
3572 } or do { 3740 } or do {
3573 warn $@; 3741 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3742 cf::cleanup "error while reloading, exiting.";
3575 }; 3743 };
3576 3744
3577 warn "reloaded"; 3745 warn "reloaded";
3746 --$RELOAD;
3747 }
3578}; 3748};
3579 3749
3580our $RELOAD_WATCHER; # used only during reload 3750our $RELOAD_WATCHER; # used only during reload
3581 3751
3582sub reload_perl() { 3752sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
3585 3755
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 3757 do_reload_perl;
3588 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
3589 }; 3759 };
3590} 3760}
3591 3761
3607 3777
3608our @WAIT_FOR_TICK; 3778our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3779our @WAIT_FOR_TICK_BEGIN;
3610 3780
3611sub wait_for_tick { 3781sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3782 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3783
3615 my $signal = new Coro::Signal; 3784 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3785 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3786 $signal->wait;
3618} 3787}
3619 3788
3620sub wait_for_tick_begin { 3789sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3790 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3791
3624 my $signal = new Coro::Signal; 3792 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3793 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3794 $signal->wait;
3627} 3795}
3637 3805
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3806 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3808 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3809 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3810 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3811 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3812 };
3645 } 3813 }
3646 3814
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3666{ 3834{
3667 # configure BDB 3835 # configure BDB
3668 3836
3669 BDB::min_parallel 8; 3837 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3838 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3839 $AnyEvent::BDB::WATCHER->priority (1);
3672 3840
3673 unless ($DB_ENV) { 3841 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3842 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 3844 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3845 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3846 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3847 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3848
3680 cf::sync_job { 3849 cf::sync_job {
3681 eval { 3850 eval {
3707{ 3876{
3708 # configure IO::AIO 3877 # configure IO::AIO
3709 3878
3710 IO::AIO::min_parallel 8; 3879 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3880 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3881 undef $AnyEvent::AIO::WATCHER;
3713} 3882}
3714 3883
3715my $_log_backtrace; 3884my $_log_backtrace;
3716 3885
3717sub _log_backtrace { 3886sub _log_backtrace {
3720 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
3721 3890
3722 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
3725 async { 3895 async {
3726 $Coro::current->{desc} = "abt $msg"; 3896 $Coro::current->{desc} = "abt $msg";
3727 3897
3728 my @bt = fork_call { 3898 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
3740 } 3910 }
3741 3911
3742 @funcs 3912 @funcs
3743 }; 3913 };
3744 3914
3745 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 3918 --$_log_backtrace;
3748 }; 3919 };
3749 } else { 3920 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines