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.215 by root, Thu Feb 15 03:19:02 2007 UTC

… …
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use BDB ();
20use Data::Dumper; 21use Data::Dumper;
21use Digest::MD5; 22use Digest::MD5;
22use Fcntl; 23use Fcntl;
23use IO::AIO 2.32 (); 24use IO::AIO 2.32 ();
24use YAML::Syck (); 25use YAML::Syck ();
25use Time::HiRes; 26use Time::HiRes;
27use Compress::LZF;
28
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
26 30
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 31use Event; $Event::Eval = 1; # no idea why this is required, but it is
28 32
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 34
… …
45our $LIBDIR = datadir . "/ext"; 49our $LIBDIR = datadir . "/ext";
46 50
47our $TICK = MAX_TIME * 1e-6; 51our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 55our $NEXT_TICK;
52our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
53 61
54our %CFG; 62our %CFG;
55 63
56our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 65our $RUNTIME;
58 66
59our %PLAYER; # all users 67our %PLAYER; # all users
60our %MAP; # all maps 68our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 69our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
63 72
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 75
67# used to convert map paths into valid unix filenames by replacing / by ∕ 76# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 89mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
85 95
86our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
87 97
88sub cf::map::normalise; 98sub cf::map::normalise;
89 99
… …
263sub freeze_mainloop { 273sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
265 275
266 my $guard = Coro::guard { 276 my $guard = Coro::guard {
267 $TICK_WATCHER->start; 277 $TICK_WATCHER->start;
268 $WRITE_RUNTIME_WATCHER->start;
269 }; 278 };
270 $WRITE_RUNTIME_WATCHER->stop;
271 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
272 $guard 280 $guard
273} 281}
274 282
275=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
358 # 60 allows for the watchdog to kill the server. 366 # 60 allows for the watchdog to kill the server.
359 367
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
361 and return; 369 and return;
362 370
371 # always fsync - this file is important
363 aio_fsync $fh 372 aio_fsync $fh
364 and return; 373 and return;
365 374
366 close $fh 375 close $fh
367 or return; 376 or return;
… …
752 $filename, length $$rdata, scalar @$objs; 761 $filename, length $$rdata, scalar @$objs;
753 762
754 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
755 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
756 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 765 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
757 aio_fsync $fh; 766 aio_fsync $fh if $cf::USE_FSYNC;
758 close $fh; 767 close $fh;
759 768
760 if (@$objs) { 769 if (@$objs) {
761 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 770 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
762 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
763 my $data = Storable::nfreeze { version => 1, objs => $objs }; 772 my $data = Storable::nfreeze { version => 1, objs => $objs };
764 aio_write $fh, 0, (length $data), $data, 0; 773 aio_write $fh, 0, (length $data), $data, 0;
765 aio_fsync $fh; 774 aio_fsync $fh if $cf::USE_FSYNC;
766 close $fh; 775 close $fh;
767 aio_rename "$filename.pst~", "$filename.pst"; 776 aio_rename "$filename.pst~", "$filename.pst";
768 } 777 }
769 } else { 778 } else {
770 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
… …
776 } 785 }
777 } else { 786 } else {
778 aio_unlink $filename; 787 aio_unlink $filename;
779 aio_unlink "$filename.pst"; 788 aio_unlink "$filename.pst";
780 } 789 }
790
791 #d##TODO# nuke non .map-files if exist
792 if ($filename =~ s/\.map$//) {
793 aio_unlink $filename;
794 aio_unlink "$filename.pst";
795 }
781 } 796 }
782} 797}
783 798
784sub object_freezer_as_string { 799sub object_freezer_as_string {
785 my ($rdata, $objs) = @_; 800 my ($rdata, $objs) = @_;
… …
791 806
792sub object_thawer_load { 807sub object_thawer_load {
793 my ($filename) = @_; 808 my ($filename) = @_;
794 809
795 my ($data, $av); 810 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
796 814
797 (aio_load $filename, $data) >= 0 815 (aio_load $filename, $data) >= 0
798 or return; 816 or return;
799 817
800 unless (aio_stat "$filename.pst") { 818 unless (aio_stat "$filename.pst") {
… …
1070=cut 1088=cut
1071 1089
1072sub maps($) { 1090sub maps($) {
1073 my ($pl) = @_; 1091 my ($pl) = @_;
1074 1092
1093 $pl = ref $pl ? $pl->ob->name : $pl;
1094
1075 my $files = aio_readdir playerdir $pl 1095 my $files = aio_readdir playerdir $pl
1076 or return; 1096 or return;
1077 1097
1078 my @paths; 1098 my @paths;
1079 1099
1080 for (@$files) { 1100 for (@$files) {
1081 utf8::decode $_; 1101 utf8::decode $_;
1082 next if /\.(?:pl|pst)$/; 1102 next if /\.(?:pl|pst)$/;
1083 next unless /^$PATH_SEP/o; 1103 next unless /^$PATH_SEP/o;
1084 1104
1085 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_; 1105 push @paths, cf::map::normalise "~$pl/$_";
1086 } 1106 }
1087 1107
1088 \@paths 1108 \@paths
1089} 1109}
1090 1110
… …
1251 1271
1252# the original (read-only) location 1272# the original (read-only) location
1253sub load_path { 1273sub load_path {
1254 my ($self) = @_; 1274 my ($self) = @_;
1255 1275
1256 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1276 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1257} 1277}
1258 1278
1259# the temporary/swap location 1279# the temporary/swap location
1260sub save_path { 1280sub save_path {
1261 my ($self) = @_; 1281 my ($self) = @_;
1262 1282
1263 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1283 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1264 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1284 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1265} 1285}
1266 1286
1267# the unique path, undef == no special unique path 1287# the unique path, undef == no special unique path
1268sub uniq_path { 1288sub uniq_path {
1269 my ($self) = @_; 1289 my ($self) = @_;
… …
1285 my ($self) = @_; 1305 my ($self) = @_;
1286 1306
1287 utf8::encode (my $save = $self->save_path); 1307 utf8::encode (my $save = $self->save_path);
1288 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1289 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311 #d#TODO remove .map and also nuke
1312 $save =~ s/\.map// or return;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1290} 1315}
1291 1316
1292sub load_header_from($) { 1317sub load_header_from($) {
1293 my ($self, $path) = @_; 1318 my ($self, $path) = @_;
1294 1319
1295 utf8::encode $path; 1320 utf8::encode $path;
1296 aio_open $path, O_RDONLY, 0 1321 #aio_open $path, O_RDONLY, 0
1297 or return; 1322 # or return;
1298 1323
1299 $self->_load_header ($path) 1324 $self->_load_header ($path)
1300 or return; 1325 or return;
1301 1326
1302 $self->{load_path} = $path; 1327 $self->{load_path} = $path;
… …
1582 return if $self->players; 1607 return if $self->players;
1583 return if $self->isa ("ext::map_per_player");#d# 1608 return if $self->isa ("ext::map_per_player");#d#
1584 1609
1585 warn "resetting map ", $self->path;#d# 1610 warn "resetting map ", $self->path;#d#
1586 1611
1612 $self->in_memory (cf::MAP_SWAPPED);
1613
1614 # need to save uniques path
1615 unless ($self->{deny_save}) {
1616 my $uniq = $self->uniq_path; utf8::encode $uniq;
1617
1618 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1619 if $uniq;
1620 }
1621
1587 delete $cf::MAP{$self->path}; 1622 delete $cf::MAP{$self->path};
1588 1623
1589 $self->in_memory (cf::MAP_SWAPPED);
1590 $self->clear; 1624 $self->clear;
1591 1625
1592 $_->clear_links_to ($self) for values %cf::MAP; 1626 $_->clear_links_to ($self) for values %cf::MAP;
1593 1627
1594 $self->unlink_save; 1628 $self->unlink_save;
… …
1784 $map->load; 1818 $map->load;
1785 $map->load_diag; 1819 $map->load_diag;
1786 1820
1787 return unless $self->contr->active; 1821 return unless $self->contr->active;
1788 $self->activate_recursive; 1822 $self->activate_recursive;
1823
1824 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1789 $self->enter_map ($map, $x, $y); 1825 $self->enter_map ($map, $x, $y);
1790} 1826}
1791 1827
1792cf::player->attach ( 1828cf::player->attach (
1793 on_logout => sub { 1829 on_logout => sub {
… …
1806 # try to abort aborted map switching on player login :) 1842 # try to abort aborted map switching on player login :)
1807 # should happen only on crashes 1843 # should happen only on crashes
1808 if ($pl->ob->{_link_pos}) { 1844 if ($pl->ob->{_link_pos}) {
1809 $pl->ob->enter_link; 1845 $pl->ob->enter_link;
1810 (async { 1846 (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, 1847 $pl->ob->reply (undef,
1814 "There was an internal problem at your last logout, " 1848 "There was an internal problem at your last logout, "
1815 . "the server will try to bring you to your intended destination in a second.", 1849 . "the server will try to bring you to your intended destination in a second.",
1816 cf::NDI_RED); 1850 cf::NDI_RED);
1851 # we need this sleep as the login has a concurrent enter_exit running
1852 # and this sleep increases chances of the player not ending up in scorn
1817 Coro::Timer::sleep 1; 1853 Coro::Timer::sleep 1;
1818 $pl->ob->leave_link; 1854 $pl->ob->leave_link;
1819 })->prio (2); 1855 })->prio (2);
1820 } 1856 }
1821 }, 1857 },
… …
1987 # get handled first 2023 # get handled first
1988 my $queue = delete $ns->{query_queue} 2024 my $queue = delete $ns->{query_queue}
1989 or return; # be conservative, not sure how that can happen, but we saw a crash here 2025 or return; # be conservative, not sure how that can happen, but we saw a crash here
1990 2026
1991 (shift @$queue)->[1]->($msg); 2027 (shift @$queue)->[1]->($msg);
2028 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1992 2029
1993 push @{ $ns->{query_queue} }, @$queue; 2030 push @{ $ns->{query_queue} }, @$queue;
1994 2031
1995 if (@{ $ns->{query_queue} } == @$queue) { 2032 if (@{ $ns->{query_queue} } == @$queue) {
1996 if (@$queue) { 2033 if (@$queue) {
… …
2157The parameter C<$family> should best start with the name of the extension 2194The parameter C<$family> should best start with the name of the extension
2158using it, it should be unique. 2195using it, it should be unique.
2159 2196
2160=over 4 2197=over 4
2161 2198
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 2199=item $value = cf::db_get $family => $key
2169 2200
2170Returns a single value from the database 2201Returns 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 2202
2177=item cf::db_put $family => $key => $value 2203=item cf::db_put $family => $key => $value
2178 2204
2179Stores the given C<$value> in the family hash. Updates are delayed, if you 2205Stores 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 2206
2190=cut 2207=cut
2191 2208
2192our $DB; 2209our $DB;
2193 2210
2194{ 2211sub db_init {
2212 unless ($DB) {
2213 $DB = BDB::db_create $DB_ENV;
2214
2215 cf::sync_job {
2216 eval {
2217 $DB->set_flags (BDB::CHKSUM);
2218
2219 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2220 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2221 cf::cleanup "db_open(db): $!" if $!;
2222 };
2223 cf::cleanup "db_open(db): $@" if $@;
2224 };
2225
2195 my $path = cf::localdir . "/database.pst"; 2226 my $path = cf::localdir . "/database.pst";
2227 if (stat $path) {
2228 cf::sync_job {
2229 my $pst = Storable::retrieve $path;
2196 2230
2197 sub db_load() { 2231 cf::db_put (board => data => $pst->{board});
2198 $DB = stat $path ? Storable::retrieve $path : { }; 2232 cf::db_put (guildrules => data => $pst->{guildrules});
2199 } 2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2200 2235
2201 my $pid; 2236 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 } 2237 };
2211 }
2212
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($;$) {
2235 @_ >= 2
2236 ? $DB->{$_[0]}{$_[1]}
2237 : ($DB->{$_[0]} ||= { })
2238 }
2239
2240 sub db_put($$;$) {
2241 if (@_ >= 3) {
2242 $DB->{$_[0]}{$_[1]} = $_[2];
2243 } else {
2244 $DB->{$_[0]} = $_[1];
2245 }
2246 db_dirty;
2247 }
2248
2249 cf::global->attach (
2250 prio => 10000,
2251 on_cleanup => sub {
2252 db_sync;
2253 }, 2238 }
2254 ); 2239 }
2240}
2241
2242sub db_get($$) {
2243 my $key = "$_[0]/$_[1]";
2244
2245 cf::sync_job {
2246 BDB::db_get $DB, undef, $key, my $data;
2247
2248 $! ? ()
2249 : Compress::LZF::sthaw $data
2250 }
2251}
2252
2253sub db_put($$$) {
2254 BDB::dbreq_pri 4;
2255 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2255} 2256}
2256 2257
2257############################################################################# 2258#############################################################################
2258# the server's main() 2259# the server's init and main functions
2260
2261sub load_resources {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2263 or die "unable to load regions file\n";#d#
2264}
2259 2265
2260sub cfg_load { 2266sub cfg_load {
2261 open my $fh, "<:utf8", cf::confdir . "/config" 2267 open my $fh, "<:utf8", cf::confdir . "/config"
2262 or return; 2268 or return;
2263 2269
… …
2274 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2275 and die "WARNING: m(un)lockall failed: $!\n"; 2281 and die "WARNING: m(un)lockall failed: $!\n";
2276 }; 2282 };
2277 warn $@ if $@; 2283 warn $@ if $@;
2278 } 2284 }
2285}
2286
2287sub init {
2288 load_resources;
2279} 2289}
2280 2290
2281sub main { 2291sub main {
2282 # we must not ever block the main coroutine 2292 # we must not ever block the main coroutine
2283 local $Coro::idle = sub { 2293 local $Coro::idle = sub {
… …
2286 Event::one_event; 2296 Event::one_event;
2287 })->prio (Coro::PRIO_MAX); 2297 })->prio (Coro::PRIO_MAX);
2288 }; 2298 };
2289 2299
2290 cfg_load; 2300 cfg_load;
2291 db_load; 2301 db_init;
2292 load_extensions; 2302 load_extensions;
2293 2303
2294 $TICK_WATCHER->start; 2304 $TICK_WATCHER->start;
2295 Event::loop; 2305 Event::loop;
2296} 2306}
… …
2335 my $map = $cf::MAP{$path} or next; 2345 my $map = $cf::MAP{$path} or next;
2336 $map->valid or next; 2346 $map->valid or next;
2337 $map->save; 2347 $map->save;
2338 } 2348 }
2339 warn "end emergency map save\n"; 2349 warn "end emergency map save\n";
2350
2351 warn "begin emergency database checkpoint\n";
2352 BDB::db_env_txn_checkpoint $DB_ENV;
2353 warn "end emergency database checkpoint\n";
2340 }; 2354 };
2341 2355
2342 warn "leave emergency perl save\n"; 2356 warn "leave emergency perl save\n";
2357}
2358
2359sub post_cleanup {
2360 my ($make_core) = @_;
2361
2362 warn Carp::longmess "post_cleanup backtrace"
2363 if $make_core;
2343} 2364}
2344 2365
2345sub reload() { 2366sub reload() {
2346 # can/must only be called in main 2367 # can/must only be called in main
2347 if ($Coro::current != $Coro::main) { 2368 if ($Coro::current != $Coro::main) {
… …
2349 return; 2370 return;
2350 } 2371 }
2351 2372
2352 warn "reloading..."; 2373 warn "reloading...";
2353 2374
2354 warn "cancelling server ticker"; 2375 warn "entering sync_job";
2355 $TICK_WATCHER->cancel;
2356 2376
2377 cf::sync_job {
2378 cf::write_runtime; # external watchdog should not bark
2357 cf::emergency_save; 2379 cf::emergency_save;
2380 cf::write_runtime; # external watchdog should not bark
2358 2381
2359 eval { 2382 warn "syncing database to disk";
2383 BDB::db_env_txn_checkpoint $DB_ENV;
2384
2360 # if anything goes wrong in here, we should simply crash as we already saved 2385 # 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 2386
2365 warn "cancelling all WF_AUTOCANCEL watchers"; 2387 warn "cancelling all WF_AUTOCANCEL watchers";
2366 for (Event::all_watchers) { 2388 for (Event::all_watchers) {
2367 $_->cancel if $_->data & WF_AUTOCANCEL; 2389 $_->cancel if $_->data & WF_AUTOCANCEL;
2368 } 2390 }
2369 2391
2370 warn "flushing outstanding aio requests"; 2392 warn "flushing outstanding aio requests";
2371 for (;;) { 2393 for (;;) {
2394 BDB::flush;
2372 IO::AIO::flush; 2395 IO::AIO::flush;
2373 Coro::cede; 2396 Coro::cede;
2374 last unless IO::AIO::nreqs; 2397 last unless IO::AIO::nreqs || BDB::nreqs;
2375 warn "iterate..."; 2398 warn "iterate...";
2376 } 2399 }
2377 2400
2378 warn "cancelling all extension coros"; 2401 warn "cancelling all extension coros";
2379 $_->cancel for values %EXT_CORO; 2402 $_->cancel for values %EXT_CORO;
… …
2434 require cf; 2457 require cf;
2435 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2458 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2436 2459
2437 warn "loading config and database again"; 2460 warn "loading config and database again";
2438 cf::cfg_load; 2461 cf::cfg_load;
2439 cf::db_load;
2440 2462
2441 warn "loading extensions"; 2463 warn "loading extensions";
2442 cf::load_extensions; 2464 cf::load_extensions;
2443 2465
2444 warn "reattaching attachments to objects/players"; 2466 warn "reattaching attachments to objects/players";
2445 _global_reattach; 2467 _global_reattach;
2446 warn "reattaching attachments to maps"; 2468 warn "reattaching attachments to maps";
2447 reattach $_ for values %MAP; 2469 reattach $_ for values %MAP;
2448 2470
2449 warn "restarting server ticker"; 2471 warn "loading reloadable resources";
2472 load_resources;
2450 2473
2451 $TICK_WATCHER->start; 2474 warn "leaving sync_job";
2452 };
2453 2475
2454 if ($@) { 2476 1
2477 } or do {
2455 warn $@; 2478 warn $@;
2456 warn "error while reloading, exiting."; 2479 warn "error while reloading, exiting.";
2457 exit 1; 2480 exit 1;
2458 } 2481 };
2459 2482
2460 warn "reloaded"; 2483 warn "reloaded";
2461}; 2484};
2462 2485
2463our $RELOAD_WATCHER; # used only during reload 2486our $RELOAD_WATCHER; # used only during reload
… …
2504 2527
2505 cf::server_tick; # one server iteration 2528 cf::server_tick; # one server iteration
2506 $RUNTIME += $TICK; 2529 $RUNTIME += $TICK;
2507 $NEXT_TICK += $TICK; 2530 $NEXT_TICK += $TICK;
2508 2531
2532 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2533 $NEXT_RUNTIME_WRITE = $NOW + 10;
2534 Coro::async_pool {
2535 write_runtime
2536 or warn "ERROR: unable to write runtime file: $!";
2537 };
2538 }
2539
2540
2509 $WAIT_FOR_TICK->broadcast; 2541 $WAIT_FOR_TICK->broadcast;
2510 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2542 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2511 2543
2512 Event::sweep;
2513 Coro::cede_notself;
2514
2515# my $AFTER = Event::time; 2544# my $AFTER = Event::time;
2516# warn $AFTER - $NOW;#d# 2545# warn $AFTER - $NOW;#d#
2517 2546
2518 # if we are delayed by four ticks or more, skip them all 2547 # if we are delayed by four ticks or more, skip them all
2519 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2548 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2521 $TICK_WATCHER->at ($NEXT_TICK); 2550 $TICK_WATCHER->at ($NEXT_TICK);
2522 $TICK_WATCHER->start; 2551 $TICK_WATCHER->start;
2523 }, 2552 },
2524); 2553);
2525 2554
2555{
2556 BDB::max_poll_time $TICK * 0.1;
2557 $BDB_POLL_WATCHER = Event->io (
2558 reentrant => 0,
2559 fd => BDB::poll_fileno,
2560 poll => 'r',
2561 prio => 0,
2562 data => WF_AUTOCANCEL,
2563 cb => \&BDB::poll_cb,
2564 );
2565 BDB::min_parallel 8;
2566
2567 BDB::set_sync_prepare {
2568 my $status;
2569 my $current = $Coro::current;
2570 (
2571 sub {
2572 $status = $!;
2573 $current->ready; undef $current;
2574 },
2575 sub {
2576 Coro::schedule while defined $current;
2577 $! = $status;
2578 },
2579 )
2580 };
2581
2582 unless ($DB_ENV) {
2583 $DB_ENV = BDB::db_env_create;
2584
2585 cf::sync_job {
2586 eval {
2587 BDB::db_env_open
2588 $DB_ENV,
2589 $BDB_ENV_DIR,
2590 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2591 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2592 0666;
2593
2594 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2595
2596 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2597 $DB_ENV->set_lk_detect;
2598 };
2599
2600 cf::cleanup "db_env_open(db): $@" if $@;
2601 };
2602 }
2603}
2604
2605{
2606 IO::AIO::min_parallel 8;
2607
2608 undef $Coro::AIO::WATCHER;
2526IO::AIO::max_poll_time $TICK * 0.1; 2609 IO::AIO::max_poll_time $TICK * 0.1;
2527
2528undef $Coro::AIO::WATCHER;
2529$AIO_POLL_WATCHER = Event->io ( 2610 $AIO_POLL_WATCHER = Event->io (
2530 reentrant => 0, 2611 reentrant => 0,
2612 data => WF_AUTOCANCEL,
2531 fd => IO::AIO::poll_fileno, 2613 fd => IO::AIO::poll_fileno,
2532 poll => 'r', 2614 poll => 'r',
2533 prio => 6, 2615 prio => 6,
2534 data => WF_AUTOCANCEL,
2535 cb => \&IO::AIO::poll_cb, 2616 cb => \&IO::AIO::poll_cb,
2536); 2617 );
2537 2618}
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 2619
2550END { cf::emergency_save } 2620END { cf::emergency_save }
2551 2621
25521 26221
2553 2623

Diff Legend

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