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.425 by root, Mon Apr 21 06:35:26 2008 UTC vs.
Revision 1.447 by root, Fri Sep 19 01:39:45 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
… …
76our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
77 82
78our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
79our @EVENT; 84our @EVENT;
80 85
81our $CONFDIR = confdir; 86our $CONFDIR = confdir;
82our $DATADIR = datadir; 87our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 88our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 89our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 90our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 91our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime";
99
92our %RESOURCE; 100our %RESOURCE;
93 101
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 104our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 105our $USE_FSYNC = 1; # use fsync to write maps - default off
99 106
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 107our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 108our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 109our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 110our $DB_ENV;
105 111
… …
123 129
124binmode STDOUT; 130binmode STDOUT;
125binmode STDERR; 131binmode STDERR;
126 132
127# read virtual server time, if available 133# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 134unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 135 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 136 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 137 $RUNTIME = <$fh> + 0.;
132} 138}
133 139
134mkdir $_ 140mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 248for my $pkg (qw(
243 cf::global cf::attachable 249 cf::global cf::attachable
244 cf::object cf::object::player 250 cf::object cf::object::player
245 cf::client cf::player 251 cf::client cf::player
246 cf::arch cf::living 252 cf::arch cf::living
253 cf::map cf::mapspace
247 cf::map cf::party cf::region 254 cf::party cf::region
248)) { 255)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 257}
252 258
253$EV::DIED = sub { 259$EV::DIED = sub {
254 warn "error in event callback: @_"; 260 warn "error in event callback: @_";
… …
724 730
725############################################################################# 731#############################################################################
726 732
727=head2 ATTACHABLE OBJECTS 733=head2 ATTACHABLE OBJECTS
728 734
729Many objects in crossfire are so-called attachable objects. That means you can 735Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 736attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 737to it. All such attachable objects support the following methods.
732 738
733In the following description, CLASS can be any of C<global>, C<object> 739In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 740C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
784=item cf::CLASS::attachment $name, ... 790=item cf::CLASS::attachment $name, ...
785 791
786Register an attachment by C<$name> through which attachable objects of the 792Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 793given CLASS can refer to this attachment.
788 794
789Some classes such as crossfire maps and objects can specify attachments 795Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 796that are attached at load/instantiate time, thus the need for a name.
791 797
792These calls expect any number of the following handler/hook descriptions: 798These calls expect any number of the following handler/hook descriptions:
793 799
794=over 4 800=over 4
… …
1085 1091
1086sub reattach { 1092sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1093 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1094 my ($obj) = @_;
1089 1095
1096 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1097 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1098
1092 my $registry = $obj->registry; 1099 my $registry = $obj->registry;
1093 1100
1094 @$registry = (); 1101 @$registry = ();
1095 1102
… …
1141 utf8::decode (my $decname = $filename); 1148 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1149 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1150 $decname, length $$rdata, scalar @$objs;
1144 1151
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1155 aio_fsync $fh if $cf::USE_FSYNC;
1149 close $fh; 1156 aio_close $fh;
1150 1157
1151 if (@$objs) { 1158 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1160 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1162 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1163 aio_fsync $fh if $cf::USE_FSYNC;
1157 close $fh; 1164 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1165 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1166 }
1160 } else { 1167 } else {
1161 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1162 } 1169 }
… …
1331 1338
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1341
1335 $ext{source} = 1342 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1344 . "#line 1 \"$path\"\n{\n"
1338 . $source 1345 . $source
1339 . "\n};\n1"; 1346 . "\n};\n1";
1340 1347
1341 $todo{$base} = \%ext; 1348 $todo{$base} = \%ext;
… …
1381 1388
1382=back 1389=back
1383 1390
1384=head2 CORE EXTENSIONS 1391=head2 CORE EXTENSIONS
1385 1392
1386Functions and methods that extend core crossfire objects. 1393Functions and methods that extend core deliantra objects.
1387 1394
1388=cut 1395=cut
1389 1396
1390package cf::player; 1397package cf::player;
1391 1398
… …
1456 my $f = new_from_file cf::object::thawer path $login 1463 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1464 or return;
1458 1465
1459 my $pl = cf::player::load_pl $f 1466 my $pl = cf::player::load_pl $f
1460 or return; 1467 or return;
1468
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1469 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1470 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1471 $cf::PLAYER{$login} = $pl
1464 } 1472 }
1465 } 1473 }
… …
1518 my ($pl) = @_; 1526 my ($pl) = @_;
1519 1527
1520 my $name = $pl->ob->name; 1528 my $name = $pl->ob->name;
1521 1529
1522 $pl->{deny_save} = 1; 1530 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1532
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1534 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1537 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1538 $pl->ns->destroy if $pl->ns;
1529 1539
1530 my $path = playerdir $pl; 1540 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1541 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1570 1580
1571 for my $login (@$dirs) { 1581 for my $login (@$dirs) {
1572 my $path = path $login; 1582 my $path = path $login;
1573 1583
1574 # a .pst is a dead give-away for a valid player 1584 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1585 # if no pst file found, open and chekc for blocked users
1586 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1587 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1588 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1589 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1590 }
1580 1591
… …
1611 } 1622 }
1612 1623
1613 \@paths 1624 \@paths
1614} 1625}
1615 1626
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1628
1618Expand crossfire pod fragments into protocol xml. 1629Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1630
1709=item $player->ext_reply ($msgid, @msg) 1631=item $player->ext_reply ($msgid, @msg)
1710 1632
1711Sends an ext reply to the player. 1633Sends an ext reply to the player.
1712 1634
… …
2029 1951
2030 cf::lock_wait "map_data:$path";#d#remove 1952 cf::lock_wait "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1953 cf::lock_wait "map_find:$path";
2032 1954
2033 $cf::MAP{$path} || do { 1955 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
2036 1958
2037 my $map = new_from_path cf::map $path 1959 my $map = new_from_path cf::map $path
2038 or return; 1960 or return;
2039 1961
2040 $map->{last_save} = $cf::RUNTIME; 1962 $map->{last_save} = $cf::RUNTIME;
… …
2043 or return; 1965 or return;
2044 1966
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1967 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1968 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1969 #$cf::WAIT_FOR_TICK->wait;
1970 undef $guard2;
2048 undef $guard1; 1971 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 1972 $map->reset;
2051 return find $path; 1973 return find $path;
2052 } 1974 }
2053 1975
2054 $cf::MAP{$path} = $map 1976 $cf::MAP{$path} = $map
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2003 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2004 $f->skip_block;
2083 $self->_load_objects ($f) 2005 $self->_load_objects ($f)
2084 or return; 2006 or return;
2085 2007
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
2087 if delete $self->{load_original}; 2009 if delete $self->{load_original};
2088 2010
2089 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2012 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2013 unless (aio_stat $uniq) {
… …
2457can be C<undef>. Does the right thing when the player is currently in a 2379can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2380dialogue with the given NPC character.
2459 2381
2460=cut 2382=cut
2461 2383
2384our $SAY_CHANNEL = {
2385 id => "say",
2386 title => "Map",
2387 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2389};
2390
2391our $CHAT_CHANNEL = {
2392 id => "chat",
2393 title => "Chat",
2394 reply => "chat ",
2395 tooltip => "Player chat and shouts, global to the server.",
2396};
2397
2462# rough implementation of a future "reply" method that works 2398# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2399# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2400#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2401sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2402 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2413 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2414 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2415
2480 } else { 2416 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2417 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2418 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2419 }
2484 } 2420 }
2485} 2421}
2486 2422
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2423=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2512 2448
2513=item $player_object->enter_link 2449=item $player_object->enter_link
2514 2450
2515Freezes the player and moves him/her to a special map (C<{link}>). 2451Freezes the player and moves him/her to a special map (C<{link}>).
2516 2452
2517The player should be reasonably safe there for short amounts of time. You 2453The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2454for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link
2456map.
2519 2457
2520Will never block. 2458Will never block.
2521 2459
2522=item $player_object->leave_link ($map, $x, $y) 2460=item $player_object->leave_link ($map, $x, $y)
2523 2461
… …
2581 2519
2582 $map->load; 2520 $map->load;
2583 $map->load_neighbours; 2521 $map->load_neighbours;
2584 2522
2585 return unless $self->contr->active; 2523 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2586 $self->activate_recursive; 2525 $self->activate_recursive;
2587 2526
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
2590} 2529}
… …
2594Moves the player to the given map-path and coordinates by first freezing 2533Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2534her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2535that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2536the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2537be called at the end of this process.
2538
2539Note that $check will be called with a potentially non-loaded map, so if
2540it needs a loaded map it has to call C<< ->load >>.
2599 2541
2600=cut 2542=cut
2601 2543
2602our $GOTOGEN; 2544our $GOTOGEN;
2603 2545
… …
2682} 2624}
2683 2625
2684sub prepare_random_map { 2626sub prepare_random_map {
2685 my ($exit) = @_; 2627 my ($exit) = @_;
2686 2628
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2629 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2630 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2631 # that depends on the exit object
2692 2632
2693 my $rmp = parse_random_map_params $exit->msg; 2633 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2635 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2636 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2637 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2638 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2640
2641 $exit->map->touch;
2700 } 2642 }
2701 2643
2702 $rmp->{random_seed} ||= $exit->random_seed; 2644 $rmp->{random_seed} ||= $exit->random_seed;
2703 2645
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2646 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2650 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2651 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2652 undef $fh;
2711 aio_rename "$meta~", $meta; 2653 aio_rename "$meta~", $meta;
2712 2654
2655 my $slaying = "?random/$md5";
2656
2657 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2658 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2659 $exit->msg (undef);
2660 }
2715 } 2661 }
2716} 2662}
2717 2663
2718sub cf::object::player::enter_exit { 2664sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2665 my ($self, $exit) = @_;
2720 2666
2721 return unless $self->type == cf::PLAYER; 2667 return unless $self->type == cf::PLAYER;
2722 2668
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2669 $self->enter_link;
2735 2670
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2671 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2672 $Coro::current->{desc} = "enter_exit";
2742 2673
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2674 unless (eval {
2675 $self->deactivate_recursive; # just to be sure
2676
2677 # random map handling
2678 {
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 prepare_random_map $exit
2682 if $exit->slaying eq "/!";
2683 }
2684
2685 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2686 my $x = $exit->stats->hp;
2687 my $y = $exit->stats->sp;
2688
2745 $self->goto ($slaying, $hp, $sp); 2689 $self->goto ($map, $x, $y);
2746 2690
2691 # if exit is damned, update players death & WoR home-position
2692 $self->contr->savebed ($map, $x, $y)
2693 if $exit->flag (cf::FLAG_DAMNED);
2694
2747 1; 2695 1
2748 }) { 2696 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2697 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2698 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2699 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2700 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2701
2754 warn "ERROR in enter_exit: $@"; 2702 warn "ERROR in enter_exit: $@";
… …
2832 id => "infobox", 2780 id => "infobox",
2833 title => "Map Info", 2781 title => "Map Info",
2834 reply => undef, 2782 reply => undef,
2835 tooltip => "Information related to the maps", 2783 tooltip => "Information related to the maps",
2836 }, 2784 },
2785 "c/party" => {
2786 id => "party",
2787 title => "Party",
2788 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party",
2790 },
2837); 2791);
2838 2792
2839sub cf::client::send_msg { 2793sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2794 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2795
2842 $msg = $self->pl->expand_cfpod ($msg); 2796 $msg = $self->pl->expand_cfpod ($msg)
2797 unless $color & cf::NDI_VERBATIM;
2843 2798
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2799 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2800
2846 # check predefined channels, for the benefit of C 2801 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2802 if ($CHANNEL{$channel}) {
… …
2868 if ($self->can_msg) { 2823 if ($self->can_msg) {
2869 # default colour, mask it out 2824 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2826 if $color & cf::NDI_DEF;
2872 2827
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2828 my $pkt = "msg "
2829 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 );
2832
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt);
2875 } else { 2844 } else {
2876 if ($color >= 0) { 2845 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones 2846 # replace some tags by gcfclient-compatible ones
2878 for ($msg) { 2847 for ($msg) {
2879 1 while 2848 1 while
… …
3093 3062
3094=cut 3063=cut
3095 3064
3096for ( 3065for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3066 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3067 insert remove inv nrof name archname title slaying race
3099 decrease split destroy)], 3068 decrease split destroy change_exp)],
3100 ["cf::object::player" => qw(player)], 3069 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3070 ["cf::player" => qw(peaceful)],
3102 ["cf::map" => qw(trigger)], 3071 ["cf::map" => qw(trigger)],
3103) { 3072) {
3104 no strict 'refs'; 3073 no strict 'refs';
… …
3365} 3334}
3366 3335
3367sub init { 3336sub init {
3368 my $guard = freeze_mainloop; 3337 my $guard = freeze_mainloop;
3369 3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3370 reload_resources; 3341 reload_resources;
3371} 3342}
3372 3343
3373sub reload_config { 3344sub reload_config {
3374 open my $fh, "<:utf8", "$CONFDIR/config" 3345 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3389 }; 3360 };
3390 warn $@ if $@; 3361 warn $@ if $@;
3391 } 3362 }
3392} 3363}
3393 3364
3365sub pidfile() {
3366 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3367 or die "$PIDFILE: $!";
3368 flock $fh, &Fcntl::LOCK_EX
3369 or die "$PIDFILE: flock: $!";
3370 $fh
3371}
3372
3373# make sure only one server instance is running at any one time
3374sub atomic {
3375 my $fh = pidfile;
3376
3377 my $pid = <$fh>;
3378 kill 9, $pid if $pid > 0;
3379
3380 seek $fh, 0, 0;
3381 print $fh $$;
3382}
3383
3394sub main { 3384sub main {
3385 atomic;
3386
3395 # we must not ever block the main coroutine 3387 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3388 local $Coro::idle = sub {
3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3398 (async { 3390 (async {
3399 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3391 $Coro::current->{desc} = "IDLE BUG HANDLER";
… …
3406 reload_config; 3398 reload_config;
3407 db_init; 3399 db_init;
3408 load_extensions; 3400 load_extensions;
3409 3401
3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3411 evthread_start IO::AIO::poll_fileno;
3412 } 3403 }
3404
3405 utime time, time, $RUNTIMEFILE;
3406
3407 # no (long-running) fork's whatsoever before this point(!)
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3413 3409
3414 EV::loop; 3410 EV::loop;
3415} 3411}
3416 3412
3417############################################################################# 3413#############################################################################
… …
3426 }; 3422 };
3427 } 3423 }
3428} 3424}
3429 3425
3430sub write_runtime_sync { 3426sub write_runtime_sync {
3431 my $runtime = "$LOCALDIR/runtime";
3432
3433 # first touch the runtime file to show we are still running: 3427 # first touch the runtime file to show we are still running:
3434 # the fsync below can take a very very long time. 3428 # the fsync below can take a very very long time.
3435 3429
3436 IO::AIO::aio_utime $runtime, undef, undef; 3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3437 3431
3438 my $guard = cf::lock_acquire "write_runtime"; 3432 my $guard = cf::lock_acquire "write_runtime";
3439 3433
3440 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3441 or return; 3435 or return;
3442 3436
3443 my $value = $cf::RUNTIME + 90 + 10; 3437 my $value = $cf::RUNTIME + 90 + 10;
3444 # 10 is the runtime save interval, for a monotonic clock 3438 # 10 is the runtime save interval, for a monotonic clock
3445 # 60 allows for the watchdog to kill the server. 3439 # 60 allows for the watchdog to kill the server.
… …
3455 aio_utime $fh, undef, undef; 3449 aio_utime $fh, undef, undef;
3456 3450
3457 close $fh 3451 close $fh
3458 or return; 3452 or return;
3459 3453
3460 aio_rename "$runtime~", $runtime 3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3461 and return; 3455 and return;
3462 3456
3463 warn "runtime file written.\n"; 3457 warn "runtime file written.\n";
3464 3458
3465 1 3459 1
… …
3549sub post_cleanup { 3543sub post_cleanup {
3550 my ($make_core) = @_; 3544 my ($make_core) = @_;
3551 3545
3552 warn Carp::longmess "post_cleanup backtrace" 3546 warn Carp::longmess "post_cleanup backtrace"
3553 if $make_core; 3547 if $make_core;
3548
3549 my $fh = pidfile;
3550 unlink $PIDFILE if <$fh> == $$;
3554} 3551}
3552
3553# a safer delete_package, copied from Symbol
3554sub clear_package($) {
3555 my $pkg = shift;
3556
3557 # expand to full symbol table name if needed
3558 unless ($pkg =~ /^main::.*::$/) {
3559 $pkg = "main$pkg" if $pkg =~ /^::/;
3560 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3561 $pkg .= '::' unless $pkg =~ /::$/;
3562 }
3563
3564 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3565 my $stem_symtab = *{$stem}{HASH};
3566
3567 defined $stem_symtab and exists $stem_symtab->{$leaf}
3568 or return;
3569
3570 # clear all symbols
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 }
3576 warn "cleared package #$pkg\n";#d#
3577}
3578
3579our $RELOAD; # how many times to reload
3555 3580
3556sub do_reload_perl() { 3581sub do_reload_perl() {
3557 # can/must only be called in main 3582 # can/must only be called in main
3558 if ($Coro::current != $Coro::main) { 3583 if ($Coro::current != $Coro::main) {
3559 warn "can only reload from main coroutine"; 3584 warn "can only reload from main coroutine";
3560 return; 3585 return;
3561 } 3586 }
3562 3587
3588 return if $RELOAD++;
3589
3590 while ($RELOAD) {
3563 warn "reloading..."; 3591 warn "reloading...";
3564 3592
3565 warn "entering sync_job"; 3593 warn "entering sync_job";
3566 3594
3567 cf::sync_job { 3595 cf::sync_job {
3568 cf::write_runtime_sync; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
3569 cf::emergency_save; 3597 cf::emergency_save;
3570 cf::write_runtime_sync; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3571 3599
3572 warn "syncing database to disk"; 3600 warn "syncing database to disk";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
3574 3602
3575 # if anything goes wrong in here, we should simply crash as we already saved 3603 # if anything goes wrong in here, we should simply crash as we already saved
3576 3604
3577 warn "flushing outstanding aio requests"; 3605 warn "flushing outstanding aio requests";
3578 for (;;) {
3579 BDB::flush;
3580 IO::AIO::flush;
3581 Coro::cede_notself;
3582 last unless IO::AIO::nreqs || BDB::nreqs; 3606 while (IO::AIO::nreqs || BDB::nreqs) {
3583 warn "iterate..."; 3607 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3584 }
3585
3586 ++$RELOAD;
3587
3588 warn "cancelling all extension coros";
3589 $_->cancel for values %EXT_CORO;
3590 %EXT_CORO = ();
3591
3592 warn "removing commands";
3593 %COMMAND = ();
3594
3595 warn "removing ext/exti commands";
3596 %EXTCMD = ();
3597 %EXTICMD = ();
3598
3599 warn "unloading/nuking all extensions";
3600 for my $pkg (@EXTS) {
3601 warn "... unloading $pkg";
3602
3603 if (my $cb = $pkg->can ("unload")) {
3604 eval {
3605 $cb->($pkg);
3606 1
3607 } or warn "$pkg unloaded, but with errors: $@";
3608 } 3608 }
3609 3609
3610 warn "... nuking $pkg"; 3610 warn "cancelling all extension coros";
3611 Symbol::delete_package $pkg; 3611 $_->cancel for values %EXT_CORO;
3612 } 3612 %EXT_CORO = ();
3613 3613
3614 warn "unloading all perl modules loaded from $LIBDIR"; 3614 warn "removing commands";
3615 while (my ($k, $v) = each %INC) { 3615 %COMMAND = ();
3616 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3617 3616
3617 warn "removing ext/exti commands";
3618 %EXTCMD = ();
3619 %EXTICMD = ();
3620
3621 warn "unloading/nuking all extensions";
3622 for my $pkg (@EXTS) {
3618 warn "... unloading $k"; 3623 warn "... unloading $pkg";
3619 delete $INC{$k};
3620 3624
3621 $k =~ s/\.pm$//;
3622 $k =~ s/\//::/g;
3623
3624 if (my $cb = $k->can ("unload_module")) { 3625 if (my $cb = $pkg->can ("unload")) {
3626 eval {
3625 $cb->(); 3627 $cb->($pkg);
3628 1
3629 } or warn "$pkg unloaded, but with errors: $@";
3630 }
3631
3632 warn "... clearing $pkg";
3633 clear_package $pkg;
3626 } 3634 }
3627 3635
3628 Symbol::delete_package $k; 3636 warn "unloading all perl modules loaded from $LIBDIR";
3637 while (my ($k, $v) = each %INC) {
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639
3640 warn "... unloading $k";
3641 delete $INC{$k};
3642
3643 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g;
3645
3646 if (my $cb = $k->can ("unload_module")) {
3647 $cb->();
3648 }
3649
3650 clear_package $k;
3629 } 3651 }
3630 3652
3631 warn "getting rid of safe::, as good as possible"; 3653 warn "getting rid of safe::, as good as possible";
3632 Symbol::delete_package "safe::$_" 3654 clear_package "safe::$_"
3633 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3634 3656
3635 warn "unloading cf.pm \"a bit\""; 3657 warn "unloading cf.pm \"a bit\"";
3636 delete $INC{"cf.pm"}; 3658 delete $INC{"cf.pm"};
3637 delete $INC{"cf/pod.pm"}; 3659 delete $INC{"cf/pod.pm"};
3638 3660
3639 # don't, removes xs symbols, too, 3661 # don't, removes xs symbols, too,
3640 # and global variables created in xs 3662 # and global variables created in xs
3641 #Symbol::delete_package __PACKAGE__; 3663 #clear_package __PACKAGE__;
3642 3664
3643 warn "unload completed, starting to reload now"; 3665 warn "unload completed, starting to reload now";
3644 3666
3645 warn "reloading cf.pm"; 3667 warn "reloading cf.pm";
3646 require cf; 3668 require cf;
3647 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3648 3670
3649 warn "loading config and database again"; 3671 warn "loading config and database again";
3650 cf::reload_config; 3672 cf::reload_config;
3651 3673
3652 warn "loading extensions"; 3674 warn "loading extensions";
3653 cf::load_extensions; 3675 cf::load_extensions;
3654 3676
3655 warn "reattaching attachments to objects/players"; 3677 warn "reattaching attachments to objects/players";
3656 _global_reattach; # objects, sockets 3678 _global_reattach; # objects, sockets
3657 warn "reattaching attachments to maps"; 3679 warn "reattaching attachments to maps";
3658 reattach $_ for values %MAP; 3680 reattach $_ for values %MAP;
3659 warn "reattaching attachments to players"; 3681 warn "reattaching attachments to players";
3660 reattach $_ for values %PLAYER; 3682 reattach $_ for values %PLAYER;
3661 3683
3662 warn "leaving sync_job"; 3684 warn "leaving sync_job";
3663 3685
3664 1 3686 1
3665 } or do { 3687 } or do {
3666 warn $@; 3688 warn $@;
3667 cf::cleanup "error while reloading, exiting."; 3689 cf::cleanup "error while reloading, exiting.";
3668 }; 3690 };
3669 3691
3670 warn "reloaded"; 3692 warn "reloaded";
3693 --$RELOAD;
3694 }
3671}; 3695};
3672 3696
3673our $RELOAD_WATCHER; # used only during reload 3697our $RELOAD_WATCHER; # used only during reload
3674 3698
3675sub reload_perl() { 3699sub reload_perl() {
… …
3757{ 3781{
3758 # configure BDB 3782 # configure BDB
3759 3783
3760 BDB::min_parallel 8; 3784 BDB::min_parallel 8;
3761 BDB::max_poll_reqs $TICK * 0.1; 3785 BDB::max_poll_reqs $TICK * 0.1;
3762 $Coro::BDB::WATCHER->priority (1); 3786 $AnyEvent::BDB::WATCHER->priority (1);
3763 3787
3764 unless ($DB_ENV) { 3788 unless ($DB_ENV) {
3765 $DB_ENV = BDB::db_env_create; 3789 $DB_ENV = BDB::db_env_create;
3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3790 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3767 | BDB::LOG_AUTOREMOVE, 1); 3791 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3792 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3768 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3793 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3769 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3794 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3770 3795
3771 cf::sync_job { 3796 cf::sync_job {
3772 eval { 3797 eval {
… …
3798{ 3823{
3799 # configure IO::AIO 3824 # configure IO::AIO
3800 3825
3801 IO::AIO::min_parallel 8; 3826 IO::AIO::min_parallel 8;
3802 IO::AIO::max_poll_time $TICK * 0.1; 3827 IO::AIO::max_poll_time $TICK * 0.1;
3803 $Coro::AIO::WATCHER->priority (1); 3828 undef $AnyEvent::AIO::WATCHER;
3804} 3829}
3805 3830
3806my $_log_backtrace; 3831my $_log_backtrace;
3807 3832
3808sub _log_backtrace { 3833sub _log_backtrace {
… …
3811 $msg =~ s/\n//; 3836 $msg =~ s/\n//;
3812 3837
3813 # limit the # of concurrent backtraces 3838 # limit the # of concurrent backtraces
3814 if ($_log_backtrace < 2) { 3839 if ($_log_backtrace < 2) {
3815 ++$_log_backtrace; 3840 ++$_log_backtrace;
3841 my $perl_bt = Carp::longmess $msg;
3816 async { 3842 async {
3817 $Coro::current->{desc} = "abt $msg"; 3843 $Coro::current->{desc} = "abt $msg";
3818 3844
3819 my @bt = fork_call { 3845 my @bt = fork_call {
3820 @addr = map { sprintf "%x", $_ } @addr; 3846 @addr = map { sprintf "%x", $_ } @addr;
… …
3831 } 3857 }
3832 3858
3833 @funcs 3859 @funcs
3834 }; 3860 };
3835 3861
3836 LOG llevInfo, "[ABT] $msg\n"; 3862 LOG llevInfo, "[ABT] $perl_bt\n";
3863 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3837 LOG llevInfo, "[ABT] $_\n" for @bt; 3864 LOG llevInfo, "[ABT] $_\n" for @bt;
3838 --$_log_backtrace; 3865 --$_log_backtrace;
3839 }; 3866 };
3840 } else { 3867 } else {
3841 LOG llevInfo, "[ABT] $msg\n"; 3868 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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