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.421 by root, Tue Apr 15 18:43:11 2008 UTC vs.
Revision 1.446 by root, Tue Sep 16 16:03:02 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: @_";
… …
427 } 433 }
428 } 434 }
429}; 435};
430 436
431sub get_slot($;$$) { 437sub get_slot($;$$) {
432 return if tick_inhibit; 438 return if tick_inhibit || $Coro::current == $Coro::main;
433 439
434 my ($time, $pri, $name) = @_; 440 my ($time, $pri, $name) = @_;
435 441
436 $time = $TICK * .6 if $time > $TICK * .6; 442 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal; 443 my $sig = new Coro::Signal;
… …
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;
… …
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
… …
1614} 1625}
1615 1626
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1617 1628
1618Expand crossfire pod fragments into protocol xml. 1629Expand crossfire 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->canolicalize->encode ($rmp); 2646 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705 my $md5 = Digest::MD5::md5_hex $data; 2647 my $md5 = Digest::MD5::md5_hex $data;
2706 my $meta = "$RANDOMDIR/$md5.meta"; 2648 my $meta = "$RANDOMDIR/$md5.meta";
2707 2649
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 crossfire 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);
… …
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
… …
2868 if ($self->can_msg) { 2822 if ($self->can_msg) {
2869 # default colour, mask it out 2823 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2824 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2825 if $color & cf::NDI_DEF;
2872 2826
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2827 my $pkt = "msg "
2828 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2829 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2830 );
2831
2832 # try lzf for large packets
2833 $pkt = "lzf " . Compress::LZF::compress $pkt
2834 if 1024 <= length $pkt and $self->{can_lzf};
2835
2836 # split very large packets
2837 if (8192 < length $pkt and $self->{can_lzf}) {
2838 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2839 $pkt = "frag";
2840 }
2841
2842 $self->send_packet ($pkt);
2875 } else { 2843 } else {
2876 if ($color >= 0) { 2844 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones 2845 # replace some tags by gcfclient-compatible ones
2878 for ($msg) { 2846 for ($msg) {
2879 1 while 2847 1 while
… …
3078 3046
3079The following functions and methods are available within a safe environment: 3047The following functions and methods are available within a safe environment:
3080 3048
3081 cf::object 3049 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3050 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3051 insert remove name archname title slaying race decrease split
3084 3052
3085 cf::object::player 3053 cf::object::player
3086 player 3054 player
3087 3055
3088 cf::player 3056 cf::player
… …
3093 3061
3094=cut 3062=cut
3095 3063
3096for ( 3064for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3065 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3066 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3067 decrease split destroy change_exp)],
3100 ["cf::object::player" => qw(player)], 3068 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3069 ["cf::player" => qw(peaceful)],
3102 ["cf::map" => qw(trigger)], 3070 ["cf::map" => qw(trigger)],
3103) { 3071) {
3104 no strict 'refs'; 3072 no strict 'refs';
… …
3312 while (my ($k, $v) = each %$want) { 3280 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3281 $ns->fx_want ($k, $v);
3314 } 3282 }
3315}; 3283};
3316 3284
3285sub load_resource_file($) {
3286 my $guard = lock_acquire "load_resource_file";
3287
3288 my $status = load_resource_file_ $_[0];
3289 get_slot 0.1, 100;
3290 cf::arch::commit_load;
3291
3292 $status
3293}
3294
3317sub reload_regions { 3295sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3296 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3297 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3298 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3299
… …
3334} 3312}
3335 3313
3336sub reload_archetypes { 3314sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3315 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3316 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3317}
3345 3318
3346sub reload_treasures { 3319sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3320 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3321 or die "unable to load treasurelists\n";
3349} 3322}
3350 3323
3351sub reload_resources { 3324sub reload_resources {
3352 warn "reloading resource files...\n"; 3325 warn "reloading resource files...\n";
3353 3326
3327 reload_facedata;
3328 reload_archetypes;
3354 reload_regions; 3329 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3330 reload_treasures;
3359 3331
3360 warn "finished reloading resource files\n"; 3332 warn "finished reloading resource files\n";
3361} 3333}
3362 3334
3363sub init { 3335sub init {
3336 my $guard = freeze_mainloop;
3337
3338 evthread_start IO::AIO::poll_fileno;
3339
3364 reload_resources; 3340 reload_resources;
3365} 3341}
3366 3342
3367sub reload_config { 3343sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3344 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3383 }; 3359 };
3384 warn $@ if $@; 3360 warn $@ if $@;
3385 } 3361 }
3386} 3362}
3387 3363
3364sub pidfile() {
3365 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3366 or die "$PIDFILE: $!";
3367 flock $fh, &Fcntl::LOCK_EX
3368 or die "$PIDFILE: flock: $!";
3369 $fh
3370}
3371
3372# make sure only one server instance is running at any one time
3373sub atomic {
3374 my $fh = pidfile;
3375
3376 my $pid = <$fh>;
3377 kill 9, $pid if $pid > 0;
3378
3379 seek $fh, 0, 0;
3380 print $fh $$;
3381}
3382
3388sub main { 3383sub main {
3384 atomic;
3385
3389 # we must not ever block the main coroutine 3386 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3387 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3388 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3389 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3390 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3391 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3392 })->prio (Coro::PRIO_MAX);
3396 }; 3393 };
3397 3394
3395 {
3396 my $guard = freeze_mainloop;
3398 reload_config; 3397 reload_config;
3399 db_init; 3398 db_init;
3400 load_extensions; 3399 load_extensions;
3401 3400
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3401 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3402 }
3403
3404 utime time, time, $RUNTIMEFILE;
3405
3406 # no (long-running) fork's whatsoever before this point(!)
3407 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3408
3404 EV::loop; 3409 EV::loop;
3405} 3410}
3406 3411
3407############################################################################# 3412#############################################################################
3408# initialisation and cleanup 3413# initialisation and cleanup
… …
3416 }; 3421 };
3417 } 3422 }
3418} 3423}
3419 3424
3420sub write_runtime_sync { 3425sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime";
3422
3423 # first touch the runtime file to show we are still running: 3426 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3427 # the fsync below can take a very very long time.
3425 3428
3426 IO::AIO::aio_utime $runtime, undef, undef; 3429 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3430
3428 my $guard = cf::lock_acquire "write_runtime"; 3431 my $guard = cf::lock_acquire "write_runtime";
3429 3432
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3433 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3431 or return; 3434 or return;
3432 3435
3433 my $value = $cf::RUNTIME + 90 + 10; 3436 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3437 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3438 # 60 allows for the watchdog to kill the server.
… …
3445 aio_utime $fh, undef, undef; 3448 aio_utime $fh, undef, undef;
3446 3449
3447 close $fh 3450 close $fh
3448 or return; 3451 or return;
3449 3452
3450 aio_rename "$runtime~", $runtime 3453 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3454 and return;
3452 3455
3453 warn "runtime file written.\n"; 3456 warn "runtime file written.\n";
3454 3457
3455 1 3458 1
… …
3539sub post_cleanup { 3542sub post_cleanup {
3540 my ($make_core) = @_; 3543 my ($make_core) = @_;
3541 3544
3542 warn Carp::longmess "post_cleanup backtrace" 3545 warn Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3546 if $make_core;
3547
3548 my $fh = pidfile;
3549 unlink $PIDFILE if <$fh> == $$;
3544} 3550}
3551
3552# a safer delete_package, copied from Symbol
3553sub clear_package($) {
3554 my $pkg = shift;
3555
3556 # expand to full symbol table name if needed
3557 unless ($pkg =~ /^main::.*::$/) {
3558 $pkg = "main$pkg" if $pkg =~ /^::/;
3559 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3560 $pkg .= '::' unless $pkg =~ /::$/;
3561 }
3562
3563 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3564 my $stem_symtab = *{$stem}{HASH};
3565
3566 defined $stem_symtab and exists $stem_symtab->{$leaf}
3567 or return;
3568
3569 # clear all symbols
3570 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3571 for my $name (keys %$leaf_symtab) {
3572 _gv_clear *{"$pkg$name"};
3573# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3574 }
3575 warn "cleared package #$pkg\n";#d#
3576}
3577
3578our $RELOAD; # how many times to reload
3545 3579
3546sub do_reload_perl() { 3580sub do_reload_perl() {
3547 # can/must only be called in main 3581 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3582 if ($Coro::current != $Coro::main) {
3549 warn "can only reload from main coroutine"; 3583 warn "can only reload from main coroutine";
3550 return; 3584 return;
3551 } 3585 }
3552 3586
3587 return if $RELOAD++;
3588
3589 while ($RELOAD) {
3553 warn "reloading..."; 3590 warn "reloading...";
3554 3591
3555 warn "entering sync_job"; 3592 warn "entering sync_job";
3556 3593
3557 cf::sync_job { 3594 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark 3595 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3596 cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark 3597 cf::write_runtime_sync; # external watchdog should not bark
3561 3598
3562 warn "syncing database to disk"; 3599 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV; 3600 BDB::db_env_txn_checkpoint $DB_ENV;
3564 3601
3565 # if anything goes wrong in here, we should simply crash as we already saved 3602 # if anything goes wrong in here, we should simply crash as we already saved
3566 3603
3567 warn "flushing outstanding aio requests"; 3604 warn "flushing outstanding aio requests";
3568 for (;;) {
3569 BDB::flush;
3570 IO::AIO::flush;
3571 Coro::cede_notself;
3572 last unless IO::AIO::nreqs || BDB::nreqs; 3605 while (IO::AIO::nreqs || BDB::nreqs) {
3573 warn "iterate..."; 3606 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574 }
3575
3576 ++$RELOAD;
3577
3578 warn "cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = ();
3581
3582 warn "removing commands";
3583 %COMMAND = ();
3584
3585 warn "removing ext/exti commands";
3586 %EXTCMD = ();
3587 %EXTICMD = ();
3588
3589 warn "unloading/nuking all extensions";
3590 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg";
3592
3593 if (my $cb = $pkg->can ("unload")) {
3594 eval {
3595 $cb->($pkg);
3596 1
3597 } or warn "$pkg unloaded, but with errors: $@";
3598 } 3607 }
3599 3608
3600 warn "... nuking $pkg"; 3609 warn "cancelling all extension coros";
3601 Symbol::delete_package $pkg; 3610 $_->cancel for values %EXT_CORO;
3602 } 3611 %EXT_CORO = ();
3603 3612
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3613 warn "removing commands";
3605 while (my ($k, $v) = each %INC) { 3614 %COMMAND = ();
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3615
3616 warn "removing ext/exti commands";
3617 %EXTCMD = ();
3618 %EXTICMD = ();
3619
3620 warn "unloading/nuking all extensions";
3621 for my $pkg (@EXTS) {
3608 warn "... unloading $k"; 3622 warn "... unloading $pkg";
3609 delete $INC{$k};
3610 3623
3611 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g;
3613
3614 if (my $cb = $k->can ("unload_module")) { 3624 if (my $cb = $pkg->can ("unload")) {
3625 eval {
3615 $cb->(); 3626 $cb->($pkg);
3627 1
3628 } or warn "$pkg unloaded, but with errors: $@";
3629 }
3630
3631 warn "... clearing $pkg";
3632 clear_package $pkg;
3616 } 3633 }
3617 3634
3618 Symbol::delete_package $k; 3635 warn "unloading all perl modules loaded from $LIBDIR";
3636 while (my ($k, $v) = each %INC) {
3637 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3638
3639 warn "... unloading $k";
3640 delete $INC{$k};
3641
3642 $k =~ s/\.pm$//;
3643 $k =~ s/\//::/g;
3644
3645 if (my $cb = $k->can ("unload_module")) {
3646 $cb->();
3647 }
3648
3649 clear_package $k;
3619 } 3650 }
3620 3651
3621 warn "getting rid of safe::, as good as possible"; 3652 warn "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3653 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3654 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 3655
3625 warn "unloading cf.pm \"a bit\""; 3656 warn "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3657 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3658 delete $INC{"cf/pod.pm"};
3628 3659
3629 # don't, removes xs symbols, too, 3660 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3661 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3662 #clear_package __PACKAGE__;
3632 3663
3633 warn "unload completed, starting to reload now"; 3664 warn "unload completed, starting to reload now";
3634 3665
3635 warn "reloading cf.pm"; 3666 warn "reloading cf.pm";
3636 require cf; 3667 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3668 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3638 3669
3639 warn "loading config and database again"; 3670 warn "loading config and database again";
3640 cf::reload_config; 3671 cf::reload_config;
3641 3672
3642 warn "loading extensions"; 3673 warn "loading extensions";
3643 cf::load_extensions; 3674 cf::load_extensions;
3644 3675
3645 warn "reattaching attachments to objects/players"; 3676 warn "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3677 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3678 warn "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3679 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3680 warn "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3681 reattach $_ for values %PLAYER;
3651 3682
3652 warn "leaving sync_job"; 3683 warn "leaving sync_job";
3653 3684
3654 1 3685 1
3655 } or do { 3686 } or do {
3656 warn $@; 3687 warn $@;
3657 cf::cleanup "error while reloading, exiting."; 3688 cf::cleanup "error while reloading, exiting.";
3658 }; 3689 };
3659 3690
3660 warn "reloaded"; 3691 warn "reloaded";
3692 --$RELOAD;
3693 }
3661}; 3694};
3662 3695
3663our $RELOAD_WATCHER; # used only during reload 3696our $RELOAD_WATCHER; # used only during reload
3664 3697
3665sub reload_perl() { 3698sub reload_perl() {
… …
3690 3723
3691our @WAIT_FOR_TICK; 3724our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3725our @WAIT_FOR_TICK_BEGIN;
3693 3726
3694sub wait_for_tick { 3727sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3728 return if tick_inhibit || $Coro::current == $Coro::main;
3697 3729
3698 my $signal = new Coro::Signal; 3730 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3731 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3732 $signal->wait;
3701} 3733}
3702 3734
3703sub wait_for_tick_begin { 3735sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3736 return if tick_inhibit || $Coro::current == $Coro::main;
3706 3737
3707 my $signal = new Coro::Signal; 3738 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3739 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3740 $signal->wait;
3710} 3741}
… …
3749{ 3780{
3750 # configure BDB 3781 # configure BDB
3751 3782
3752 BDB::min_parallel 8; 3783 BDB::min_parallel 8;
3753 BDB::max_poll_reqs $TICK * 0.1; 3784 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 3785 $AnyEvent::BDB::WATCHER->priority (1);
3755 3786
3756 unless ($DB_ENV) { 3787 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 3788 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3789 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 3790 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3791 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3792 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3793 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 3794
3763 cf::sync_job { 3795 cf::sync_job {
3764 eval { 3796 eval {
… …
3790{ 3822{
3791 # configure IO::AIO 3823 # configure IO::AIO
3792 3824
3793 IO::AIO::min_parallel 8; 3825 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 3826 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 3827 undef $AnyEvent::AIO::WATCHER;
3796} 3828}
3797 3829
3798my $_log_backtrace; 3830my $_log_backtrace;
3799 3831
3800sub _log_backtrace { 3832sub _log_backtrace {
… …
3803 $msg =~ s/\n//; 3835 $msg =~ s/\n//;
3804 3836
3805 # limit the # of concurrent backtraces 3837 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 3838 if ($_log_backtrace < 2) {
3807 ++$_log_backtrace; 3839 ++$_log_backtrace;
3840 my $perl_bt = Carp::longmess $msg;
3808 async { 3841 async {
3809 $Coro::current->{desc} = "abt $msg"; 3842 $Coro::current->{desc} = "abt $msg";
3810 3843
3811 my @bt = fork_call { 3844 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 3845 @addr = map { sprintf "%x", $_ } @addr;
… …
3823 } 3856 }
3824 3857
3825 @funcs 3858 @funcs
3826 }; 3859 };
3827 3860
3828 LOG llevInfo, "[ABT] $msg\n"; 3861 LOG llevInfo, "[ABT] $perl_bt\n";
3862 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 3863 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 3864 --$_log_backtrace;
3831 }; 3865 };
3832 } else { 3866 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 3867 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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