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.199 by root, Mon Jan 29 14:46:01 2007 UTC vs.
Revision 1.225 by root, Wed Mar 14 00:04:58 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.5 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
19 21
22use BDB ();
20use Data::Dumper; 23use Data::Dumper;
21use Digest::MD5; 24use Digest::MD5;
22use Fcntl; 25use Fcntl;
23use IO::AIO 2.32 (); 26use IO::AIO 2.32 ();
24use YAML::Syck (); 27use YAML::Syck ();
25use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
26 30
31Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
32Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 33$Event::Eval = 1; # no idea why this is required, but it is
28 34
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 35sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 36
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 37# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 38$YAML::Syck::ImplicitUnicode = 1;
… …
39our @EXTS = (); # list of extension package names 45our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 46our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 47our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 48our %EXT_MAP = (); # pluggable maps
43 49
50our $RELOAD; # number of reloads so far
44our @EVENT; 51our @EVENT;
45our $LIBDIR = datadir . "/ext"; 52our $LIBDIR = datadir . "/ext";
46 53
47our $TICK = MAX_TIME * 1e-6; 54our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 55our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 56our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 57our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 58our $NEXT_TICK;
52our $NOW; 59our $NOW;
60our $USE_FSYNC = 1; # use fsync to write maps - default off
61
62our $BDB_POLL_WATCHER;
63our $DB_ENV;
53 64
54our %CFG; 65our %CFG;
55 66
56our $UPTIME; $UPTIME ||= time; 67our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 68our $RUNTIME;
58 69
59our %PLAYER; # all users 70our %PLAYER; # all users
60our %MAP; # all maps 71our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 72our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 73our $RANDOM_MAPS = cf::localdir . "/random";
74our $BDB_ENV_DIR = cf::localdir . "/db";
63 75
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 76our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 77our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 78
67# used to convert map paths into valid unix filenames by replacing / by ∕ 79# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 92mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 93mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 94mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 95mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 96mkdir $RANDOM_MAPS;
97mkdir $BDB_ENV_DIR;
85 98
86our $EMERGENCY_POSITION; 99our $EMERGENCY_POSITION;
87 100
88sub cf::map::normalise; 101sub cf::map::normalise;
89 102
… …
263sub freeze_mainloop { 276sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 277 return unless $TICK_WATCHER->is_active;
265 278
266 my $guard = Coro::guard { 279 my $guard = Coro::guard {
267 $TICK_WATCHER->start; 280 $TICK_WATCHER->start;
268 $WRITE_RUNTIME_WATCHER->start;
269 }; 281 };
270 $WRITE_RUNTIME_WATCHER->stop;
271 $TICK_WATCHER->stop; 282 $TICK_WATCHER->stop;
272 $guard 283 $guard
273} 284}
274 285
275=item cf::async { BLOCK } 286=item cf::async { BLOCK }
… …
346 357
347 $coro 358 $coro
348} 359}
349 360
350sub write_runtime { 361sub write_runtime {
362 my $guard = cf::lock_acquire "write_runtime";
363
351 my $runtime = cf::localdir . "/runtime"; 364 my $runtime = cf::localdir . "/runtime";
352 365
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 366 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 367 or return;
355 368
… …
358 # 60 allows for the watchdog to kill the server. 371 # 60 allows for the watchdog to kill the server.
359 372
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 373 (aio_write $fh, 0, (length $value), $value, 0) <= 0
361 and return; 374 and return;
362 375
376 # always fsync - this file is important
363 aio_fsync $fh 377 aio_fsync $fh
364 and return; 378 and return;
365 379
366 close $fh 380 close $fh
367 or return; 381 or return;
… …
752 $filename, length $$rdata, scalar @$objs; 766 $filename, length $$rdata, scalar @$objs;
753 767
754 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
755 chmod SAVE_MODE, $fh; 769 chmod SAVE_MODE, $fh;
756 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 770 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
757 aio_fsync $fh; 771 aio_fsync $fh if $cf::USE_FSYNC;
758 close $fh; 772 close $fh;
759 773
760 if (@$objs) { 774 if (@$objs) {
761 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 775 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
762 chmod SAVE_MODE, $fh; 776 chmod SAVE_MODE, $fh;
763 my $data = Storable::nfreeze { version => 1, objs => $objs }; 777 my $data = Storable::nfreeze { version => 1, objs => $objs };
764 aio_write $fh, 0, (length $data), $data, 0; 778 aio_write $fh, 0, (length $data), $data, 0;
765 aio_fsync $fh; 779 aio_fsync $fh if $cf::USE_FSYNC;
766 close $fh; 780 close $fh;
767 aio_rename "$filename.pst~", "$filename.pst"; 781 aio_rename "$filename.pst~", "$filename.pst";
768 } 782 }
769 } else { 783 } else {
770 aio_unlink "$filename.pst"; 784 aio_unlink "$filename.pst";
… …
1019=cut 1033=cut
1020 1034
1021sub quit_character { 1035sub quit_character {
1022 my ($pl) = @_; 1036 my ($pl) = @_;
1023 1037
1038 my $name = $pl->ob->name;
1039
1024 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1025 $pl->password ("*"); # this should lock out the player until we nuked the dir 1041 $pl->password ("*"); # this should lock out the player until we nuked the dir
1026 1042
1027 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1028 $pl->deactivate; 1044 $pl->deactivate;
… …
1032 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1033 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1034 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1035 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1036 $pl->destroy; 1052 $pl->destroy;
1053
1054 my $prefix = qr<^~\Q$name\E/>;
1055
1056 # nuke player maps
1057 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1058
1037 IO::AIO::aio_rmtree $temp; 1059 IO::AIO::aio_rmtree $temp;
1060}
1061
1062=item $pl->kick
1063
1064Kicks a player out of the game. This destroys the connection.
1065
1066=cut
1067
1068sub kick {
1069 my ($pl, $kicker) = @_;
1070
1071 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1072 $pl->killer ("kicked");
1073 $pl->ns->destroy;
1038} 1074}
1039 1075
1040=item cf::player::list_logins 1076=item cf::player::list_logins
1041 1077
1042Returns am arrayref of all valid playernames in the system, can take a 1078Returns am arrayref of all valid playernames in the system, can take a
… …
1070=cut 1106=cut
1071 1107
1072sub maps($) { 1108sub maps($) {
1073 my ($pl) = @_; 1109 my ($pl) = @_;
1074 1110
1111 $pl = ref $pl ? $pl->ob->name : $pl;
1112
1075 my $files = aio_readdir playerdir $pl 1113 my $files = aio_readdir playerdir $pl
1076 or return; 1114 or return;
1077 1115
1078 my @paths; 1116 my @paths;
1079 1117
1080 for (@$files) { 1118 for (@$files) {
1081 utf8::decode $_; 1119 utf8::decode $_;
1082 next if /\.(?:pl|pst)$/; 1120 next if /\.(?:pl|pst)$/;
1083 next unless /^$PATH_SEP/o; 1121 next unless /^$PATH_SEP/o;
1084 1122
1085 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_; 1123 push @paths, cf::map::normalise "~$pl/$_";
1086 } 1124 }
1087 1125
1088 \@paths 1126 \@paths
1089} 1127}
1090 1128
… …
1251 1289
1252# the original (read-only) location 1290# the original (read-only) location
1253sub load_path { 1291sub load_path {
1254 my ($self) = @_; 1292 my ($self) = @_;
1255 1293
1256 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1294 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1257} 1295}
1258 1296
1259# the temporary/swap location 1297# the temporary/swap location
1260sub save_path { 1298sub save_path {
1261 my ($self) = @_; 1299 my ($self) = @_;
1262 1300
1263 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1301 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1264 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1302 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1265} 1303}
1266 1304
1267# the unique path, undef == no special unique path 1305# the unique path, undef == no special unique path
1268sub uniq_path { 1306sub uniq_path {
1269 my ($self) = @_; 1307 my ($self) = @_;
… …
1291 1329
1292sub load_header_from($) { 1330sub load_header_from($) {
1293 my ($self, $path) = @_; 1331 my ($self, $path) = @_;
1294 1332
1295 utf8::encode $path; 1333 utf8::encode $path;
1296 aio_open $path, O_RDONLY, 0 1334 #aio_open $path, O_RDONLY, 0
1297 or return; 1335 # or return;
1298 1336
1299 $self->_load_header ($path) 1337 $self->_load_header ($path)
1300 or return; 1338 or return;
1301 1339
1302 $self->{load_path} = $path; 1340 $self->{load_path} = $path;
… …
1582 return if $self->players; 1620 return if $self->players;
1583 return if $self->isa ("ext::map_per_player");#d# 1621 return if $self->isa ("ext::map_per_player");#d#
1584 1622
1585 warn "resetting map ", $self->path;#d# 1623 warn "resetting map ", $self->path;#d#
1586 1624
1625 $self->in_memory (cf::MAP_SWAPPED);
1626
1627 # need to save uniques path
1628 unless ($self->{deny_save}) {
1629 my $uniq = $self->uniq_path; utf8::encode $uniq;
1630
1631 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1632 if $uniq;
1633 }
1634
1587 delete $cf::MAP{$self->path}; 1635 delete $cf::MAP{$self->path};
1588 1636
1589 $self->in_memory (cf::MAP_SWAPPED);
1590 $self->clear; 1637 $self->clear;
1591 1638
1592 $_->clear_links_to ($self) for values %cf::MAP; 1639 $_->clear_links_to ($self) for values %cf::MAP;
1593 1640
1594 $self->unlink_save; 1641 $self->unlink_save;
… …
1784 $map->load; 1831 $map->load;
1785 $map->load_diag; 1832 $map->load_diag;
1786 1833
1787 return unless $self->contr->active; 1834 return unless $self->contr->active;
1788 $self->activate_recursive; 1835 $self->activate_recursive;
1836
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1789 $self->enter_map ($map, $x, $y); 1838 $self->enter_map ($map, $x, $y);
1790} 1839}
1791 1840
1792cf::player->attach ( 1841cf::player->attach (
1793 on_logout => sub { 1842 on_logout => sub {
… …
1806 # try to abort aborted map switching on player login :) 1855 # try to abort aborted map switching on player login :)
1807 # should happen only on crashes 1856 # should happen only on crashes
1808 if ($pl->ob->{_link_pos}) { 1857 if ($pl->ob->{_link_pos}) {
1809 $pl->ob->enter_link; 1858 $pl->ob->enter_link;
1810 (async { 1859 (async {
1811 # we need this sleep as the login has a concurrent enter_exit running
1812 # and this sleep increases chances of the player not ending up in scorn
1813 $pl->ob->reply (undef, 1860 $pl->ob->reply (undef,
1814 "There was an internal problem at your last logout, " 1861 "There was an internal problem at your last logout, "
1815 . "the server will try to bring you to your intended destination in a second.", 1862 . "the server will try to bring you to your intended destination in a second.",
1816 cf::NDI_RED); 1863 cf::NDI_RED);
1864 # we need this sleep as the login has a concurrent enter_exit running
1865 # and this sleep increases chances of the player not ending up in scorn
1817 Coro::Timer::sleep 1; 1866 Coro::Timer::sleep 1;
1818 $pl->ob->leave_link; 1867 $pl->ob->leave_link;
1819 })->prio (2); 1868 })->prio (2);
1820 } 1869 }
1821 }, 1870 },
… …
1946 1995
1947sub cf::client::send_drawinfo { 1996sub cf::client::send_drawinfo {
1948 my ($self, $text, $flags) = @_; 1997 my ($self, $text, $flags) = @_;
1949 1998
1950 utf8::encode $text; 1999 utf8::encode $text;
1951 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1952} 2001}
1953 2002
1954 2003
1955=item $success = $client->query ($flags, "text", \&cb) 2004=item $success = $client->query ($flags, "text", \&cb)
1956 2005
… …
1987 # get handled first 2036 # get handled first
1988 my $queue = delete $ns->{query_queue} 2037 my $queue = delete $ns->{query_queue}
1989 or return; # be conservative, not sure how that can happen, but we saw a crash here 2038 or return; # be conservative, not sure how that can happen, but we saw a crash here
1990 2039
1991 (shift @$queue)->[1]->($msg); 2040 (shift @$queue)->[1]->($msg);
2041 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1992 2042
1993 push @{ $ns->{query_queue} }, @$queue; 2043 push @{ $ns->{query_queue} }, @$queue;
1994 2044
1995 if (@{ $ns->{query_queue} } == @$queue) { 2045 if (@{ $ns->{query_queue} } == @$queue) {
1996 if (@$queue) { 2046 if (@$queue) {
… …
2157The parameter C<$family> should best start with the name of the extension 2207The parameter C<$family> should best start with the name of the extension
2158using it, it should be unique. 2208using it, it should be unique.
2159 2209
2160=over 4 2210=over 4
2161 2211
2162=item $hashref = cf::db_get $family
2163
2164Return a hashref for use by the extension C<$family>, which can be
2165modified. After modifications, you have to call C<cf::db_dirty> or
2166C<cf::db_sync>.
2167
2168=item $value = cf::db_get $family => $key 2212=item $value = cf::db_get $family => $key
2169 2213
2170Returns a single value from the database 2214Returns a single value from the database.
2171
2172=item cf::db_put $family => $hashref
2173
2174Stores the given family hashref into the database. Updates are delayed, if
2175you want the data to be synced to disk immediately, use C<cf::db_sync>.
2176 2215
2177=item cf::db_put $family => $key => $value 2216=item cf::db_put $family => $key => $value
2178 2217
2179Stores the given C<$value> in the family hash. Updates are delayed, if you 2218Stores the given C<$value> in the family.
2180want the data to be synced to disk immediately, use C<cf::db_sync>.
2181
2182=item cf::db_dirty
2183
2184Marks the database as dirty, to be updated at a later time.
2185
2186=item cf::db_sync
2187
2188Immediately write the database to disk I<if it is dirty>.
2189 2219
2190=cut 2220=cut
2191 2221
2192our $DB; 2222our $DB;
2193 2223
2194{ 2224sub db_init {
2225 unless ($DB) {
2226 $DB = BDB::db_create $DB_ENV;
2227
2228 cf::sync_job {
2229 eval {
2230 $DB->set_flags (BDB::CHKSUM);
2231
2232 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2233 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2234 cf::cleanup "db_open(db): $!" if $!;
2235 };
2236 cf::cleanup "db_open(db): $@" if $@;
2237 };
2238
2195 my $path = cf::localdir . "/database.pst"; 2239 my $path = cf::localdir . "/database.pst";
2240 if (stat $path) {
2241 cf::sync_job {
2242 my $pst = Storable::retrieve $path;
2196 2243
2197 sub db_load() { 2244 cf::db_put (board => data => $pst->{board});
2198 $DB = stat $path ? Storable::retrieve $path : { }; 2245 cf::db_put (guildrules => data => $pst->{guildrules});
2199 } 2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2200 2248
2201 my $pid; 2249 unlink $path;
2202
2203 sub db_save() {
2204 waitpid $pid, 0 if $pid;
2205 if (0 == ($pid = fork)) {
2206 $DB->{_meta}{version} = 1;
2207 Storable::nstore $DB, "$path~";
2208 rename "$path~", $path;
2209 cf::_exit 0 if defined $pid;
2210 } 2250 };
2251 }
2211 } 2252 }
2253}
2212 2254
2213 my $dirty;
2214
2215 sub db_sync() {
2216 db_save if $dirty;
2217 undef $dirty;
2218 }
2219
2220 my $idle = Event->idle (
2221 reentrant => 0,
2222 min => 10,
2223 max => 20,
2224 repeat => 0,
2225 data => WF_AUTOCANCEL,
2226 cb => \&db_sync,
2227 );
2228
2229 sub db_dirty() {
2230 $dirty = 1;
2231 $idle->start;
2232 }
2233
2234 sub db_get($;$) { 2255sub db_get($$) {
2235 @_ >= 2 2256 my $key = "$_[0]/$_[1]";
2236 ? $DB->{$_[0]}{$_[1]}
2237 : ($DB->{$_[0]} ||= { })
2238 }
2239 2257
2258 cf::sync_job {
2259 BDB::db_get $DB, undef, $key, my $data;
2260
2261 $! ? ()
2262 : Compress::LZF::sthaw $data
2263 }
2264}
2265
2240 sub db_put($$;$) { 2266sub db_put($$$) {
2241 if (@_ >= 3) { 2267 BDB::dbreq_pri 4;
2242 $DB->{$_[0]}{$_[1]} = $_[2]; 2268 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2269}
2270
2271#############################################################################
2272# the server's init and main functions
2273
2274sub load_faces {
2275 my $path = sprintf "%s/faces", cf::datadir;
2276
2277 warn "loading faces from $path\n";
2278
2279 my $faces;
2280 0 < aio_load $path, $faces
2281 or die "$path: $!";
2282
2283 Coro::cede;
2284 $faces = Storable::thaw $faces;
2285 Coro::cede;
2286
2287 while (my ($face, $info) = each %$faces) {
2288 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2289 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2290 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2291 Coro::cede;
2292 }
2293
2294 while (my ($face, $info) = each %$faces) {
2295 next unless $info->{smooth};
2296 my $idx = cf::face::find $face
2297 or next;
2298 if (my $smooth = cf::face::find $info->{smooth}) {
2299 cf::face::set_smooth $idx, $smooth;
2300 warn "smooth $idx,$smooth ($face,$info->{smooth})\n";#d#
2243 } else { 2301 } else {
2244 $DB->{$_[0]} = $_[1]; 2302 warn "smooth face '$info->{smooth}' not found for face '$face'";
2245 }
2246 db_dirty;
2247 }
2248
2249 cf::global->attach (
2250 prio => 10000,
2251 on_cleanup => sub {
2252 db_sync;
2253 }, 2303 }
2254 ); 2304 Coro::cede;
2255} 2305 }
2256 2306
2257############################################################################# 2307 1
2258# the server's main() 2308}
2309
2310sub reload_resources {
2311 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2312 or die "unable to load regions file\n";#d#
2313 load_faces
2314 or die "unable to load faces\n";#d#
2315}
2316
2317sub init {
2318 reload_resources;
2319}
2259 2320
2260sub cfg_load { 2321sub cfg_load {
2261 open my $fh, "<:utf8", cf::confdir . "/config" 2322 open my $fh, "<:utf8", cf::confdir . "/config"
2262 or return; 2323 or return;
2263 2324
… …
2286 Event::one_event; 2347 Event::one_event;
2287 })->prio (Coro::PRIO_MAX); 2348 })->prio (Coro::PRIO_MAX);
2288 }; 2349 };
2289 2350
2290 cfg_load; 2351 cfg_load;
2291 db_load; 2352 db_init;
2292 load_extensions; 2353 load_extensions;
2293 2354
2294 $TICK_WATCHER->start; 2355 $TICK_WATCHER->start;
2295 Event::loop; 2356 Event::loop;
2296} 2357}
… …
2335 my $map = $cf::MAP{$path} or next; 2396 my $map = $cf::MAP{$path} or next;
2336 $map->valid or next; 2397 $map->valid or next;
2337 $map->save; 2398 $map->save;
2338 } 2399 }
2339 warn "end emergency map save\n"; 2400 warn "end emergency map save\n";
2401
2402 warn "begin emergency database checkpoint\n";
2403 BDB::db_env_txn_checkpoint $DB_ENV;
2404 warn "end emergency database checkpoint\n";
2340 }; 2405 };
2341 2406
2342 warn "leave emergency perl save\n"; 2407 warn "leave emergency perl save\n";
2408}
2409
2410sub post_cleanup {
2411 my ($make_core) = @_;
2412
2413 warn Carp::longmess "post_cleanup backtrace"
2414 if $make_core;
2343} 2415}
2344 2416
2345sub reload() { 2417sub reload() {
2346 # can/must only be called in main 2418 # can/must only be called in main
2347 if ($Coro::current != $Coro::main) { 2419 if ($Coro::current != $Coro::main) {
… …
2349 return; 2421 return;
2350 } 2422 }
2351 2423
2352 warn "reloading..."; 2424 warn "reloading...";
2353 2425
2354 warn "cancelling server ticker"; 2426 warn "entering sync_job";
2355 $TICK_WATCHER->cancel;
2356 2427
2428 cf::sync_job {
2429 cf::write_runtime; # external watchdog should not bark
2357 cf::emergency_save; 2430 cf::emergency_save;
2431 cf::write_runtime; # external watchdog should not bark
2358 2432
2359 eval { 2433 warn "syncing database to disk";
2434 BDB::db_env_txn_checkpoint $DB_ENV;
2435
2360 # if anything goes wrong in here, we should simply crash as we already saved 2436 # if anything goes wrong in here, we should simply crash as we already saved
2361
2362 warn "syncing database to disk";
2363 cf::db_sync;
2364 2437
2365 warn "cancelling all WF_AUTOCANCEL watchers"; 2438 warn "cancelling all WF_AUTOCANCEL watchers";
2366 for (Event::all_watchers) { 2439 for (Event::all_watchers) {
2367 $_->cancel if $_->data & WF_AUTOCANCEL; 2440 $_->cancel if $_->data & WF_AUTOCANCEL;
2368 } 2441 }
2369 2442
2370 warn "flushing outstanding aio requests"; 2443 warn "flushing outstanding aio requests";
2371 for (;;) { 2444 for (;;) {
2445 BDB::flush;
2372 IO::AIO::flush; 2446 IO::AIO::flush;
2373 Coro::cede; 2447 Coro::cede;
2374 last unless IO::AIO::nreqs; 2448 last unless IO::AIO::nreqs || BDB::nreqs;
2375 warn "iterate..."; 2449 warn "iterate...";
2376 } 2450 }
2451
2452 ++$RELOAD;
2377 2453
2378 warn "cancelling all extension coros"; 2454 warn "cancelling all extension coros";
2379 $_->cancel for values %EXT_CORO; 2455 $_->cancel for values %EXT_CORO;
2380 %EXT_CORO = (); 2456 %EXT_CORO = ();
2381 2457
… …
2434 require cf; 2510 require cf;
2435 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2511 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2436 2512
2437 warn "loading config and database again"; 2513 warn "loading config and database again";
2438 cf::cfg_load; 2514 cf::cfg_load;
2439 cf::db_load;
2440 2515
2441 warn "loading extensions"; 2516 warn "loading extensions";
2442 cf::load_extensions; 2517 cf::load_extensions;
2443 2518
2444 warn "reattaching attachments to objects/players"; 2519 warn "reattaching attachments to objects/players";
2445 _global_reattach; 2520 _global_reattach; # objects, sockets
2446 warn "reattaching attachments to maps"; 2521 warn "reattaching attachments to maps";
2447 reattach $_ for values %MAP; 2522 reattach $_ for values %MAP;
2523 warn "reattaching attachments to players";
2524 reattach $_ for values %PLAYER;
2448 2525
2449 warn "restarting server ticker"; 2526 warn "loading reloadable resources";
2527 reload_resources;
2450 2528
2451 $TICK_WATCHER->start; 2529 warn "leaving sync_job";
2452 };
2453 2530
2454 if ($@) { 2531 1
2532 } or do {
2455 warn $@; 2533 warn $@;
2456 warn "error while reloading, exiting."; 2534 warn "error while reloading, exiting.";
2457 exit 1; 2535 exit 1;
2458 } 2536 };
2459 2537
2460 warn "reloaded"; 2538 warn "reloaded";
2461}; 2539};
2462 2540
2463our $RELOAD_WATCHER; # used only during reload 2541our $RELOAD_WATCHER; # used only during reload
… …
2504 2582
2505 cf::server_tick; # one server iteration 2583 cf::server_tick; # one server iteration
2506 $RUNTIME += $TICK; 2584 $RUNTIME += $TICK;
2507 $NEXT_TICK += $TICK; 2585 $NEXT_TICK += $TICK;
2508 2586
2587 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2588 $NEXT_RUNTIME_WRITE = $NOW + 10;
2589 Coro::async_pool {
2590 write_runtime
2591 or warn "ERROR: unable to write runtime file: $!";
2592 };
2593 }
2594
2509 $WAIT_FOR_TICK->broadcast; 2595 $WAIT_FOR_TICK->broadcast;
2510 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2596 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2511 2597
2512 Event::sweep;
2513 Coro::cede_notself;
2514
2515# my $AFTER = Event::time; 2598# my $AFTER = Event::time;
2516# warn $AFTER - $NOW;#d# 2599# warn $AFTER - $NOW;#d#
2517 2600
2518 # if we are delayed by four ticks or more, skip them all 2601 # if we are delayed by four ticks or more, skip them all
2519 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2602 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2521 $TICK_WATCHER->at ($NEXT_TICK); 2604 $TICK_WATCHER->at ($NEXT_TICK);
2522 $TICK_WATCHER->start; 2605 $TICK_WATCHER->start;
2523 }, 2606 },
2524); 2607);
2525 2608
2609{
2610 BDB::max_poll_time $TICK * 0.1;
2611 $BDB_POLL_WATCHER = Event->io (
2612 reentrant => 0,
2613 fd => BDB::poll_fileno,
2614 poll => 'r',
2615 prio => 0,
2616 data => WF_AUTOCANCEL,
2617 cb => \&BDB::poll_cb,
2618 );
2619 BDB::min_parallel 8;
2620
2621 BDB::set_sync_prepare {
2622 my $status;
2623 my $current = $Coro::current;
2624 (
2625 sub {
2626 $status = $!;
2627 $current->ready; undef $current;
2628 },
2629 sub {
2630 Coro::schedule while defined $current;
2631 $! = $status;
2632 },
2633 )
2634 };
2635
2636 unless ($DB_ENV) {
2637 $DB_ENV = BDB::db_env_create;
2638
2639 cf::sync_job {
2640 eval {
2641 BDB::db_env_open
2642 $DB_ENV,
2643 $BDB_ENV_DIR,
2644 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2645 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2646 0666;
2647
2648 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2649
2650 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2651 $DB_ENV->set_lk_detect;
2652 };
2653
2654 cf::cleanup "db_env_open(db): $@" if $@;
2655 };
2656 }
2657}
2658
2659{
2660 IO::AIO::min_parallel 8;
2661
2662 undef $Coro::AIO::WATCHER;
2526IO::AIO::max_poll_time $TICK * 0.1; 2663 IO::AIO::max_poll_time $TICK * 0.1;
2527
2528undef $Coro::AIO::WATCHER;
2529$AIO_POLL_WATCHER = Event->io ( 2664 $AIO_POLL_WATCHER = Event->io (
2530 reentrant => 0, 2665 reentrant => 0,
2666 data => WF_AUTOCANCEL,
2531 fd => IO::AIO::poll_fileno, 2667 fd => IO::AIO::poll_fileno,
2532 poll => 'r', 2668 poll => 'r',
2533 prio => 6, 2669 prio => 6,
2534 data => WF_AUTOCANCEL,
2535 cb => \&IO::AIO::poll_cb, 2670 cb => \&IO::AIO::poll_cb,
2536); 2671 );
2537 2672}
2538$WRITE_RUNTIME_WATCHER = Event->timer (
2539 reentrant => 0,
2540 data => WF_AUTOCANCEL,
2541 after => 1,
2542 interval => 10,
2543 prio => 6, # keep it lowest so it acts like a watchdog
2544 cb => Coro::unblock_sub {
2545 write_runtime
2546 or warn "ERROR: unable to write runtime file: $!";
2547 },
2548);
2549 2673
2550END { cf::emergency_save } 2674END { cf::emergency_save }
2551 2675
25521 26761
2553 2677

Diff Legend

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