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.202 by root, Mon Jan 29 20:16:28 2007 UTC vs.
Revision 1.221 by pippijn, Fri Mar 2 13:32:52 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 }
… …
346 354
347 $coro 355 $coro
348} 356}
349 357
350sub write_runtime { 358sub write_runtime {
359 my $guard = cf::lock_acquire "write_runtime";
360
351 my $runtime = cf::localdir . "/runtime"; 361 my $runtime = cf::localdir . "/runtime";
352 362
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 364 or return;
355 365
… …
358 # 60 allows for the watchdog to kill the server. 368 # 60 allows for the watchdog to kill the server.
359 369
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 370 (aio_write $fh, 0, (length $value), $value, 0) <= 0
361 and return; 371 and return;
362 372
373 # always fsync - this file is important
363 aio_fsync $fh 374 aio_fsync $fh
364 and return; 375 and return;
365 376
366 close $fh 377 close $fh
367 or return; 378 or return;
… …
752 $filename, length $$rdata, scalar @$objs; 763 $filename, length $$rdata, scalar @$objs;
753 764
754 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 765 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
755 chmod SAVE_MODE, $fh; 766 chmod SAVE_MODE, $fh;
756 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 767 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
757 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
758 close $fh; 769 close $fh;
759 770
760 if (@$objs) { 771 if (@$objs) {
761 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 772 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
762 chmod SAVE_MODE, $fh; 773 chmod SAVE_MODE, $fh;
763 my $data = Storable::nfreeze { version => 1, objs => $objs }; 774 my $data = Storable::nfreeze { version => 1, objs => $objs };
764 aio_write $fh, 0, (length $data), $data, 0; 775 aio_write $fh, 0, (length $data), $data, 0;
765 aio_fsync $fh; 776 aio_fsync $fh if $cf::USE_FSYNC;
766 close $fh; 777 close $fh;
767 aio_rename "$filename.pst~", "$filename.pst"; 778 aio_rename "$filename.pst~", "$filename.pst";
768 } 779 }
769 } else { 780 } else {
770 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
… …
776 } 787 }
777 } else { 788 } else {
778 aio_unlink $filename; 789 aio_unlink $filename;
779 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
780 } 791 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
787 } 792 }
788} 793}
789 794
790sub object_freezer_as_string { 795sub object_freezer_as_string {
791 my ($rdata, $objs) = @_; 796 my ($rdata, $objs) = @_;
… …
797 802
798sub object_thawer_load { 803sub object_thawer_load {
799 my ($filename) = @_; 804 my ($filename) = @_;
800 805
801 my ($data, $av); 806 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
805 807
806 (aio_load $filename, $data) >= 0 808 (aio_load $filename, $data) >= 0
807 or return; 809 or return;
808 810
809 unless (aio_stat "$filename.pst") { 811 unless (aio_stat "$filename.pst") {
… …
1028=cut 1030=cut
1029 1031
1030sub quit_character { 1032sub quit_character {
1031 my ($pl) = @_; 1033 my ($pl) = @_;
1032 1034
1035 my $name = $pl->ob->name;
1036
1033 $pl->{deny_save} = 1; 1037 $pl->{deny_save} = 1;
1034 $pl->password ("*"); # this should lock out the player until we nuked the dir 1038 $pl->password ("*"); # this should lock out the player until we nuked the dir
1035 1039
1036 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1040 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1037 $pl->deactivate; 1041 $pl->deactivate;
… …
1041 my $path = playerdir $pl; 1045 my $path = playerdir $pl;
1042 my $temp = "$path~$cf::RUNTIME~deleting~"; 1046 my $temp = "$path~$cf::RUNTIME~deleting~";
1043 aio_rename $path, $temp; 1047 aio_rename $path, $temp;
1044 delete $cf::PLAYER{$pl->ob->name}; 1048 delete $cf::PLAYER{$pl->ob->name};
1045 $pl->destroy; 1049 $pl->destroy;
1050
1051 my $prefix = qr<^~\Q$name\E/>;
1052
1053 # nuke player maps
1054 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1055
1046 IO::AIO::aio_rmtree $temp; 1056 IO::AIO::aio_rmtree $temp;
1057}
1058
1059=item $pl->kick
1060
1061Kicks a player out of the game. This destroys the connection.
1062
1063=cut
1064
1065sub kick {
1066 my ($pl, $kicker) = @_;
1067
1068 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1069 $pl->killer ("kicked");
1070 $pl->ns->destroy;
1047} 1071}
1048 1072
1049=item cf::player::list_logins 1073=item cf::player::list_logins
1050 1074
1051Returns am arrayref of all valid playernames in the system, can take a 1075Returns am arrayref of all valid playernames in the system, can take a
… …
1296 my ($self) = @_; 1320 my ($self) = @_;
1297 1321
1298 utf8::encode (my $save = $self->save_path); 1322 utf8::encode (my $save = $self->save_path);
1299 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1323 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1300 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1324 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1301
1302 #d#TODO remove .map and also nuke
1303 $save =~ s/\.map// or return;#d#
1304 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1305 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1306} 1325}
1307 1326
1308sub load_header_from($) { 1327sub load_header_from($) {
1309 my ($self, $path) = @_; 1328 my ($self, $path) = @_;
1310 1329
… …
1598 return if $self->players; 1617 return if $self->players;
1599 return if $self->isa ("ext::map_per_player");#d# 1618 return if $self->isa ("ext::map_per_player");#d#
1600 1619
1601 warn "resetting map ", $self->path;#d# 1620 warn "resetting map ", $self->path;#d#
1602 1621
1622 $self->in_memory (cf::MAP_SWAPPED);
1623
1624 # need to save uniques path
1625 unless ($self->{deny_save}) {
1626 my $uniq = $self->uniq_path; utf8::encode $uniq;
1627
1628 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1629 if $uniq;
1630 }
1631
1603 delete $cf::MAP{$self->path}; 1632 delete $cf::MAP{$self->path};
1604 1633
1605 $self->in_memory (cf::MAP_SWAPPED);
1606 $self->clear; 1634 $self->clear;
1607 1635
1608 $_->clear_links_to ($self) for values %cf::MAP; 1636 $_->clear_links_to ($self) for values %cf::MAP;
1609 1637
1610 $self->unlink_save; 1638 $self->unlink_save;
… …
1800 $map->load; 1828 $map->load;
1801 $map->load_diag; 1829 $map->load_diag;
1802 1830
1803 return unless $self->contr->active; 1831 return unless $self->contr->active;
1804 $self->activate_recursive; 1832 $self->activate_recursive;
1833
1834 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1805 $self->enter_map ($map, $x, $y); 1835 $self->enter_map ($map, $x, $y);
1806} 1836}
1807 1837
1808cf::player->attach ( 1838cf::player->attach (
1809 on_logout => sub { 1839 on_logout => sub {
… …
1822 # try to abort aborted map switching on player login :) 1852 # try to abort aborted map switching on player login :)
1823 # should happen only on crashes 1853 # should happen only on crashes
1824 if ($pl->ob->{_link_pos}) { 1854 if ($pl->ob->{_link_pos}) {
1825 $pl->ob->enter_link; 1855 $pl->ob->enter_link;
1826 (async { 1856 (async {
1827 # we need this sleep as the login has a concurrent enter_exit running
1828 # and this sleep increases chances of the player not ending up in scorn
1829 $pl->ob->reply (undef, 1857 $pl->ob->reply (undef,
1830 "There was an internal problem at your last logout, " 1858 "There was an internal problem at your last logout, "
1831 . "the server will try to bring you to your intended destination in a second.", 1859 . "the server will try to bring you to your intended destination in a second.",
1832 cf::NDI_RED); 1860 cf::NDI_RED);
1861 # we need this sleep as the login has a concurrent enter_exit running
1862 # and this sleep increases chances of the player not ending up in scorn
1833 Coro::Timer::sleep 1; 1863 Coro::Timer::sleep 1;
1834 $pl->ob->leave_link; 1864 $pl->ob->leave_link;
1835 })->prio (2); 1865 })->prio (2);
1836 } 1866 }
1837 }, 1867 },
… …
2174The parameter C<$family> should best start with the name of the extension 2204The parameter C<$family> should best start with the name of the extension
2175using it, it should be unique. 2205using it, it should be unique.
2176 2206
2177=over 4 2207=over 4
2178 2208
2179=item $hashref = cf::db_get $family
2180
2181Return a hashref for use by the extension C<$family>, which can be
2182modified. After modifications, you have to call C<cf::db_dirty> or
2183C<cf::db_sync>.
2184
2185=item $value = cf::db_get $family => $key 2209=item $value = cf::db_get $family => $key
2186 2210
2187Returns a single value from the database 2211Returns a single value from the database.
2188
2189=item cf::db_put $family => $hashref
2190
2191Stores the given family hashref into the database. Updates are delayed, if
2192you want the data to be synced to disk immediately, use C<cf::db_sync>.
2193 2212
2194=item cf::db_put $family => $key => $value 2213=item cf::db_put $family => $key => $value
2195 2214
2196Stores the given C<$value> in the family hash. Updates are delayed, if you 2215Stores the given C<$value> in the family.
2197want the data to be synced to disk immediately, use C<cf::db_sync>.
2198
2199=item cf::db_dirty
2200
2201Marks the database as dirty, to be updated at a later time.
2202
2203=item cf::db_sync
2204
2205Immediately write the database to disk I<if it is dirty>.
2206 2216
2207=cut 2217=cut
2208 2218
2209our $DB; 2219our $DB;
2210 2220
2211{ 2221sub db_init {
2222 unless ($DB) {
2223 $DB = BDB::db_create $DB_ENV;
2224
2225 cf::sync_job {
2226 eval {
2227 $DB->set_flags (BDB::CHKSUM);
2228
2229 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2230 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2231 cf::cleanup "db_open(db): $!" if $!;
2232 };
2233 cf::cleanup "db_open(db): $@" if $@;
2234 };
2235
2212 my $path = cf::localdir . "/database.pst"; 2236 my $path = cf::localdir . "/database.pst";
2237 if (stat $path) {
2238 cf::sync_job {
2239 my $pst = Storable::retrieve $path;
2213 2240
2214 sub db_load() { 2241 cf::db_put (board => data => $pst->{board});
2215 $DB = stat $path ? Storable::retrieve $path : { }; 2242 cf::db_put (guildrules => data => $pst->{guildrules});
2216 } 2243 cf::db_put (rent => balance => $pst->{rent}{balance});
2244 BDB::db_env_txn_checkpoint $DB_ENV;
2217 2245
2218 my $pid; 2246 unlink $path;
2219
2220 sub db_save() {
2221 waitpid $pid, 0 if $pid;
2222 if (0 == ($pid = fork)) {
2223 $DB->{_meta}{version} = 1;
2224 Storable::nstore $DB, "$path~";
2225 rename "$path~", $path;
2226 cf::_exit 0 if defined $pid;
2227 } 2247 };
2228 }
2229
2230 my $dirty;
2231
2232 sub db_sync() {
2233 db_save if $dirty;
2234 undef $dirty;
2235 }
2236
2237 my $idle = Event->idle (
2238 reentrant => 0,
2239 min => 10,
2240 max => 20,
2241 repeat => 0,
2242 data => WF_AUTOCANCEL,
2243 cb => \&db_sync,
2244 );
2245
2246 sub db_dirty() {
2247 $dirty = 1;
2248 $idle->start;
2249 }
2250
2251 sub db_get($;$) {
2252 @_ >= 2
2253 ? $DB->{$_[0]}{$_[1]}
2254 : ($DB->{$_[0]} ||= { })
2255 }
2256
2257 sub db_put($$;$) {
2258 if (@_ >= 3) {
2259 $DB->{$_[0]}{$_[1]} = $_[2];
2260 } else {
2261 $DB->{$_[0]} = $_[1];
2262 }
2263 db_dirty;
2264 }
2265
2266 cf::global->attach (
2267 prio => 10000,
2268 on_cleanup => sub {
2269 db_sync;
2270 }, 2248 }
2271 ); 2249 }
2250}
2251
2252sub db_get($$) {
2253 my $key = "$_[0]/$_[1]";
2254
2255 cf::sync_job {
2256 BDB::db_get $DB, undef, $key, my $data;
2257
2258 $! ? ()
2259 : Compress::LZF::sthaw $data
2260 }
2261}
2262
2263sub db_put($$$) {
2264 BDB::dbreq_pri 4;
2265 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2272} 2266}
2273 2267
2274############################################################################# 2268#############################################################################
2275# the server's main() 2269# the server's init and main functions
2270
2271sub init_resources {
2272 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2273 or die "unable to load regions file\n";#d#
2274}
2276 2275
2277sub cfg_load { 2276sub cfg_load {
2278 open my $fh, "<:utf8", cf::confdir . "/config" 2277 open my $fh, "<:utf8", cf::confdir . "/config"
2279 or return; 2278 or return;
2280 2279
… …
2291 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2290 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2292 and die "WARNING: m(un)lockall failed: $!\n"; 2291 and die "WARNING: m(un)lockall failed: $!\n";
2293 }; 2292 };
2294 warn $@ if $@; 2293 warn $@ if $@;
2295 } 2294 }
2295}
2296
2297sub init {
2298 init_resources;
2296} 2299}
2297 2300
2298sub main { 2301sub main {
2299 # we must not ever block the main coroutine 2302 # we must not ever block the main coroutine
2300 local $Coro::idle = sub { 2303 local $Coro::idle = sub {
… …
2303 Event::one_event; 2306 Event::one_event;
2304 })->prio (Coro::PRIO_MAX); 2307 })->prio (Coro::PRIO_MAX);
2305 }; 2308 };
2306 2309
2307 cfg_load; 2310 cfg_load;
2308 db_load; 2311 db_init;
2309 load_extensions; 2312 load_extensions;
2310 2313
2311 $TICK_WATCHER->start; 2314 $TICK_WATCHER->start;
2312 Event::loop; 2315 Event::loop;
2313} 2316}
… …
2352 my $map = $cf::MAP{$path} or next; 2355 my $map = $cf::MAP{$path} or next;
2353 $map->valid or next; 2356 $map->valid or next;
2354 $map->save; 2357 $map->save;
2355 } 2358 }
2356 warn "end emergency map save\n"; 2359 warn "end emergency map save\n";
2360
2361 warn "begin emergency database checkpoint\n";
2362 BDB::db_env_txn_checkpoint $DB_ENV;
2363 warn "end emergency database checkpoint\n";
2357 }; 2364 };
2358 2365
2359 warn "leave emergency perl save\n"; 2366 warn "leave emergency perl save\n";
2367}
2368
2369sub post_cleanup {
2370 my ($make_core) = @_;
2371
2372 warn Carp::longmess "post_cleanup backtrace"
2373 if $make_core;
2360} 2374}
2361 2375
2362sub reload() { 2376sub reload() {
2363 # can/must only be called in main 2377 # can/must only be called in main
2364 if ($Coro::current != $Coro::main) { 2378 if ($Coro::current != $Coro::main) {
… …
2366 return; 2380 return;
2367 } 2381 }
2368 2382
2369 warn "reloading..."; 2383 warn "reloading...";
2370 2384
2371 warn "cancelling server ticker"; 2385 warn "entering sync_job";
2372 $TICK_WATCHER->cancel;
2373 2386
2387 cf::sync_job {
2388 cf::write_runtime; # external watchdog should not bark
2374 cf::emergency_save; 2389 cf::emergency_save;
2390 cf::write_runtime; # external watchdog should not bark
2375 2391
2376 eval { 2392 warn "syncing database to disk";
2393 BDB::db_env_txn_checkpoint $DB_ENV;
2394
2377 # if anything goes wrong in here, we should simply crash as we already saved 2395 # if anything goes wrong in here, we should simply crash as we already saved
2378
2379 warn "syncing database to disk";
2380 cf::db_sync;
2381 2396
2382 warn "cancelling all WF_AUTOCANCEL watchers"; 2397 warn "cancelling all WF_AUTOCANCEL watchers";
2383 for (Event::all_watchers) { 2398 for (Event::all_watchers) {
2384 $_->cancel if $_->data & WF_AUTOCANCEL; 2399 $_->cancel if $_->data & WF_AUTOCANCEL;
2385 } 2400 }
2386 2401
2387 warn "flushing outstanding aio requests"; 2402 warn "flushing outstanding aio requests";
2388 for (;;) { 2403 for (;;) {
2404 BDB::flush;
2389 IO::AIO::flush; 2405 IO::AIO::flush;
2390 Coro::cede; 2406 Coro::cede;
2391 last unless IO::AIO::nreqs; 2407 last unless IO::AIO::nreqs || BDB::nreqs;
2392 warn "iterate..."; 2408 warn "iterate...";
2393 } 2409 }
2394 2410
2395 warn "cancelling all extension coros"; 2411 warn "cancelling all extension coros";
2396 $_->cancel for values %EXT_CORO; 2412 $_->cancel for values %EXT_CORO;
… …
2451 require cf; 2467 require cf;
2452 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2468 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2453 2469
2454 warn "loading config and database again"; 2470 warn "loading config and database again";
2455 cf::cfg_load; 2471 cf::cfg_load;
2456 cf::db_load;
2457 2472
2458 warn "loading extensions"; 2473 warn "loading extensions";
2459 cf::load_extensions; 2474 cf::load_extensions;
2460 2475
2461 warn "reattaching attachments to objects/players"; 2476 warn "reattaching attachments to objects/players";
2462 _global_reattach; 2477 _global_reattach;
2463 warn "reattaching attachments to maps"; 2478 warn "reattaching attachments to maps";
2464 reattach $_ for values %MAP; 2479 reattach $_ for values %MAP;
2465 2480
2466 warn "restarting server ticker"; 2481 warn "loading reloadable resources";
2482 init_resources;
2467 2483
2468 $TICK_WATCHER->start; 2484 warn "leaving sync_job";
2469 };
2470 2485
2471 if ($@) { 2486 1
2487 } or do {
2472 warn $@; 2488 warn $@;
2473 warn "error while reloading, exiting."; 2489 warn "error while reloading, exiting.";
2474 exit 1; 2490 exit 1;
2475 } 2491 };
2476 2492
2477 warn "reloaded"; 2493 warn "reloaded";
2478}; 2494};
2479 2495
2480our $RELOAD_WATCHER; # used only during reload 2496our $RELOAD_WATCHER; # used only during reload
… …
2521 2537
2522 cf::server_tick; # one server iteration 2538 cf::server_tick; # one server iteration
2523 $RUNTIME += $TICK; 2539 $RUNTIME += $TICK;
2524 $NEXT_TICK += $TICK; 2540 $NEXT_TICK += $TICK;
2525 2541
2542 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2543 $NEXT_RUNTIME_WRITE = $NOW + 10;
2544 Coro::async_pool {
2545 write_runtime
2546 or warn "ERROR: unable to write runtime file: $!";
2547 };
2548 }
2549
2526 $WAIT_FOR_TICK->broadcast; 2550 $WAIT_FOR_TICK->broadcast;
2527 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2551 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2528 2552
2529 Event::sweep;
2530 Coro::cede_notself;
2531
2532# my $AFTER = Event::time; 2553# my $AFTER = Event::time;
2533# warn $AFTER - $NOW;#d# 2554# warn $AFTER - $NOW;#d#
2534 2555
2535 # if we are delayed by four ticks or more, skip them all 2556 # if we are delayed by four ticks or more, skip them all
2536 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2557 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2538 $TICK_WATCHER->at ($NEXT_TICK); 2559 $TICK_WATCHER->at ($NEXT_TICK);
2539 $TICK_WATCHER->start; 2560 $TICK_WATCHER->start;
2540 }, 2561 },
2541); 2562);
2542 2563
2564{
2565 BDB::max_poll_time $TICK * 0.1;
2566 $BDB_POLL_WATCHER = Event->io (
2567 reentrant => 0,
2568 fd => BDB::poll_fileno,
2569 poll => 'r',
2570 prio => 0,
2571 data => WF_AUTOCANCEL,
2572 cb => \&BDB::poll_cb,
2573 );
2574 BDB::min_parallel 8;
2575
2576 BDB::set_sync_prepare {
2577 my $status;
2578 my $current = $Coro::current;
2579 (
2580 sub {
2581 $status = $!;
2582 $current->ready; undef $current;
2583 },
2584 sub {
2585 Coro::schedule while defined $current;
2586 $! = $status;
2587 },
2588 )
2589 };
2590
2591 unless ($DB_ENV) {
2592 $DB_ENV = BDB::db_env_create;
2593
2594 cf::sync_job {
2595 eval {
2596 BDB::db_env_open
2597 $DB_ENV,
2598 $BDB_ENV_DIR,
2599 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2600 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2601 0666;
2602
2603 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2604
2605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2606 $DB_ENV->set_lk_detect;
2607 };
2608
2609 cf::cleanup "db_env_open(db): $@" if $@;
2610 };
2611 }
2612}
2613
2614{
2615 IO::AIO::min_parallel 8;
2616
2617 undef $Coro::AIO::WATCHER;
2543IO::AIO::max_poll_time $TICK * 0.1; 2618 IO::AIO::max_poll_time $TICK * 0.1;
2544
2545undef $Coro::AIO::WATCHER;
2546$AIO_POLL_WATCHER = Event->io ( 2619 $AIO_POLL_WATCHER = Event->io (
2547 reentrant => 0, 2620 reentrant => 0,
2621 data => WF_AUTOCANCEL,
2548 fd => IO::AIO::poll_fileno, 2622 fd => IO::AIO::poll_fileno,
2549 poll => 'r', 2623 poll => 'r',
2550 prio => 6, 2624 prio => 6,
2551 data => WF_AUTOCANCEL,
2552 cb => \&IO::AIO::poll_cb, 2625 cb => \&IO::AIO::poll_cb,
2553); 2626 );
2554 2627}
2555$WRITE_RUNTIME_WATCHER = Event->timer (
2556 reentrant => 0,
2557 data => WF_AUTOCANCEL,
2558 after => 1,
2559 interval => 10,
2560 prio => 6, # keep it lowest so it acts like a watchdog
2561 cb => Coro::unblock_sub {
2562 write_runtime
2563 or warn "ERROR: unable to write runtime file: $!";
2564 },
2565);
2566 2628
2567END { cf::emergency_save } 2629END { cf::emergency_save }
2568 2630
25691 26311
2570 2632

Diff Legend

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