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.445 by root, Wed Sep 10 18:18:10 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($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main;
439
432 my ($time, $pri, $name) = @_; 440 my ($time, $pri, $name) = @_;
433 441
434 $time = $TICK * .6 if $time > $TICK * .6; 442 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 443 my $sig = new Coro::Signal;
436 444
… …
1083 1091
1084sub reattach { 1092sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1093 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1094 my ($obj) = @_;
1087 1095
1096 # no longer needed after getting rid of delete_package?
1088 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
1089 1098
1090 my $registry = $obj->registry; 1099 my $registry = $obj->registry;
1091 1100
1092 @$registry = (); 1101 @$registry = ();
1093 1102
… …
1139 utf8::decode (my $decname = $filename); 1148 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1149 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1150 $decname, length $$rdata, scalar @$objs;
1142 1151
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1155 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1156 aio_close $fh;
1148 1157
1149 if (@$objs) { 1158 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1160 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1162 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1163 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1164 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1165 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1166 }
1158 } else { 1167 } else {
1159 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1160 } 1169 }
… …
1329 1338
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1341
1333 $ext{source} = 1342 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1344 . "#line 1 \"$path\"\n{\n"
1336 . $source 1345 . $source
1337 . "\n};\n1"; 1346 . "\n};\n1";
1338 1347
1339 $todo{$base} = \%ext; 1348 $todo{$base} = \%ext;
… …
1454 my $f = new_from_file cf::object::thawer path $login 1463 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1464 or return;
1456 1465
1457 my $pl = cf::player::load_pl $f 1466 my $pl = cf::player::load_pl $f
1458 or return; 1467 or return;
1468
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1469 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1470 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1471 $cf::PLAYER{$login} = $pl
1462 } 1472 }
1463 } 1473 }
… …
1473 1483
1474 return if $pl->{deny_save}; 1484 return if $pl->{deny_save};
1475 1485
1476 aio_mkdir playerdir $pl, 0770; 1486 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1487 $pl->{last_save} = $cf::RUNTIME;
1488
1489 cf::get_slot 0.01;
1478 1490
1479 $pl->save_pl ($path); 1491 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1492 cf::cede_to_tick;
1481} 1493}
1482 1494
… …
1514 my ($pl) = @_; 1526 my ($pl) = @_;
1515 1527
1516 my $name = $pl->ob->name; 1528 my $name = $pl->ob->name;
1517 1529
1518 $pl->{deny_save} = 1; 1530 $pl->{deny_save} = 1;
1519 $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
1520 1532
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1534 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1537 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1538 $pl->ns->destroy if $pl->ns;
1525 1539
1526 my $path = playerdir $pl; 1540 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1541 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1580
1567 for my $login (@$dirs) { 1581 for my $login (@$dirs) {
1568 my $path = path $login; 1582 my $path = path $login;
1569 1583
1570 # a .pst is a dead give-away for a valid player 1584 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1585 # if no pst file found, open and chekc for blocked users
1586 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1587 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1588 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1589 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1590 }
1576 1591
… …
1610} 1625}
1611 1626
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1613 1628
1614Expand crossfire pod fragments into protocol xml. 1629Expand crossfire pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1630
1705=item $player->ext_reply ($msgid, @msg) 1631=item $player->ext_reply ($msgid, @msg)
1706 1632
1707Sends an ext reply to the player. 1633Sends an ext reply to the player.
1708 1634
… …
2025 1951
2026 cf::lock_wait "map_data:$path";#d#remove 1952 cf::lock_wait "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 1953 cf::lock_wait "map_find:$path";
2028 1954
2029 $cf::MAP{$path} || do { 1955 $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 1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1958
2033 my $map = new_from_path cf::map $path 1959 my $map = new_from_path cf::map $path
2034 or return; 1960 or return;
2035 1961
2036 $map->{last_save} = $cf::RUNTIME; 1962 $map->{last_save} = $cf::RUNTIME;
… …
2039 or return; 1965 or return;
2040 1966
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1967 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 1968 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 1969 #$cf::WAIT_FOR_TICK->wait;
1970 undef $guard2;
2044 undef $guard1; 1971 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 1972 $map->reset;
2047 return find $path; 1973 return find $path;
2048 } 1974 }
2049 1975
2050 $cf::MAP{$path} = $map 1976 $cf::MAP{$path} = $map
… …
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2003 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2004 $f->skip_block;
2079 $self->_load_objects ($f) 2005 $self->_load_objects ($f)
2080 or return; 2006 or return;
2081 2007
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
2083 if delete $self->{load_original}; 2009 if delete $self->{load_original};
2084 2010
2085 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2012 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2013 unless (aio_stat $uniq) {
… …
2113 } 2039 }
2114 2040
2115 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2042 $self->last_access ($cf::RUNTIME);
2117 2043
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2044 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2045 }
2120 2046
2121 $self->post_load; 2047 $self->post_load;
2122} 2048}
2123 2049
… …
2181 my ($path, $origin, $load) = @_; 2107 my ($path, $origin, $load) = @_;
2182 2108
2183 $path = normalise $path, $origin && $origin->{path}; 2109 $path = normalise $path, $origin && $origin->{path};
2184 2110
2185 if (my $map = $cf::MAP{$path}) { 2111 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2113 }
2188 2114
2189 $MAP_PREFETCH{$path} |= $load; 2115 $MAP_PREFETCH{$path} |= $load;
2190 2116
2191 $MAP_PREFETCHER ||= cf::async { 2117 $MAP_PREFETCHER ||= cf::async {
… …
2228 cf::async { 2154 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2155 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2156 $_->contr->save for $self->players;
2231 }; 2157 };
2232 2158
2159 cf::get_slot 0.02;
2160
2233 if ($uniq) { 2161 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2163 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2164 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2245 $self->save; 2173 $self->save;
2246 2174
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2175 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2176
2249 return if $self->players; 2177 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2178 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2179 return if $self->{deny_save};
2252 2180
2253 $self->in_memory (cf::MAP_SWAPPED); 2181 $self->in_memory (cf::MAP_SWAPPED);
2254 2182
2255 $self->deactivate; 2183 $self->deactivate;
… …
2451can 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
2452dialogue with the given NPC character. 2380dialogue with the given NPC character.
2453 2381
2454=cut 2382=cut
2455 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
2456# rough implementation of a future "reply" method that works 2398# rough implementation of a future "reply" method that works
2457# with dialog boxes. 2399# with dialog boxes.
2458#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
2459sub cf::object::player::reply($$$;$) { 2401sub cf::object::player::reply($$$;$) {
2460 my ($self, $npc, $msg, $flags) = @_; 2402 my ($self, $npc, $msg, $flags) = @_;
… …
2471 my $dialog = $pl->{npc_dialog}; 2413 my $dialog = $pl->{npc_dialog};
2472 $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));
2473 2415
2474 } else { 2416 } else {
2475 $msg = $npc->name . " says: $msg" if $npc; 2417 $msg = $npc->name . " says: $msg" if $npc;
2476 $self->message ($msg, $flags); 2418 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2477 } 2419 }
2478 } 2420 }
2479} 2421}
2480 2422
2481=item $object->send_msg ($channel, $msg, $color, [extra...]) 2423=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2588Moves the player to the given map-path and coordinates by first freezing 2530Moves the player to the given map-path and coordinates by first freezing
2589her, loading and preparing them map, calling the provided $check callback 2531her, loading and preparing them map, calling the provided $check callback
2590that has to return the map if sucecssful, and then unfreezes the player on 2532that 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 2533the new (success) or old (failed) map position. In either case, $done will
2592be called at the end of this process. 2534be called at the end of this process.
2535
2536Note that $check will be called with a potentially non-loaded map, so if
2537it needs a loaded map it has to call C<< ->load >>.
2593 2538
2594=cut 2539=cut
2595 2540
2596our $GOTOGEN; 2541our $GOTOGEN;
2597 2542
… …
2676} 2621}
2677 2622
2678sub prepare_random_map { 2623sub prepare_random_map {
2679 my ($exit) = @_; 2624 my ($exit) = @_;
2680 2625
2681 my $guard = cf::lock_acquire "exit_prepare:$exit";
2682
2683 # all this does is basically replace the /! path by 2626 # all this does is basically replace the /! path by
2684 # a new random map path (?random/...) with a seed 2627 # a new random map path (?random/...) with a seed
2685 # that depends on the exit object 2628 # that depends on the exit object
2686 2629
2687 my $rmp = parse_random_map_params $exit->msg; 2630 my $rmp = parse_random_map_params $exit->msg;
… …
2689 if ($exit->map) { 2632 if ($exit->map) {
2690 $rmp->{region} = $exit->region->name; 2633 $rmp->{region} = $exit->region->name;
2691 $rmp->{origin_map} = $exit->map->path; 2634 $rmp->{origin_map} = $exit->map->path;
2692 $rmp->{origin_x} = $exit->x; 2635 $rmp->{origin_x} = $exit->x;
2693 $rmp->{origin_y} = $exit->y; 2636 $rmp->{origin_y} = $exit->y;
2637
2638 $exit->map->touch;
2694 } 2639 }
2695 2640
2696 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2697 2642
2698 my $data = cf::encode_json $rmp; 2643 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2699 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2700 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2701 2646
2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2703 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
2704 undef $fh; 2649 undef $fh;
2705 aio_rename "$meta~", $meta; 2650 aio_rename "$meta~", $meta;
2706 2651
2652 my $slaying = "?random/$md5";
2653
2654 if ($exit->valid) {
2707 $exit->slaying ("?random/$md5"); 2655 $exit->slaying ("?random/$md5");
2708 $exit->msg (undef); 2656 $exit->msg (undef);
2657 }
2709 } 2658 }
2710} 2659}
2711 2660
2712sub cf::object::player::enter_exit { 2661sub cf::object::player::enter_exit {
2713 my ($self, $exit) = @_; 2662 my ($self, $exit) = @_;
2714 2663
2715 return unless $self->type == cf::PLAYER; 2664 return unless $self->type == cf::PLAYER;
2716 2665
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; 2666 $self->enter_link;
2729 2667
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 { 2668 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2669 $Coro::current->{desc} = "enter_exit";
2736 2670
2737 $self->deactivate_recursive; # just to be sure
2738 unless (eval { 2671 unless (eval {
2672 $self->deactivate_recursive; # just to be sure
2673
2674 # random map handling
2675 {
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 prepare_random_map $exit
2679 if $exit->slaying eq "/!";
2680 }
2681
2682 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $x = $exit->stats->hp;
2684 my $y = $exit->stats->sp;
2685
2739 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($map, $x, $y);
2740 2687
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED);
2691
2741 1; 2692 1
2742 }) { 2693 }) {
2743 $self->message ("Something went wrong deep within the crossfire server. " 2694 $self->message ("Something went wrong deep within the crossfire server. "
2744 . "I'll try to bring you back to the map you were before. " 2695 . "I'll try to bring you back to the map you were before. "
2745 . "Please report this to the dungeon master!", 2696 . "Please report this to the dungeon master!",
2746 cf::NDI_UNIQUE | cf::NDI_RED); 2697 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2826 id => "infobox", 2777 id => "infobox",
2827 title => "Map Info", 2778 title => "Map Info",
2828 reply => undef, 2779 reply => undef,
2829 tooltip => "Information related to the maps", 2780 tooltip => "Information related to the maps",
2830 }, 2781 },
2782 "c/party" => {
2783 id => "party",
2784 title => "Party",
2785 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party",
2787 },
2831); 2788);
2832 2789
2833sub cf::client::send_msg { 2790sub cf::client::send_msg {
2834 my ($self, $channel, $msg, $color, @extra) = @_; 2791 my ($self, $channel, $msg, $color, @extra) = @_;
2835 2792
… …
2862 if ($self->can_msg) { 2819 if ($self->can_msg) {
2863 # default colour, mask it out 2820 # default colour, mask it out
2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2865 if $color & cf::NDI_DEF; 2822 if $color & cf::NDI_DEF;
2866 2823
2867 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2824 my $pkt = "msg "
2825 . $self->{json_coder}->encode (
2868 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 );
2828
2829 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf};
2832
2833 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag";
2837 }
2838
2839 $self->send_packet ($pkt);
2869 } else { 2840 } else {
2870 if ($color >= 0) { 2841 if ($color >= 0) {
2871 # replace some tags by gcfclient-compatible ones 2842 # replace some tags by gcfclient-compatible ones
2872 for ($msg) { 2843 for ($msg) {
2873 1 while 2844 1 while
… …
3072 3043
3073The following functions and methods are available within a safe environment: 3044The following functions and methods are available within a safe environment:
3074 3045
3075 cf::object 3046 cf::object
3076 contr pay_amount pay_player map x y force_find force_add destroy 3047 contr pay_amount pay_player map x y force_find force_add destroy
3077 insert remove name archname title slaying race decrease_ob_nr 3048 insert remove name archname title slaying race decrease split
3078 3049
3079 cf::object::player 3050 cf::object::player
3080 player 3051 player
3081 3052
3082 cf::player 3053 cf::player
… …
3087 3058
3088=cut 3059=cut
3089 3060
3090for ( 3061for (
3091 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3092 insert remove inv name archname title slaying race 3063 insert remove inv nrof name archname title slaying race
3093 decrease_ob_nr destroy)], 3064 decrease split destroy change_exp)],
3094 ["cf::object::player" => qw(player)], 3065 ["cf::object::player" => qw(player)],
3095 ["cf::player" => qw(peaceful)], 3066 ["cf::player" => qw(peaceful)],
3096 ["cf::map" => qw(trigger)], 3067 ["cf::map" => qw(trigger)],
3097) { 3068) {
3098 no strict 'refs'; 3069 no strict 'refs';
… …
3306 while (my ($k, $v) = each %$want) { 3277 while (my ($k, $v) = each %$want) {
3307 $ns->fx_want ($k, $v); 3278 $ns->fx_want ($k, $v);
3308 } 3279 }
3309}; 3280};
3310 3281
3282sub load_resource_file($) {
3283 my $guard = lock_acquire "load_resource_file";
3284
3285 my $status = load_resource_file_ $_[0];
3286 get_slot 0.1, 100;
3287 cf::arch::commit_load;
3288
3289 $status
3290}
3291
3311sub reload_regions { 3292sub reload_regions {
3312 # HACK to clear player env face cache, we need some signal framework 3293 # HACK to clear player env face cache, we need some signal framework
3313 # for this (global event?) 3294 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = (); 3295 %ext::player_env::MUSIC_FACE_CACHE = ();
3315 3296
… …
3328} 3309}
3329 3310
3330sub reload_archetypes { 3311sub reload_archetypes {
3331 load_resource_file "$DATADIR/archetypes" 3312 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n"; 3313 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} 3314}
3339 3315
3340sub reload_treasures { 3316sub reload_treasures {
3341 load_resource_file "$DATADIR/treasures" 3317 load_resource_file "$DATADIR/treasures"
3342 or die "unable to load treasurelists\n"; 3318 or die "unable to load treasurelists\n";
3343} 3319}
3344 3320
3345sub reload_resources { 3321sub reload_resources {
3346 warn "reloading resource files...\n"; 3322 warn "reloading resource files...\n";
3347 3323
3324 reload_facedata;
3325 reload_archetypes;
3348 reload_regions; 3326 reload_regions;
3349 reload_facedata;
3350 #reload_archetypes;#d#
3351 reload_archetypes;
3352 reload_treasures; 3327 reload_treasures;
3353 3328
3354 warn "finished reloading resource files\n"; 3329 warn "finished reloading resource files\n";
3355} 3330}
3356 3331
3357sub init { 3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3358 reload_resources; 3337 reload_resources;
3359} 3338}
3360 3339
3361sub reload_config { 3340sub reload_config {
3362 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3377 }; 3356 };
3378 warn $@ if $@; 3357 warn $@ if $@;
3379 } 3358 }
3380} 3359}
3381 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
3382sub main { 3380sub main {
3381 atomic;
3382
3383 # we must not ever block the main coroutine 3383 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3384 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3386 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3387 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3388 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3389 })->prio (Coro::PRIO_MAX);
3390 }; 3390 };
3391 3391
3392 {
3393 my $guard = freeze_mainloop;
3392 reload_config; 3394 reload_config;
3393 db_init; 3395 db_init;
3394 load_extensions; 3396 load_extensions;
3395 3397
3396 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3397 evthread_start IO::AIO::poll_fileno; 3399 }
3400
3401 utime time, time, $RUNTIMEFILE;
3402
3403 # no (long-running) fork's whatsoever before this point(!)
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405
3398 EV::loop; 3406 EV::loop;
3399} 3407}
3400 3408
3401############################################################################# 3409#############################################################################
3402# initialisation and cleanup 3410# initialisation and cleanup
… …
3410 }; 3418 };
3411 } 3419 }
3412} 3420}
3413 3421
3414sub write_runtime_sync { 3422sub write_runtime_sync {
3415 my $runtime = "$LOCALDIR/runtime";
3416
3417 # first touch the runtime file to show we are still running: 3423 # first touch the runtime file to show we are still running:
3418 # the fsync below can take a very very long time. 3424 # the fsync below can take a very very long time.
3419 3425
3420 IO::AIO::aio_utime $runtime, undef, undef; 3426 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3421 3427
3422 my $guard = cf::lock_acquire "write_runtime"; 3428 my $guard = cf::lock_acquire "write_runtime";
3423 3429
3424 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3430 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3425 or return; 3431 or return;
3426 3432
3427 my $value = $cf::RUNTIME + 90 + 10; 3433 my $value = $cf::RUNTIME + 90 + 10;
3428 # 10 is the runtime save interval, for a monotonic clock 3434 # 10 is the runtime save interval, for a monotonic clock
3429 # 60 allows for the watchdog to kill the server. 3435 # 60 allows for the watchdog to kill the server.
… …
3439 aio_utime $fh, undef, undef; 3445 aio_utime $fh, undef, undef;
3440 3446
3441 close $fh 3447 close $fh
3442 or return; 3448 or return;
3443 3449
3444 aio_rename "$runtime~", $runtime 3450 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3445 and return; 3451 and return;
3446 3452
3447 warn "runtime file written.\n"; 3453 warn "runtime file written.\n";
3448 3454
3449 1 3455 1
… …
3533sub post_cleanup { 3539sub post_cleanup {
3534 my ($make_core) = @_; 3540 my ($make_core) = @_;
3535 3541
3536 warn Carp::longmess "post_cleanup backtrace" 3542 warn Carp::longmess "post_cleanup backtrace"
3537 if $make_core; 3543 if $make_core;
3544
3545 my $fh = pidfile;
3546 unlink $PIDFILE if <$fh> == $$;
3538} 3547}
3548
3549# a safer delete_package, copied from Symbol
3550sub clear_package($) {
3551 my $pkg = shift;
3552
3553 # expand to full symbol table name if needed
3554 unless ($pkg =~ /^main::.*::$/) {
3555 $pkg = "main$pkg" if $pkg =~ /^::/;
3556 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3557 $pkg .= '::' unless $pkg =~ /::$/;
3558 }
3559
3560 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3561 my $stem_symtab = *{$stem}{HASH};
3562
3563 defined $stem_symtab and exists $stem_symtab->{$leaf}
3564 or return;
3565
3566 # clear all symbols
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 }
3572 warn "cleared package #$pkg\n";#d#
3573}
3574
3575our $RELOAD; # how many times to reload
3539 3576
3540sub do_reload_perl() { 3577sub do_reload_perl() {
3541 # can/must only be called in main 3578 # can/must only be called in main
3542 if ($Coro::current != $Coro::main) { 3579 if ($Coro::current != $Coro::main) {
3543 warn "can only reload from main coroutine"; 3580 warn "can only reload from main coroutine";
3544 return; 3581 return;
3545 } 3582 }
3546 3583
3584 return if $RELOAD++;
3585
3586 while ($RELOAD) {
3547 warn "reloading..."; 3587 warn "reloading...";
3548 3588
3549 warn "entering sync_job"; 3589 warn "entering sync_job";
3550 3590
3551 cf::sync_job { 3591 cf::sync_job {
3552 cf::write_runtime_sync; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3553 cf::emergency_save; 3593 cf::emergency_save;
3554 cf::write_runtime_sync; # external watchdog should not bark 3594 cf::write_runtime_sync; # external watchdog should not bark
3555 3595
3556 warn "syncing database to disk"; 3596 warn "syncing database to disk";
3557 BDB::db_env_txn_checkpoint $DB_ENV; 3597 BDB::db_env_txn_checkpoint $DB_ENV;
3558 3598
3559 # if anything goes wrong in here, we should simply crash as we already saved 3599 # if anything goes wrong in here, we should simply crash as we already saved
3560 3600
3561 warn "flushing outstanding aio requests"; 3601 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; 3602 while (IO::AIO::nreqs || BDB::nreqs) {
3567 warn "iterate..."; 3603 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 } 3604 }
3593 3605
3594 warn "... nuking $pkg"; 3606 warn "cancelling all extension coros";
3595 Symbol::delete_package $pkg; 3607 $_->cancel for values %EXT_CORO;
3596 } 3608 %EXT_CORO = ();
3597 3609
3598 warn "unloading all perl modules loaded from $LIBDIR"; 3610 warn "removing commands";
3599 while (my ($k, $v) = each %INC) { 3611 %COMMAND = ();
3600 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3601 3612
3613 warn "removing ext/exti commands";
3614 %EXTCMD = ();
3615 %EXTICMD = ();
3616
3617 warn "unloading/nuking all extensions";
3618 for my $pkg (@EXTS) {
3602 warn "... unloading $k"; 3619 warn "... unloading $pkg";
3603 delete $INC{$k};
3604 3620
3605 $k =~ s/\.pm$//;
3606 $k =~ s/\//::/g;
3607
3608 if (my $cb = $k->can ("unload_module")) { 3621 if (my $cb = $pkg->can ("unload")) {
3622 eval {
3609 $cb->(); 3623 $cb->($pkg);
3624 1
3625 } or warn "$pkg unloaded, but with errors: $@";
3626 }
3627
3628 warn "... clearing $pkg";
3629 clear_package $pkg;
3610 } 3630 }
3611 3631
3612 Symbol::delete_package $k; 3632 warn "unloading all perl modules loaded from $LIBDIR";
3633 while (my ($k, $v) = each %INC) {
3634 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3635
3636 warn "... unloading $k";
3637 delete $INC{$k};
3638
3639 $k =~ s/\.pm$//;
3640 $k =~ s/\//::/g;
3641
3642 if (my $cb = $k->can ("unload_module")) {
3643 $cb->();
3644 }
3645
3646 clear_package $k;
3613 } 3647 }
3614 3648
3615 warn "getting rid of safe::, as good as possible"; 3649 warn "getting rid of safe::, as good as possible";
3616 Symbol::delete_package "safe::$_" 3650 clear_package "safe::$_"
3617 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3618 3652
3619 warn "unloading cf.pm \"a bit\""; 3653 warn "unloading cf.pm \"a bit\"";
3620 delete $INC{"cf.pm"}; 3654 delete $INC{"cf.pm"};
3621 delete $INC{"cf/pod.pm"}; 3655 delete $INC{"cf/pod.pm"};
3622 3656
3623 # don't, removes xs symbols, too, 3657 # don't, removes xs symbols, too,
3624 # and global variables created in xs 3658 # and global variables created in xs
3625 #Symbol::delete_package __PACKAGE__; 3659 #clear_package __PACKAGE__;
3626 3660
3627 warn "unload completed, starting to reload now"; 3661 warn "unload completed, starting to reload now";
3628 3662
3629 warn "reloading cf.pm"; 3663 warn "reloading cf.pm";
3630 require cf; 3664 require cf;
3631 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3632 3666
3633 warn "loading config and database again"; 3667 warn "loading config and database again";
3634 cf::reload_config; 3668 cf::reload_config;
3635 3669
3636 warn "loading extensions"; 3670 warn "loading extensions";
3637 cf::load_extensions; 3671 cf::load_extensions;
3638 3672
3639 warn "reattaching attachments to objects/players"; 3673 warn "reattaching attachments to objects/players";
3640 _global_reattach; # objects, sockets 3674 _global_reattach; # objects, sockets
3641 warn "reattaching attachments to maps"; 3675 warn "reattaching attachments to maps";
3642 reattach $_ for values %MAP; 3676 reattach $_ for values %MAP;
3643 warn "reattaching attachments to players"; 3677 warn "reattaching attachments to players";
3644 reattach $_ for values %PLAYER; 3678 reattach $_ for values %PLAYER;
3645 3679
3646 warn "leaving sync_job"; 3680 warn "leaving sync_job";
3647 3681
3648 1 3682 1
3649 } or do { 3683 } or do {
3650 warn $@; 3684 warn $@;
3651 cf::cleanup "error while reloading, exiting."; 3685 cf::cleanup "error while reloading, exiting.";
3652 }; 3686 };
3653 3687
3654 warn "reloaded"; 3688 warn "reloaded";
3689 --$RELOAD;
3690 }
3655}; 3691};
3656 3692
3657our $RELOAD_WATCHER; # used only during reload 3693our $RELOAD_WATCHER; # used only during reload
3658 3694
3659sub reload_perl() { 3695sub reload_perl() {
… …
3684 3720
3685our @WAIT_FOR_TICK; 3721our @WAIT_FOR_TICK;
3686our @WAIT_FOR_TICK_BEGIN; 3722our @WAIT_FOR_TICK_BEGIN;
3687 3723
3688sub wait_for_tick { 3724sub wait_for_tick {
3689 return if tick_inhibit;
3690 return if $Coro::current == $Coro::main; 3725 return if tick_inhibit || $Coro::current == $Coro::main;
3691 3726
3692 my $signal = new Coro::Signal; 3727 my $signal = new Coro::Signal;
3693 push @WAIT_FOR_TICK, $signal; 3728 push @WAIT_FOR_TICK, $signal;
3694 $signal->wait; 3729 $signal->wait;
3695} 3730}
3696 3731
3697sub wait_for_tick_begin { 3732sub wait_for_tick_begin {
3698 return if tick_inhibit;
3699 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3700 3734
3701 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3702 push @WAIT_FOR_TICK_BEGIN, $signal; 3736 push @WAIT_FOR_TICK_BEGIN, $signal;
3703 $signal->wait; 3737 $signal->wait;
3704} 3738}
… …
3743{ 3777{
3744 # configure BDB 3778 # configure BDB
3745 3779
3746 BDB::min_parallel 8; 3780 BDB::min_parallel 8;
3747 BDB::max_poll_reqs $TICK * 0.1; 3781 BDB::max_poll_reqs $TICK * 0.1;
3748 $Coro::BDB::WATCHER->priority (1); 3782 $AnyEvent::BDB::WATCHER->priority (1);
3749 3783
3750 unless ($DB_ENV) { 3784 unless ($DB_ENV) {
3751 $DB_ENV = BDB::db_env_create; 3785 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3786 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3753 | BDB::LOG_AUTOREMOVE, 1); 3787 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3788 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3789 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3790 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3756 3791
3757 cf::sync_job { 3792 cf::sync_job {
3758 eval { 3793 eval {
… …
3784{ 3819{
3785 # configure IO::AIO 3820 # configure IO::AIO
3786 3821
3787 IO::AIO::min_parallel 8; 3822 IO::AIO::min_parallel 8;
3788 IO::AIO::max_poll_time $TICK * 0.1; 3823 IO::AIO::max_poll_time $TICK * 0.1;
3789 $Coro::AIO::WATCHER->priority (1); 3824 undef $AnyEvent::AIO::WATCHER;
3790} 3825}
3791 3826
3792my $_log_backtrace; 3827my $_log_backtrace;
3793 3828
3794sub _log_backtrace { 3829sub _log_backtrace {

Diff Legend

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