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.419 by root, Sun Apr 13 01:34:09 2008 UTC vs.
Revision 1.444 by root, Mon Sep 8 11:27:25 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 3.2; 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.50 (); 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
… …
90our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 97our %RESOURCE;
93 98
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 101our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
99 103
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 107our $DB_ENV;
105 108
… …
242for my $pkg (qw( 245for my $pkg (qw(
243 cf::global cf::attachable 246 cf::global cf::attachable
244 cf::object cf::object::player 247 cf::object cf::object::player
245 cf::client cf::player 248 cf::client cf::player
246 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
247 cf::map cf::party cf::region 251 cf::party cf::region
248)) { 252)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 254}
252 255
253$EV::DIED = sub { 256$EV::DIED = sub {
254 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
427 } 430 }
428 } 431 }
429}; 432};
430 433
431sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
432 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
433 438
434 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
436 441
… …
1083 1088
1084sub reattach { 1089sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1091 my ($obj) = @_;
1087 1092
1093 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1095
1090 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1091 1097
1092 @$registry = (); 1098 @$registry = ();
1093 1099
… …
1139 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1142 1148
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1153 aio_close $fh;
1148 1154
1149 if (@$objs) { 1155 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1161 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1163 }
1158 } else { 1164 } else {
1159 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1160 } 1166 }
… …
1329 1335
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1338
1333 $ext{source} = 1339 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1336 . $source 1342 . $source
1337 . "\n};\n1"; 1343 . "\n};\n1";
1338 1344
1339 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1454 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1461 or return;
1456 1462
1457 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1458 or return; 1464 or return;
1465
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1462 } 1469 }
1463 } 1470 }
… …
1473 1480
1474 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1475 1482
1476 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1478 1487
1479 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1489 cf::cede_to_tick;
1481} 1490}
1482 1491
… …
1514 my ($pl) = @_; 1523 my ($pl) = @_;
1515 1524
1516 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1517 1526
1518 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1529
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1525 1536
1526 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1577
1567 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1568 my $path = path $login; 1579 my $path = path $login;
1569 1580
1570 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1587 }
1576 1588
… …
1610} 1622}
1611 1623
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1613 1625
1614Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1627
1705=item $player->ext_reply ($msgid, @msg) 1628=item $player->ext_reply ($msgid, @msg)
1706 1629
1707Sends an ext reply to the player. 1630Sends an ext reply to the player.
1708 1631
… …
2025 1948
2026 cf::lock_wait "map_data:$path";#d#remove 1949 cf::lock_wait "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 1950 cf::lock_wait "map_find:$path";
2028 1951
2029 $cf::MAP{$path} || do { 1952 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1955
2033 my $map = new_from_path cf::map $path 1956 my $map = new_from_path cf::map $path
2034 or return; 1957 or return;
2035 1958
2036 $map->{last_save} = $cf::RUNTIME; 1959 $map->{last_save} = $cf::RUNTIME;
… …
2039 or return; 1962 or return;
2040 1963
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1964 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 1965 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 1966 #$cf::WAIT_FOR_TICK->wait;
1967 undef $guard2;
2044 undef $guard1; 1968 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 1969 $map->reset;
2047 return find $path; 1970 return find $path;
2048 } 1971 }
2049 1972
2050 $cf::MAP{$path} = $map 1973 $cf::MAP{$path} = $map
… …
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2000 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2001 $f->skip_block;
2079 $self->_load_objects ($f) 2002 $self->_load_objects ($f)
2080 or return; 2003 or return;
2081 2004
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2005 $self->post_load_original
2083 if delete $self->{load_original}; 2006 if delete $self->{load_original};
2084 2007
2085 if (my $uniq = $self->uniq_path) { 2008 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2009 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2010 unless (aio_stat $uniq) {
… …
2113 } 2036 }
2114 2037
2115 $self->{last_save} = $cf::RUNTIME; 2038 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2039 $self->last_access ($cf::RUNTIME);
2117 2040
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2041 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2042 }
2120 2043
2121 $self->post_load; 2044 $self->post_load;
2122} 2045}
2123 2046
… …
2181 my ($path, $origin, $load) = @_; 2104 my ($path, $origin, $load) = @_;
2182 2105
2183 $path = normalise $path, $origin && $origin->{path}; 2106 $path = normalise $path, $origin && $origin->{path};
2184 2107
2185 if (my $map = $cf::MAP{$path}) { 2108 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2109 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2110 }
2188 2111
2189 $MAP_PREFETCH{$path} |= $load; 2112 $MAP_PREFETCH{$path} |= $load;
2190 2113
2191 $MAP_PREFETCHER ||= cf::async { 2114 $MAP_PREFETCHER ||= cf::async {
… …
2228 cf::async { 2151 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2152 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2153 $_->contr->save for $self->players;
2231 }; 2154 };
2232 2155
2156 cf::get_slot 0.02;
2157
2233 if ($uniq) { 2158 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2159 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2160 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2161 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2245 $self->save; 2170 $self->save;
2246 2171
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2173
2249 return if $self->players; 2174 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2175 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2176 return if $self->{deny_save};
2252 2177
2253 $self->in_memory (cf::MAP_SWAPPED); 2178 $self->in_memory (cf::MAP_SWAPPED);
2254 2179
2255 $self->deactivate; 2180 $self->deactivate;
… …
2451can be C<undef>. Does the right thing when the player is currently in a 2376can be C<undef>. Does the right thing when the player is currently in a
2452dialogue with the given NPC character. 2377dialogue with the given NPC character.
2453 2378
2454=cut 2379=cut
2455 2380
2381our $SAY_CHANNEL = {
2382 id => "say",
2383 title => "Map",
2384 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2386};
2387
2388our $CHAT_CHANNEL = {
2389 id => "chat",
2390 title => "Chat",
2391 reply => "chat ",
2392 tooltip => "Player chat and shouts, global to the server.",
2393};
2394
2456# rough implementation of a future "reply" method that works 2395# rough implementation of a future "reply" method that works
2457# with dialog boxes. 2396# with dialog boxes.
2458#TODO: the first argument must go, split into a $npc->reply_to ( method 2397#TODO: the first argument must go, split into a $npc->reply_to ( method
2459sub cf::object::player::reply($$$;$) { 2398sub cf::object::player::reply($$$;$) {
2460 my ($self, $npc, $msg, $flags) = @_; 2399 my ($self, $npc, $msg, $flags) = @_;
… …
2471 my $dialog = $pl->{npc_dialog}; 2410 my $dialog = $pl->{npc_dialog};
2472 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2411 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2473 2412
2474 } else { 2413 } else {
2475 $msg = $npc->name . " says: $msg" if $npc; 2414 $msg = $npc->name . " says: $msg" if $npc;
2476 $self->message ($msg, $flags); 2415 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2477 } 2416 }
2478 } 2417 }
2479} 2418}
2480 2419
2481=item $object->send_msg ($channel, $msg, $color, [extra...]) 2420=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2588Moves the player to the given map-path and coordinates by first freezing 2527Moves the player to the given map-path and coordinates by first freezing
2589her, loading and preparing them map, calling the provided $check callback 2528her, loading and preparing them map, calling the provided $check callback
2590that has to return the map if sucecssful, and then unfreezes the player on 2529that has to return the map if sucecssful, and then unfreezes the player on
2591the new (success) or old (failed) map position. In either case, $done will 2530the new (success) or old (failed) map position. In either case, $done will
2592be called at the end of this process. 2531be called at the end of this process.
2532
2533Note that $check will be called with a potentially non-loaded map, so if
2534it needs a loaded map it has to call C<< ->load >>.
2593 2535
2594=cut 2536=cut
2595 2537
2596our $GOTOGEN; 2538our $GOTOGEN;
2597 2539
… …
2676} 2618}
2677 2619
2678sub prepare_random_map { 2620sub prepare_random_map {
2679 my ($exit) = @_; 2621 my ($exit) = @_;
2680 2622
2681 my $guard = cf::lock_acquire "exit_prepare:$exit";
2682
2683 # all this does is basically replace the /! path by 2623 # all this does is basically replace the /! path by
2684 # a new random map path (?random/...) with a seed 2624 # a new random map path (?random/...) with a seed
2685 # that depends on the exit object 2625 # that depends on the exit object
2686 2626
2687 my $rmp = parse_random_map_params $exit->msg; 2627 my $rmp = parse_random_map_params $exit->msg;
… …
2689 if ($exit->map) { 2629 if ($exit->map) {
2690 $rmp->{region} = $exit->region->name; 2630 $rmp->{region} = $exit->region->name;
2691 $rmp->{origin_map} = $exit->map->path; 2631 $rmp->{origin_map} = $exit->map->path;
2692 $rmp->{origin_x} = $exit->x; 2632 $rmp->{origin_x} = $exit->x;
2693 $rmp->{origin_y} = $exit->y; 2633 $rmp->{origin_y} = $exit->y;
2634
2635 $exit->map->touch;
2694 } 2636 }
2695 2637
2696 $rmp->{random_seed} ||= $exit->random_seed; 2638 $rmp->{random_seed} ||= $exit->random_seed;
2697 2639
2698 my $data = cf::encode_json $rmp; 2640 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2699 my $md5 = Digest::MD5::md5_hex $data; 2641 my $md5 = Digest::MD5::md5_hex $data;
2700 my $meta = "$RANDOMDIR/$md5.meta"; 2642 my $meta = "$RANDOMDIR/$md5.meta";
2701 2643
2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2644 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2703 aio_write $fh, 0, (length $data), $data, 0; 2645 aio_write $fh, 0, (length $data), $data, 0;
2704 undef $fh; 2646 undef $fh;
2705 aio_rename "$meta~", $meta; 2647 aio_rename "$meta~", $meta;
2706 2648
2649 my $slaying = "?random/$md5";
2650
2651 if ($exit->valid) {
2707 $exit->slaying ("?random/$md5"); 2652 $exit->slaying ("?random/$md5");
2708 $exit->msg (undef); 2653 $exit->msg (undef);
2654 }
2709 } 2655 }
2710} 2656}
2711 2657
2712sub cf::object::player::enter_exit { 2658sub cf::object::player::enter_exit {
2713 my ($self, $exit) = @_; 2659 my ($self, $exit) = @_;
2714 2660
2715 return unless $self->type == cf::PLAYER; 2661 return unless $self->type == cf::PLAYER;
2716 2662
2717 if ($exit->slaying eq "/!") {
2718 #TODO: this should de-fi-ni-te-ly not be a sync-job
2719 # the problem is that $exit might not survive long enough
2720 # so it needs to be done right now, right here
2721 cf::sync_job { prepare_random_map $exit };
2722 }
2723
2724 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2725 my $hp = $exit->stats->hp;
2726 my $sp = $exit->stats->sp;
2727
2728 $self->enter_link; 2663 $self->enter_link;
2729 2664
2730 # if exit is damned, update players death & WoR home-position
2731 $self->contr->savebed ($slaying, $hp, $sp)
2732 if $exit->flag (FLAG_DAMNED);
2733
2734 (async { 2665 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2666 $Coro::current->{desc} = "enter_exit";
2736 2667
2737 $self->deactivate_recursive; # just to be sure
2738 unless (eval { 2668 unless (eval {
2669 $self->deactivate_recursive; # just to be sure
2670
2671 # random map handling
2672 {
2673 my $guard = cf::lock_acquire "exit_prepare:$exit";
2674
2675 prepare_random_map $exit
2676 if $exit->slaying eq "/!";
2677 }
2678
2679 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2680 my $x = $exit->stats->hp;
2681 my $y = $exit->stats->sp;
2682
2739 $self->goto ($slaying, $hp, $sp); 2683 $self->goto ($map, $x, $y);
2740 2684
2685 # if exit is damned, update players death & WoR home-position
2686 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED);
2688
2741 1; 2689 1
2742 }) { 2690 }) {
2743 $self->message ("Something went wrong deep within the crossfire server. " 2691 $self->message ("Something went wrong deep within the crossfire server. "
2744 . "I'll try to bring you back to the map you were before. " 2692 . "I'll try to bring you back to the map you were before. "
2745 . "Please report this to the dungeon master!", 2693 . "Please report this to the dungeon master!",
2746 cf::NDI_UNIQUE | cf::NDI_RED); 2694 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2826 id => "infobox", 2774 id => "infobox",
2827 title => "Map Info", 2775 title => "Map Info",
2828 reply => undef, 2776 reply => undef,
2829 tooltip => "Information related to the maps", 2777 tooltip => "Information related to the maps",
2830 }, 2778 },
2779 "c/party" => {
2780 id => "party",
2781 title => "Party",
2782 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party",
2784 },
2831); 2785);
2832 2786
2833sub cf::client::send_msg { 2787sub cf::client::send_msg {
2834 my ($self, $channel, $msg, $color, @extra) = @_; 2788 my ($self, $channel, $msg, $color, @extra) = @_;
2835 2789
… …
2862 if ($self->can_msg) { 2816 if ($self->can_msg) {
2863 # default colour, mask it out 2817 # default colour, mask it out
2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2865 if $color & cf::NDI_DEF; 2819 if $color & cf::NDI_DEF;
2866 2820
2867 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2821 my $pkt = "msg "
2822 . $self->{json_coder}->encode (
2868 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 );
2825
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt);
2869 } else { 2837 } else {
2870 if ($color >= 0) { 2838 if ($color >= 0) {
2871 # replace some tags by gcfclient-compatible ones 2839 # replace some tags by gcfclient-compatible ones
2872 for ($msg) { 2840 for ($msg) {
2873 1 while 2841 1 while
… …
3072 3040
3073The following functions and methods are available within a safe environment: 3041The following functions and methods are available within a safe environment:
3074 3042
3075 cf::object 3043 cf::object
3076 contr pay_amount pay_player map x y force_find force_add destroy 3044 contr pay_amount pay_player map x y force_find force_add destroy
3077 insert remove name archname title slaying race decrease_ob_nr 3045 insert remove name archname title slaying race decrease split
3078 3046
3079 cf::object::player 3047 cf::object::player
3080 player 3048 player
3081 3049
3082 cf::player 3050 cf::player
… …
3087 3055
3088=cut 3056=cut
3089 3057
3090for ( 3058for (
3091 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3092 insert remove inv name archname title slaying race 3060 insert remove inv nrof name archname title slaying race
3093 decrease_ob_nr destroy)], 3061 decrease split destroy change_exp)],
3094 ["cf::object::player" => qw(player)], 3062 ["cf::object::player" => qw(player)],
3095 ["cf::player" => qw(peaceful)], 3063 ["cf::player" => qw(peaceful)],
3096 ["cf::map" => qw(trigger)], 3064 ["cf::map" => qw(trigger)],
3097) { 3065) {
3098 no strict 'refs'; 3066 no strict 'refs';
… …
3306 while (my ($k, $v) = each %$want) { 3274 while (my ($k, $v) = each %$want) {
3307 $ns->fx_want ($k, $v); 3275 $ns->fx_want ($k, $v);
3308 } 3276 }
3309}; 3277};
3310 3278
3279sub load_resource_file($) {
3280 my $guard = lock_acquire "load_resource_file";
3281
3282 my $status = load_resource_file_ $_[0];
3283 get_slot 0.1, 100;
3284 cf::arch::commit_load;
3285
3286 $status
3287}
3288
3311sub reload_regions { 3289sub reload_regions {
3312 # HACK to clear player env face cache, we need some signal framework 3290 # HACK to clear player env face cache, we need some signal framework
3313 # for this (global event?) 3291 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = (); 3292 %ext::player_env::MUSIC_FACE_CACHE = ();
3315 3293
… …
3328} 3306}
3329 3307
3330sub reload_archetypes { 3308sub reload_archetypes {
3331 load_resource_file "$DATADIR/archetypes" 3309 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n"; 3310 or die "unable to load archetypes\n";
3333 #d# NEED to laod twice to resolve forward references
3334 # this really needs to be done in an extra post-pass
3335 # (which needs to be synchronous, so solve it differently)
3336 load_resource_file "$DATADIR/archetypes"
3337 or die "unable to load archetypes\n";
3338} 3311}
3339 3312
3340sub reload_treasures { 3313sub reload_treasures {
3341 load_resource_file "$DATADIR/treasures" 3314 load_resource_file "$DATADIR/treasures"
3342 or die "unable to load treasurelists\n"; 3315 or die "unable to load treasurelists\n";
3343} 3316}
3344 3317
3345sub reload_resources { 3318sub reload_resources {
3346 warn "reloading resource files...\n"; 3319 warn "reloading resource files...\n";
3347 3320
3321 reload_facedata;
3322 reload_archetypes;
3348 reload_regions; 3323 reload_regions;
3349 reload_facedata;
3350 #reload_archetypes;#d#
3351 reload_archetypes;
3352 reload_treasures; 3324 reload_treasures;
3353 3325
3354 warn "finished reloading resource files\n"; 3326 warn "finished reloading resource files\n";
3355} 3327}
3356 3328
3357sub init { 3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3358 reload_resources; 3334 reload_resources;
3359} 3335}
3360 3336
3361sub reload_config { 3337sub reload_config {
3362 open my $fh, "<:utf8", "$CONFDIR/config" 3338 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3363 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3364 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3365 })->prio (Coro::PRIO_MAX);
3390 }; 3366 };
3391 3367
3368 {
3369 my $guard = freeze_mainloop;
3392 reload_config; 3370 reload_config;
3393 db_init; 3371 db_init;
3394 load_extensions; 3372 load_extensions;
3395 3373
3396 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3397 evthread_start IO::AIO::poll_fileno; 3375 }
3376
3398 EV::loop; 3377 EV::loop;
3399} 3378}
3400 3379
3401############################################################################# 3380#############################################################################
3402# initialisation and cleanup 3381# initialisation and cleanup
… …
3535 3514
3536 warn Carp::longmess "post_cleanup backtrace" 3515 warn Carp::longmess "post_cleanup backtrace"
3537 if $make_core; 3516 if $make_core;
3538} 3517}
3539 3518
3519# a safer delete_package, copied from Symbol
3520sub clear_package($) {
3521 my $pkg = shift;
3522
3523 # expand to full symbol table name if needed
3524 unless ($pkg =~ /^main::.*::$/) {
3525 $pkg = "main$pkg" if $pkg =~ /^::/;
3526 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3527 $pkg .= '::' unless $pkg =~ /::$/;
3528 }
3529
3530 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3531 my $stem_symtab = *{$stem}{HASH};
3532
3533 defined $stem_symtab and exists $stem_symtab->{$leaf}
3534 or return;
3535
3536 # clear all symbols
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 }
3542 warn "cleared package #$pkg\n";#d#
3543}
3544
3545our $RELOAD; # how many times to reload
3546
3540sub do_reload_perl() { 3547sub do_reload_perl() {
3541 # can/must only be called in main 3548 # can/must only be called in main
3542 if ($Coro::current != $Coro::main) { 3549 if ($Coro::current != $Coro::main) {
3543 warn "can only reload from main coroutine"; 3550 warn "can only reload from main coroutine";
3544 return; 3551 return;
3545 } 3552 }
3546 3553
3554 return if $RELOAD++;
3555
3556 while ($RELOAD) {
3547 warn "reloading..."; 3557 warn "reloading...";
3548 3558
3549 warn "entering sync_job"; 3559 warn "entering sync_job";
3550 3560
3551 cf::sync_job { 3561 cf::sync_job {
3552 cf::write_runtime_sync; # external watchdog should not bark 3562 cf::write_runtime_sync; # external watchdog should not bark
3553 cf::emergency_save; 3563 cf::emergency_save;
3554 cf::write_runtime_sync; # external watchdog should not bark 3564 cf::write_runtime_sync; # external watchdog should not bark
3555 3565
3556 warn "syncing database to disk"; 3566 warn "syncing database to disk";
3557 BDB::db_env_txn_checkpoint $DB_ENV; 3567 BDB::db_env_txn_checkpoint $DB_ENV;
3558 3568
3559 # if anything goes wrong in here, we should simply crash as we already saved 3569 # if anything goes wrong in here, we should simply crash as we already saved
3560 3570
3561 warn "flushing outstanding aio requests"; 3571 warn "flushing outstanding aio requests";
3562 for (;;) {
3563 BDB::flush;
3564 IO::AIO::flush;
3565 Coro::cede_notself;
3566 last unless IO::AIO::nreqs || BDB::nreqs; 3572 while (IO::AIO::nreqs || BDB::nreqs) {
3567 warn "iterate..."; 3573 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3568 }
3569
3570 ++$RELOAD;
3571
3572 warn "cancelling all extension coros";
3573 $_->cancel for values %EXT_CORO;
3574 %EXT_CORO = ();
3575
3576 warn "removing commands";
3577 %COMMAND = ();
3578
3579 warn "removing ext/exti commands";
3580 %EXTCMD = ();
3581 %EXTICMD = ();
3582
3583 warn "unloading/nuking all extensions";
3584 for my $pkg (@EXTS) {
3585 warn "... unloading $pkg";
3586
3587 if (my $cb = $pkg->can ("unload")) {
3588 eval {
3589 $cb->($pkg);
3590 1
3591 } or warn "$pkg unloaded, but with errors: $@";
3592 } 3574 }
3593 3575
3594 warn "... nuking $pkg"; 3576 warn "cancelling all extension coros";
3595 Symbol::delete_package $pkg; 3577 $_->cancel for values %EXT_CORO;
3596 } 3578 %EXT_CORO = ();
3597 3579
3598 warn "unloading all perl modules loaded from $LIBDIR"; 3580 warn "removing commands";
3599 while (my ($k, $v) = each %INC) { 3581 %COMMAND = ();
3600 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3601 3582
3583 warn "removing ext/exti commands";
3584 %EXTCMD = ();
3585 %EXTICMD = ();
3586
3587 warn "unloading/nuking all extensions";
3588 for my $pkg (@EXTS) {
3602 warn "... unloading $k"; 3589 warn "... unloading $pkg";
3603 delete $INC{$k};
3604 3590
3605 $k =~ s/\.pm$//;
3606 $k =~ s/\//::/g;
3607
3608 if (my $cb = $k->can ("unload_module")) { 3591 if (my $cb = $pkg->can ("unload")) {
3592 eval {
3609 $cb->(); 3593 $cb->($pkg);
3594 1
3595 } or warn "$pkg unloaded, but with errors: $@";
3596 }
3597
3598 warn "... clearing $pkg";
3599 clear_package $pkg;
3610 } 3600 }
3611 3601
3612 Symbol::delete_package $k; 3602 warn "unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605
3606 warn "... unloading $k";
3607 delete $INC{$k};
3608
3609 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g;
3611
3612 if (my $cb = $k->can ("unload_module")) {
3613 $cb->();
3614 }
3615
3616 clear_package $k;
3613 } 3617 }
3614 3618
3615 warn "getting rid of safe::, as good as possible"; 3619 warn "getting rid of safe::, as good as possible";
3616 Symbol::delete_package "safe::$_" 3620 clear_package "safe::$_"
3617 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3618 3622
3619 warn "unloading cf.pm \"a bit\""; 3623 warn "unloading cf.pm \"a bit\"";
3620 delete $INC{"cf.pm"}; 3624 delete $INC{"cf.pm"};
3621 delete $INC{"cf/pod.pm"}; 3625 delete $INC{"cf/pod.pm"};
3622 3626
3623 # don't, removes xs symbols, too, 3627 # don't, removes xs symbols, too,
3624 # and global variables created in xs 3628 # and global variables created in xs
3625 #Symbol::delete_package __PACKAGE__; 3629 #clear_package __PACKAGE__;
3626 3630
3627 warn "unload completed, starting to reload now"; 3631 warn "unload completed, starting to reload now";
3628 3632
3629 warn "reloading cf.pm"; 3633 warn "reloading cf.pm";
3630 require cf; 3634 require cf;
3631 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3632 3636
3633 warn "loading config and database again"; 3637 warn "loading config and database again";
3634 cf::reload_config; 3638 cf::reload_config;
3635 3639
3636 warn "loading extensions"; 3640 warn "loading extensions";
3637 cf::load_extensions; 3641 cf::load_extensions;
3638 3642
3639 warn "reattaching attachments to objects/players"; 3643 warn "reattaching attachments to objects/players";
3640 _global_reattach; # objects, sockets 3644 _global_reattach; # objects, sockets
3641 warn "reattaching attachments to maps"; 3645 warn "reattaching attachments to maps";
3642 reattach $_ for values %MAP; 3646 reattach $_ for values %MAP;
3643 warn "reattaching attachments to players"; 3647 warn "reattaching attachments to players";
3644 reattach $_ for values %PLAYER; 3648 reattach $_ for values %PLAYER;
3645 3649
3646 warn "leaving sync_job"; 3650 warn "leaving sync_job";
3647 3651
3648 1 3652 1
3649 } or do { 3653 } or do {
3650 warn $@; 3654 warn $@;
3651 cf::cleanup "error while reloading, exiting."; 3655 cf::cleanup "error while reloading, exiting.";
3652 }; 3656 };
3653 3657
3654 warn "reloaded"; 3658 warn "reloaded";
3659 --$RELOAD;
3660 }
3655}; 3661};
3656 3662
3657our $RELOAD_WATCHER; # used only during reload 3663our $RELOAD_WATCHER; # used only during reload
3658 3664
3659sub reload_perl() { 3665sub reload_perl() {
… …
3684 3690
3685our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3686our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3687 3693
3688sub wait_for_tick { 3694sub wait_for_tick {
3689 return if tick_inhibit;
3690 return if $Coro::current == $Coro::main; 3695 return if tick_inhibit || $Coro::current == $Coro::main;
3691 3696
3692 my $signal = new Coro::Signal; 3697 my $signal = new Coro::Signal;
3693 push @WAIT_FOR_TICK, $signal; 3698 push @WAIT_FOR_TICK, $signal;
3694 $signal->wait; 3699 $signal->wait;
3695} 3700}
3696 3701
3697sub wait_for_tick_begin { 3702sub wait_for_tick_begin {
3698 return if tick_inhibit;
3699 return if $Coro::current == $Coro::main; 3703 return if tick_inhibit || $Coro::current == $Coro::main;
3700 3704
3701 my $signal = new Coro::Signal; 3705 my $signal = new Coro::Signal;
3702 push @WAIT_FOR_TICK_BEGIN, $signal; 3706 push @WAIT_FOR_TICK_BEGIN, $signal;
3703 $signal->wait; 3707 $signal->wait;
3704} 3708}
… …
3743{ 3747{
3744 # configure BDB 3748 # configure BDB
3745 3749
3746 BDB::min_parallel 8; 3750 BDB::min_parallel 8;
3747 BDB::max_poll_reqs $TICK * 0.1; 3751 BDB::max_poll_reqs $TICK * 0.1;
3748 $Coro::BDB::WATCHER->priority (1); 3752 $AnyEvent::BDB::WATCHER->priority (1);
3749 3753
3750 unless ($DB_ENV) { 3754 unless ($DB_ENV) {
3751 $DB_ENV = BDB::db_env_create; 3755 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3756 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3753 | BDB::LOG_AUTOREMOVE, 1); 3757 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3758 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3759 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3760 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3756 3761
3757 cf::sync_job { 3762 cf::sync_job {
3758 eval { 3763 eval {
… …
3784{ 3789{
3785 # configure IO::AIO 3790 # configure IO::AIO
3786 3791
3787 IO::AIO::min_parallel 8; 3792 IO::AIO::min_parallel 8;
3788 IO::AIO::max_poll_time $TICK * 0.1; 3793 IO::AIO::max_poll_time $TICK * 0.1;
3789 $Coro::AIO::WATCHER->priority (1); 3794 undef $AnyEvent::AIO::WATCHER;
3790} 3795}
3791 3796
3792my $_log_backtrace; 3797my $_log_backtrace;
3793 3798
3794sub _log_backtrace { 3799sub _log_backtrace {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines