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.443 by root, Sun Aug 31 10:05:26 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
… …
1613 1625
1614Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1615 1627
1616=cut 1628=cut
1617 1629
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 { 1630sub expand_cfpod {
1630 my ($self, $pod) = @_; 1631 my ($self, $pod) = @_;
1631 1632
1633 my @nest = [qr<\G$>, undef, ""];
1632 my $xml; 1634 my $xml;
1633 1635
1636 for ($pod) {
1634 while () { 1637 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) { 1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group; 1639 $xml .= $1;
1642 } elsif ($pod =~ m%\G 1640 } elsif (/\G\n(?=\S)/xgcs) {
1643 ([BCGHITU]) 1641 $xml .= " ";
1644 < 1642 } elsif (/\G\n/xgcs) {
1645 (?: 1643 $xml .= "\n";
1646 ([^<>]*) (?{ $group = $^N }) 1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1647 | < $interior > 1645 my ($code, $delim) = ($1, scalar reverse $2);
1648 ) 1646 $delim =~ y/</>/; # delim now contains the stop sequence
1649 > 1647 $delim = qr{\G\Q$delim};
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653 1648
1649 my $cb;
1650
1654 if ($code eq "B") { 1651 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>"; 1652 $cb = sub { "<b>$_[0]</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") { 1653 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>"; 1654 $cb = sub { "<tt>$_[0]</tt>" };
1662 } elsif ($code eq "T") { 1655 } elsif ($code eq "E") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>"; 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1664 } elsif ($code eq "G") { 1657 } elsif ($code eq "G") {
1658 $cb = sub {
1665 my ($male, $female) = split /\|/, $data; 1659 my ($male, $female) = split /\|/, $_[0];
1666 $data = $self->gender ? $female : $male; 1660 $self->gender ? $female : $male
1667 $xml .= expand_cfpod ($self, $data); 1661 };
1668 } elsif ($code eq "H") { 1662 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>", 1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "") 1667 "",
1672 [$self->{hintmode}]; 1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1673 } else { 1699 } else {
1674 $xml .= "error processing '$code($data)' directive"; 1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1675 } 1707 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 } 1708 }
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 } 1709 }
1694 1710
1695 $xml 1711 $xml
1696} 1712}
1697
1698no re 'eval';
1699 1713
1700sub hintmode { 1714sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode} 1716 $_[0]{hintmode}
1703} 1717}
… …
2025 2039
2026 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
2028 2042
2029 $cf::MAP{$path} || do { 2043 $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 2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2046
2033 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
2034 or return; 2048 or return;
2035 2049
2036 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
… …
2039 or return; 2053 or return;
2040 2054
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
2044 undef $guard1; 2059 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2060 $map->reset;
2047 return find $path; 2061 return find $path;
2048 } 2062 }
2049 2063
2050 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
… …
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2092 $f->skip_block;
2079 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
2080 or return; 2094 or return;
2081 2095
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
2083 if delete $self->{load_original}; 2097 if delete $self->{load_original};
2084 2098
2085 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2100 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
… …
2113 } 2127 }
2114 2128
2115 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
2117 2131
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2133 }
2120 2134
2121 $self->post_load; 2135 $self->post_load;
2122} 2136}
2123 2137
… …
2181 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2182 2196
2183 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2184 2198
2185 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2201 }
2188 2202
2189 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2190 2204
2191 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
… …
2228 cf::async { 2242 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2243 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2231 }; 2245 };
2232 2246
2247 cf::get_slot 0.02;
2248
2233 if ($uniq) { 2249 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2252 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2245 $self->save; 2261 $self->save;
2246 2262
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2264
2249 return if $self->players; 2265 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2252 2268
2253 $self->in_memory (cf::MAP_SWAPPED); 2269 $self->in_memory (cf::MAP_SWAPPED);
2254 2270
2255 $self->deactivate; 2271 $self->deactivate;
… …
2451can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2452dialogue with the given NPC character. 2468dialogue with the given NPC character.
2453 2469
2454=cut 2470=cut
2455 2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2485
2456# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2457# with dialog boxes. 2487# with dialog boxes.
2458#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2459sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2460 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
… …
2471 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2472 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2473 2503
2474 } else { 2504 } else {
2475 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2476 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2477 } 2507 }
2478 } 2508 }
2479} 2509}
2480 2510
2481=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2588Moves the player to the given map-path and coordinates by first freezing 2618Moves the player to the given map-path and coordinates by first freezing
2589her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2590that has to return the map if sucecssful, and then unfreezes the player on 2620that 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 2621the new (success) or old (failed) map position. In either case, $done will
2592be called at the end of this process. 2622be called at the end of this process.
2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2593 2626
2594=cut 2627=cut
2595 2628
2596our $GOTOGEN; 2629our $GOTOGEN;
2597 2630
… …
2676} 2709}
2677 2710
2678sub prepare_random_map { 2711sub prepare_random_map {
2679 my ($exit) = @_; 2712 my ($exit) = @_;
2680 2713
2681 my $guard = cf::lock_acquire "exit_prepare:$exit";
2682
2683 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2684 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2685 # that depends on the exit object 2716 # that depends on the exit object
2686 2717
2687 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
… …
2689 if ($exit->map) { 2720 if ($exit->map) {
2690 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2691 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2692 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2693 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2694 } 2727 }
2695 2728
2696 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2697 2730
2698 my $data = cf::encode_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2699 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2700 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2701 2734
2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2703 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2704 undef $fh; 2737 undef $fh;
2705 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2706 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2707 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2708 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2709 } 2746 }
2710} 2747}
2711 2748
2712sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2713 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2714 2751
2715 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2716 2753
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; 2754 $self->enter_link;
2729 2755
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 { 2756 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2757 $Coro::current->{desc} = "enter_exit";
2736 2758
2737 $self->deactivate_recursive; # just to be sure
2738 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2739 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2740 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2741 1; 2780 1
2742 }) { 2781 }) {
2743 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2744 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2745 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2746 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2826 id => "infobox", 2865 id => "infobox",
2827 title => "Map Info", 2866 title => "Map Info",
2828 reply => undef, 2867 reply => undef,
2829 tooltip => "Information related to the maps", 2868 tooltip => "Information related to the maps",
2830 }, 2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2831); 2876);
2832 2877
2833sub cf::client::send_msg { 2878sub cf::client::send_msg {
2834 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2835 2880
… …
2862 if ($self->can_msg) { 2907 if ($self->can_msg) {
2863 # default colour, mask it out 2908 # default colour, mask it out
2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2865 if $color & cf::NDI_DEF; 2910 if $color & cf::NDI_DEF;
2866 2911
2867 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2912 my $pkt = "msg "
2913 . $self->{json_coder}->encode (
2868 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 );
2916
2917 # try lzf for large packets
2918 $pkt = "lzf " . Compress::LZF::compress $pkt
2919 if 1024 <= length $pkt and $self->{can_lzf};
2920
2921 # split very large packets
2922 if (8192 < length $pkt and $self->{can_lzf}) {
2923 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2924 $pkt = "frag";
2925 }
2926
2927 $self->send_packet ($pkt);
2869 } else { 2928 } else {
2870 if ($color >= 0) { 2929 if ($color >= 0) {
2871 # replace some tags by gcfclient-compatible ones 2930 # replace some tags by gcfclient-compatible ones
2872 for ($msg) { 2931 for ($msg) {
2873 1 while 2932 1 while
… …
3072 3131
3073The following functions and methods are available within a safe environment: 3132The following functions and methods are available within a safe environment:
3074 3133
3075 cf::object 3134 cf::object
3076 contr pay_amount pay_player map x y force_find force_add destroy 3135 contr pay_amount pay_player map x y force_find force_add destroy
3077 insert remove name archname title slaying race decrease_ob_nr 3136 insert remove name archname title slaying race decrease split
3078 3137
3079 cf::object::player 3138 cf::object::player
3080 player 3139 player
3081 3140
3082 cf::player 3141 cf::player
… …
3087 3146
3088=cut 3147=cut
3089 3148
3090for ( 3149for (
3091 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3092 insert remove inv name archname title slaying race 3151 insert remove inv nrof name archname title slaying race
3093 decrease_ob_nr destroy)], 3152 decrease split destroy change_exp)],
3094 ["cf::object::player" => qw(player)], 3153 ["cf::object::player" => qw(player)],
3095 ["cf::player" => qw(peaceful)], 3154 ["cf::player" => qw(peaceful)],
3096 ["cf::map" => qw(trigger)], 3155 ["cf::map" => qw(trigger)],
3097) { 3156) {
3098 no strict 'refs'; 3157 no strict 'refs';
… …
3306 while (my ($k, $v) = each %$want) { 3365 while (my ($k, $v) = each %$want) {
3307 $ns->fx_want ($k, $v); 3366 $ns->fx_want ($k, $v);
3308 } 3367 }
3309}; 3368};
3310 3369
3370sub load_resource_file($) {
3371 my $guard = lock_acquire "load_resource_file";
3372
3373 my $status = load_resource_file_ $_[0];
3374 get_slot 0.1, 100;
3375 cf::arch::commit_load;
3376
3377 $status
3378}
3379
3311sub reload_regions { 3380sub reload_regions {
3312 # HACK to clear player env face cache, we need some signal framework 3381 # HACK to clear player env face cache, we need some signal framework
3313 # for this (global event?) 3382 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = (); 3383 %ext::player_env::MUSIC_FACE_CACHE = ();
3315 3384
… …
3328} 3397}
3329 3398
3330sub reload_archetypes { 3399sub reload_archetypes {
3331 load_resource_file "$DATADIR/archetypes" 3400 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n"; 3401 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} 3402}
3339 3403
3340sub reload_treasures { 3404sub reload_treasures {
3341 load_resource_file "$DATADIR/treasures" 3405 load_resource_file "$DATADIR/treasures"
3342 or die "unable to load treasurelists\n"; 3406 or die "unable to load treasurelists\n";
3343} 3407}
3344 3408
3345sub reload_resources { 3409sub reload_resources {
3346 warn "reloading resource files...\n"; 3410 warn "reloading resource files...\n";
3347 3411
3412 reload_facedata;
3413 reload_archetypes;
3348 reload_regions; 3414 reload_regions;
3349 reload_facedata;
3350 #reload_archetypes;#d#
3351 reload_archetypes;
3352 reload_treasures; 3415 reload_treasures;
3353 3416
3354 warn "finished reloading resource files\n"; 3417 warn "finished reloading resource files\n";
3355} 3418}
3356 3419
3357sub init { 3420sub init {
3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3358 reload_resources; 3425 reload_resources;
3359} 3426}
3360 3427
3361sub reload_config { 3428sub reload_config {
3362 open my $fh, "<:utf8", "$CONFDIR/config" 3429 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3390 }; 3457 };
3391 3458
3459 {
3460 my $guard = freeze_mainloop;
3392 reload_config; 3461 reload_config;
3393 db_init; 3462 db_init;
3394 load_extensions; 3463 load_extensions;
3395 3464
3396 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3397 evthread_start IO::AIO::poll_fileno; 3466 }
3467
3398 EV::loop; 3468 EV::loop;
3399} 3469}
3400 3470
3401############################################################################# 3471#############################################################################
3402# initialisation and cleanup 3472# initialisation and cleanup
… …
3535 3605
3536 warn Carp::longmess "post_cleanup backtrace" 3606 warn Carp::longmess "post_cleanup backtrace"
3537 if $make_core; 3607 if $make_core;
3538} 3608}
3539 3609
3610# a safer delete_package, copied from Symbol
3611sub clear_package($) {
3612 my $pkg = shift;
3613
3614 # expand to full symbol table name if needed
3615 unless ($pkg =~ /^main::.*::$/) {
3616 $pkg = "main$pkg" if $pkg =~ /^::/;
3617 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3618 $pkg .= '::' unless $pkg =~ /::$/;
3619 }
3620
3621 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3622 my $stem_symtab = *{$stem}{HASH};
3623
3624 defined $stem_symtab and exists $stem_symtab->{$leaf}
3625 or return;
3626
3627 # clear all symbols
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 }
3633 warn "cleared package #$pkg\n";#d#
3634}
3635
3636our $RELOAD; # how many times to reload
3637
3540sub do_reload_perl() { 3638sub do_reload_perl() {
3541 # can/must only be called in main 3639 # can/must only be called in main
3542 if ($Coro::current != $Coro::main) { 3640 if ($Coro::current != $Coro::main) {
3543 warn "can only reload from main coroutine"; 3641 warn "can only reload from main coroutine";
3544 return; 3642 return;
3545 } 3643 }
3546 3644
3645 return if $RELOAD++;
3646
3647 while ($RELOAD) {
3547 warn "reloading..."; 3648 warn "reloading...";
3548 3649
3549 warn "entering sync_job"; 3650 warn "entering sync_job";
3550 3651
3551 cf::sync_job { 3652 cf::sync_job {
3552 cf::write_runtime_sync; # external watchdog should not bark 3653 cf::write_runtime_sync; # external watchdog should not bark
3553 cf::emergency_save; 3654 cf::emergency_save;
3554 cf::write_runtime_sync; # external watchdog should not bark 3655 cf::write_runtime_sync; # external watchdog should not bark
3555 3656
3556 warn "syncing database to disk"; 3657 warn "syncing database to disk";
3557 BDB::db_env_txn_checkpoint $DB_ENV; 3658 BDB::db_env_txn_checkpoint $DB_ENV;
3558 3659
3559 # if anything goes wrong in here, we should simply crash as we already saved 3660 # if anything goes wrong in here, we should simply crash as we already saved
3560 3661
3561 warn "flushing outstanding aio requests"; 3662 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; 3663 while (IO::AIO::nreqs || BDB::nreqs) {
3567 warn "iterate..."; 3664 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 } 3665 }
3593 3666
3594 warn "... nuking $pkg"; 3667 warn "cancelling all extension coros";
3595 Symbol::delete_package $pkg; 3668 $_->cancel for values %EXT_CORO;
3596 } 3669 %EXT_CORO = ();
3597 3670
3598 warn "unloading all perl modules loaded from $LIBDIR"; 3671 warn "removing commands";
3599 while (my ($k, $v) = each %INC) { 3672 %COMMAND = ();
3600 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3601 3673
3674 warn "removing ext/exti commands";
3675 %EXTCMD = ();
3676 %EXTICMD = ();
3677
3678 warn "unloading/nuking all extensions";
3679 for my $pkg (@EXTS) {
3602 warn "... unloading $k"; 3680 warn "... unloading $pkg";
3603 delete $INC{$k};
3604 3681
3605 $k =~ s/\.pm$//;
3606 $k =~ s/\//::/g;
3607
3608 if (my $cb = $k->can ("unload_module")) { 3682 if (my $cb = $pkg->can ("unload")) {
3683 eval {
3609 $cb->(); 3684 $cb->($pkg);
3685 1
3686 } or warn "$pkg unloaded, but with errors: $@";
3687 }
3688
3689 warn "... clearing $pkg";
3690 clear_package $pkg;
3610 } 3691 }
3611 3692
3612 Symbol::delete_package $k; 3693 warn "unloading all perl modules loaded from $LIBDIR";
3694 while (my ($k, $v) = each %INC) {
3695 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3696
3697 warn "... unloading $k";
3698 delete $INC{$k};
3699
3700 $k =~ s/\.pm$//;
3701 $k =~ s/\//::/g;
3702
3703 if (my $cb = $k->can ("unload_module")) {
3704 $cb->();
3705 }
3706
3707 clear_package $k;
3613 } 3708 }
3614 3709
3615 warn "getting rid of safe::, as good as possible"; 3710 warn "getting rid of safe::, as good as possible";
3616 Symbol::delete_package "safe::$_" 3711 clear_package "safe::$_"
3617 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3618 3713
3619 warn "unloading cf.pm \"a bit\""; 3714 warn "unloading cf.pm \"a bit\"";
3620 delete $INC{"cf.pm"}; 3715 delete $INC{"cf.pm"};
3621 delete $INC{"cf/pod.pm"}; 3716 delete $INC{"cf/pod.pm"};
3622 3717
3623 # don't, removes xs symbols, too, 3718 # don't, removes xs symbols, too,
3624 # and global variables created in xs 3719 # and global variables created in xs
3625 #Symbol::delete_package __PACKAGE__; 3720 #clear_package __PACKAGE__;
3626 3721
3627 warn "unload completed, starting to reload now"; 3722 warn "unload completed, starting to reload now";
3628 3723
3629 warn "reloading cf.pm"; 3724 warn "reloading cf.pm";
3630 require cf; 3725 require cf;
3631 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3632 3727
3633 warn "loading config and database again"; 3728 warn "loading config and database again";
3634 cf::reload_config; 3729 cf::reload_config;
3635 3730
3636 warn "loading extensions"; 3731 warn "loading extensions";
3637 cf::load_extensions; 3732 cf::load_extensions;
3638 3733
3639 warn "reattaching attachments to objects/players"; 3734 warn "reattaching attachments to objects/players";
3640 _global_reattach; # objects, sockets 3735 _global_reattach; # objects, sockets
3641 warn "reattaching attachments to maps"; 3736 warn "reattaching attachments to maps";
3642 reattach $_ for values %MAP; 3737 reattach $_ for values %MAP;
3643 warn "reattaching attachments to players"; 3738 warn "reattaching attachments to players";
3644 reattach $_ for values %PLAYER; 3739 reattach $_ for values %PLAYER;
3645 3740
3646 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3647 3742
3648 1 3743 1
3649 } or do { 3744 } or do {
3650 warn $@; 3745 warn $@;
3651 cf::cleanup "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3652 }; 3747 };
3653 3748
3654 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3655}; 3752};
3656 3753
3657our $RELOAD_WATCHER; # used only during reload 3754our $RELOAD_WATCHER; # used only during reload
3658 3755
3659sub reload_perl() { 3756sub reload_perl() {
… …
3684 3781
3685our @WAIT_FOR_TICK; 3782our @WAIT_FOR_TICK;
3686our @WAIT_FOR_TICK_BEGIN; 3783our @WAIT_FOR_TICK_BEGIN;
3687 3784
3688sub wait_for_tick { 3785sub wait_for_tick {
3689 return if tick_inhibit;
3690 return if $Coro::current == $Coro::main; 3786 return if tick_inhibit || $Coro::current == $Coro::main;
3691 3787
3692 my $signal = new Coro::Signal; 3788 my $signal = new Coro::Signal;
3693 push @WAIT_FOR_TICK, $signal; 3789 push @WAIT_FOR_TICK, $signal;
3694 $signal->wait; 3790 $signal->wait;
3695} 3791}
3696 3792
3697sub wait_for_tick_begin { 3793sub wait_for_tick_begin {
3698 return if tick_inhibit;
3699 return if $Coro::current == $Coro::main; 3794 return if tick_inhibit || $Coro::current == $Coro::main;
3700 3795
3701 my $signal = new Coro::Signal; 3796 my $signal = new Coro::Signal;
3702 push @WAIT_FOR_TICK_BEGIN, $signal; 3797 push @WAIT_FOR_TICK_BEGIN, $signal;
3703 $signal->wait; 3798 $signal->wait;
3704} 3799}
… …
3743{ 3838{
3744 # configure BDB 3839 # configure BDB
3745 3840
3746 BDB::min_parallel 8; 3841 BDB::min_parallel 8;
3747 BDB::max_poll_reqs $TICK * 0.1; 3842 BDB::max_poll_reqs $TICK * 0.1;
3748 $Coro::BDB::WATCHER->priority (1); 3843 $AnyEvent::BDB::WATCHER->priority (1);
3749 3844
3750 unless ($DB_ENV) { 3845 unless ($DB_ENV) {
3751 $DB_ENV = BDB::db_env_create; 3846 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3847 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3753 | BDB::LOG_AUTOREMOVE, 1); 3848 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3849 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3851 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3756 3852
3757 cf::sync_job { 3853 cf::sync_job {
3758 eval { 3854 eval {
… …
3784{ 3880{
3785 # configure IO::AIO 3881 # configure IO::AIO
3786 3882
3787 IO::AIO::min_parallel 8; 3883 IO::AIO::min_parallel 8;
3788 IO::AIO::max_poll_time $TICK * 0.1; 3884 IO::AIO::max_poll_time $TICK * 0.1;
3789 $Coro::AIO::WATCHER->priority (1); 3885 undef $AnyEvent::AIO::WATCHER;
3790} 3886}
3791 3887
3792my $_log_backtrace; 3888my $_log_backtrace;
3793 3889
3794sub _log_backtrace { 3890sub _log_backtrace {

Diff Legend

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