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.200 by root, Mon Jan 29 17:57:22 2007 UTC vs.
Revision 1.220 by root, Sat Feb 17 23:54:35 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;
1047} 1057}
1048 1058
1049=item cf::player::list_logins 1059=item cf::player::list_logins
1050 1060
… …
1079=cut 1089=cut
1080 1090
1081sub maps($) { 1091sub maps($) {
1082 my ($pl) = @_; 1092 my ($pl) = @_;
1083 1093
1094 $pl = ref $pl ? $pl->ob->name : $pl;
1095
1084 my $files = aio_readdir playerdir $pl 1096 my $files = aio_readdir playerdir $pl
1085 or return; 1097 or return;
1086 1098
1087 my @paths; 1099 my @paths;
1088 1100
1089 for (@$files) { 1101 for (@$files) {
1090 utf8::decode $_; 1102 utf8::decode $_;
1091 next if /\.(?:pl|pst)$/; 1103 next if /\.(?:pl|pst)$/;
1092 next unless /^$PATH_SEP/o; 1104 next unless /^$PATH_SEP/o;
1093 1105
1094 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_; 1106 push @paths, cf::map::normalise "~$pl/$_";
1095 } 1107 }
1096 1108
1097 \@paths 1109 \@paths
1098} 1110}
1099 1111
… …
1294 my ($self) = @_; 1306 my ($self) = @_;
1295 1307
1296 utf8::encode (my $save = $self->save_path); 1308 utf8::encode (my $save = $self->save_path);
1297 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1298 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1299
1300 #d#TODO remove .map and also nuke
1301 $save =~ s/\.map// or return;#d#
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1303 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1304} 1311}
1305 1312
1306sub load_header_from($) { 1313sub load_header_from($) {
1307 my ($self, $path) = @_; 1314 my ($self, $path) = @_;
1308 1315
… …
1596 return if $self->players; 1603 return if $self->players;
1597 return if $self->isa ("ext::map_per_player");#d# 1604 return if $self->isa ("ext::map_per_player");#d#
1598 1605
1599 warn "resetting map ", $self->path;#d# 1606 warn "resetting map ", $self->path;#d#
1600 1607
1608 $self->in_memory (cf::MAP_SWAPPED);
1609
1610 # need to save uniques path
1611 unless ($self->{deny_save}) {
1612 my $uniq = $self->uniq_path; utf8::encode $uniq;
1613
1614 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1615 if $uniq;
1616 }
1617
1601 delete $cf::MAP{$self->path}; 1618 delete $cf::MAP{$self->path};
1602 1619
1603 $self->in_memory (cf::MAP_SWAPPED);
1604 $self->clear; 1620 $self->clear;
1605 1621
1606 $_->clear_links_to ($self) for values %cf::MAP; 1622 $_->clear_links_to ($self) for values %cf::MAP;
1607 1623
1608 $self->unlink_save; 1624 $self->unlink_save;
… …
1798 $map->load; 1814 $map->load;
1799 $map->load_diag; 1815 $map->load_diag;
1800 1816
1801 return unless $self->contr->active; 1817 return unless $self->contr->active;
1802 $self->activate_recursive; 1818 $self->activate_recursive;
1819
1820 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1803 $self->enter_map ($map, $x, $y); 1821 $self->enter_map ($map, $x, $y);
1804} 1822}
1805 1823
1806cf::player->attach ( 1824cf::player->attach (
1807 on_logout => sub { 1825 on_logout => sub {
… …
1820 # try to abort aborted map switching on player login :) 1838 # try to abort aborted map switching on player login :)
1821 # should happen only on crashes 1839 # should happen only on crashes
1822 if ($pl->ob->{_link_pos}) { 1840 if ($pl->ob->{_link_pos}) {
1823 $pl->ob->enter_link; 1841 $pl->ob->enter_link;
1824 (async { 1842 (async {
1825 # we need this sleep as the login has a concurrent enter_exit running
1826 # and this sleep increases chances of the player not ending up in scorn
1827 $pl->ob->reply (undef, 1843 $pl->ob->reply (undef,
1828 "There was an internal problem at your last logout, " 1844 "There was an internal problem at your last logout, "
1829 . "the server will try to bring you to your intended destination in a second.", 1845 . "the server will try to bring you to your intended destination in a second.",
1830 cf::NDI_RED); 1846 cf::NDI_RED);
1847 # we need this sleep as the login has a concurrent enter_exit running
1848 # and this sleep increases chances of the player not ending up in scorn
1831 Coro::Timer::sleep 1; 1849 Coro::Timer::sleep 1;
1832 $pl->ob->leave_link; 1850 $pl->ob->leave_link;
1833 })->prio (2); 1851 })->prio (2);
1834 } 1852 }
1835 }, 1853 },
… …
2001 # get handled first 2019 # get handled first
2002 my $queue = delete $ns->{query_queue} 2020 my $queue = delete $ns->{query_queue}
2003 or return; # be conservative, not sure how that can happen, but we saw a crash here 2021 or return; # be conservative, not sure how that can happen, but we saw a crash here
2004 2022
2005 (shift @$queue)->[1]->($msg); 2023 (shift @$queue)->[1]->($msg);
2024 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
2006 2025
2007 push @{ $ns->{query_queue} }, @$queue; 2026 push @{ $ns->{query_queue} }, @$queue;
2008 2027
2009 if (@{ $ns->{query_queue} } == @$queue) { 2028 if (@{ $ns->{query_queue} } == @$queue) {
2010 if (@$queue) { 2029 if (@$queue) {
… …
2171The parameter C<$family> should best start with the name of the extension 2190The parameter C<$family> should best start with the name of the extension
2172using it, it should be unique. 2191using it, it should be unique.
2173 2192
2174=over 4 2193=over 4
2175 2194
2176=item $hashref = cf::db_get $family
2177
2178Return a hashref for use by the extension C<$family>, which can be
2179modified. After modifications, you have to call C<cf::db_dirty> or
2180C<cf::db_sync>.
2181
2182=item $value = cf::db_get $family => $key 2195=item $value = cf::db_get $family => $key
2183 2196
2184Returns a single value from the database 2197Returns a single value from the database.
2185
2186=item cf::db_put $family => $hashref
2187
2188Stores the given family hashref into the database. Updates are delayed, if
2189you want the data to be synced to disk immediately, use C<cf::db_sync>.
2190 2198
2191=item cf::db_put $family => $key => $value 2199=item cf::db_put $family => $key => $value
2192 2200
2193Stores the given C<$value> in the family hash. Updates are delayed, if you 2201Stores the given C<$value> in the family.
2194want the data to be synced to disk immediately, use C<cf::db_sync>.
2195
2196=item cf::db_dirty
2197
2198Marks the database as dirty, to be updated at a later time.
2199
2200=item cf::db_sync
2201
2202Immediately write the database to disk I<if it is dirty>.
2203 2202
2204=cut 2203=cut
2205 2204
2206our $DB; 2205our $DB;
2207 2206
2208{ 2207sub db_init {
2208 unless ($DB) {
2209 $DB = BDB::db_create $DB_ENV;
2210
2211 cf::sync_job {
2212 eval {
2213 $DB->set_flags (BDB::CHKSUM);
2214
2215 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2216 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2217 cf::cleanup "db_open(db): $!" if $!;
2218 };
2219 cf::cleanup "db_open(db): $@" if $@;
2220 };
2221
2209 my $path = cf::localdir . "/database.pst"; 2222 my $path = cf::localdir . "/database.pst";
2223 if (stat $path) {
2224 cf::sync_job {
2225 my $pst = Storable::retrieve $path;
2210 2226
2211 sub db_load() { 2227 cf::db_put (board => data => $pst->{board});
2212 $DB = stat $path ? Storable::retrieve $path : { }; 2228 cf::db_put (guildrules => data => $pst->{guildrules});
2213 } 2229 cf::db_put (rent => balance => $pst->{rent}{balance});
2230 BDB::db_env_txn_checkpoint $DB_ENV;
2214 2231
2215 my $pid; 2232 unlink $path;
2216
2217 sub db_save() {
2218 waitpid $pid, 0 if $pid;
2219 if (0 == ($pid = fork)) {
2220 $DB->{_meta}{version} = 1;
2221 Storable::nstore $DB, "$path~";
2222 rename "$path~", $path;
2223 cf::_exit 0 if defined $pid;
2224 } 2233 };
2225 }
2226
2227 my $dirty;
2228
2229 sub db_sync() {
2230 db_save if $dirty;
2231 undef $dirty;
2232 }
2233
2234 my $idle = Event->idle (
2235 reentrant => 0,
2236 min => 10,
2237 max => 20,
2238 repeat => 0,
2239 data => WF_AUTOCANCEL,
2240 cb => \&db_sync,
2241 );
2242
2243 sub db_dirty() {
2244 $dirty = 1;
2245 $idle->start;
2246 }
2247
2248 sub db_get($;$) {
2249 @_ >= 2
2250 ? $DB->{$_[0]}{$_[1]}
2251 : ($DB->{$_[0]} ||= { })
2252 }
2253
2254 sub db_put($$;$) {
2255 if (@_ >= 3) {
2256 $DB->{$_[0]}{$_[1]} = $_[2];
2257 } else {
2258 $DB->{$_[0]} = $_[1];
2259 }
2260 db_dirty;
2261 }
2262
2263 cf::global->attach (
2264 prio => 10000,
2265 on_cleanup => sub {
2266 db_sync;
2267 }, 2234 }
2268 ); 2235 }
2236}
2237
2238sub db_get($$) {
2239 my $key = "$_[0]/$_[1]";
2240
2241 cf::sync_job {
2242 BDB::db_get $DB, undef, $key, my $data;
2243
2244 $! ? ()
2245 : Compress::LZF::sthaw $data
2246 }
2247}
2248
2249sub db_put($$$) {
2250 BDB::dbreq_pri 4;
2251 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2269} 2252}
2270 2253
2271############################################################################# 2254#############################################################################
2272# the server's main() 2255# the server's init and main functions
2256
2257sub init_resources {
2258 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2259 or die "unable to load regions file\n";#d#
2260}
2273 2261
2274sub cfg_load { 2262sub cfg_load {
2275 open my $fh, "<:utf8", cf::confdir . "/config" 2263 open my $fh, "<:utf8", cf::confdir . "/config"
2276 or return; 2264 or return;
2277 2265
… …
2288 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2276 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2289 and die "WARNING: m(un)lockall failed: $!\n"; 2277 and die "WARNING: m(un)lockall failed: $!\n";
2290 }; 2278 };
2291 warn $@ if $@; 2279 warn $@ if $@;
2292 } 2280 }
2281}
2282
2283sub init {
2284 init_resources;
2293} 2285}
2294 2286
2295sub main { 2287sub main {
2296 # we must not ever block the main coroutine 2288 # we must not ever block the main coroutine
2297 local $Coro::idle = sub { 2289 local $Coro::idle = sub {
… …
2300 Event::one_event; 2292 Event::one_event;
2301 })->prio (Coro::PRIO_MAX); 2293 })->prio (Coro::PRIO_MAX);
2302 }; 2294 };
2303 2295
2304 cfg_load; 2296 cfg_load;
2305 db_load; 2297 db_init;
2306 load_extensions; 2298 load_extensions;
2307 2299
2308 $TICK_WATCHER->start; 2300 $TICK_WATCHER->start;
2309 Event::loop; 2301 Event::loop;
2310} 2302}
… …
2349 my $map = $cf::MAP{$path} or next; 2341 my $map = $cf::MAP{$path} or next;
2350 $map->valid or next; 2342 $map->valid or next;
2351 $map->save; 2343 $map->save;
2352 } 2344 }
2353 warn "end emergency map save\n"; 2345 warn "end emergency map save\n";
2346
2347 warn "begin emergency database checkpoint\n";
2348 BDB::db_env_txn_checkpoint $DB_ENV;
2349 warn "end emergency database checkpoint\n";
2354 }; 2350 };
2355 2351
2356 warn "leave emergency perl save\n"; 2352 warn "leave emergency perl save\n";
2353}
2354
2355sub post_cleanup {
2356 my ($make_core) = @_;
2357
2358 warn Carp::longmess "post_cleanup backtrace"
2359 if $make_core;
2357} 2360}
2358 2361
2359sub reload() { 2362sub reload() {
2360 # can/must only be called in main 2363 # can/must only be called in main
2361 if ($Coro::current != $Coro::main) { 2364 if ($Coro::current != $Coro::main) {
… …
2363 return; 2366 return;
2364 } 2367 }
2365 2368
2366 warn "reloading..."; 2369 warn "reloading...";
2367 2370
2368 warn "cancelling server ticker"; 2371 warn "entering sync_job";
2369 $TICK_WATCHER->cancel;
2370 2372
2373 cf::sync_job {
2374 cf::write_runtime; # external watchdog should not bark
2371 cf::emergency_save; 2375 cf::emergency_save;
2376 cf::write_runtime; # external watchdog should not bark
2372 2377
2373 eval { 2378 warn "syncing database to disk";
2379 BDB::db_env_txn_checkpoint $DB_ENV;
2380
2374 # if anything goes wrong in here, we should simply crash as we already saved 2381 # if anything goes wrong in here, we should simply crash as we already saved
2375
2376 warn "syncing database to disk";
2377 cf::db_sync;
2378 2382
2379 warn "cancelling all WF_AUTOCANCEL watchers"; 2383 warn "cancelling all WF_AUTOCANCEL watchers";
2380 for (Event::all_watchers) { 2384 for (Event::all_watchers) {
2381 $_->cancel if $_->data & WF_AUTOCANCEL; 2385 $_->cancel if $_->data & WF_AUTOCANCEL;
2382 } 2386 }
2383 2387
2384 warn "flushing outstanding aio requests"; 2388 warn "flushing outstanding aio requests";
2385 for (;;) { 2389 for (;;) {
2390 BDB::flush;
2386 IO::AIO::flush; 2391 IO::AIO::flush;
2387 Coro::cede; 2392 Coro::cede;
2388 last unless IO::AIO::nreqs; 2393 last unless IO::AIO::nreqs || BDB::nreqs;
2389 warn "iterate..."; 2394 warn "iterate...";
2390 } 2395 }
2391 2396
2392 warn "cancelling all extension coros"; 2397 warn "cancelling all extension coros";
2393 $_->cancel for values %EXT_CORO; 2398 $_->cancel for values %EXT_CORO;
… …
2448 require cf; 2453 require cf;
2449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2454 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2450 2455
2451 warn "loading config and database again"; 2456 warn "loading config and database again";
2452 cf::cfg_load; 2457 cf::cfg_load;
2453 cf::db_load;
2454 2458
2455 warn "loading extensions"; 2459 warn "loading extensions";
2456 cf::load_extensions; 2460 cf::load_extensions;
2457 2461
2458 warn "reattaching attachments to objects/players"; 2462 warn "reattaching attachments to objects/players";
2459 _global_reattach; 2463 _global_reattach;
2460 warn "reattaching attachments to maps"; 2464 warn "reattaching attachments to maps";
2461 reattach $_ for values %MAP; 2465 reattach $_ for values %MAP;
2462 2466
2463 warn "restarting server ticker"; 2467 warn "loading reloadable resources";
2468 init_resources;
2464 2469
2465 $TICK_WATCHER->start; 2470 warn "leaving sync_job";
2466 };
2467 2471
2468 if ($@) { 2472 1
2473 } or do {
2469 warn $@; 2474 warn $@;
2470 warn "error while reloading, exiting."; 2475 warn "error while reloading, exiting.";
2471 exit 1; 2476 exit 1;
2472 } 2477 };
2473 2478
2474 warn "reloaded"; 2479 warn "reloaded";
2475}; 2480};
2476 2481
2477our $RELOAD_WATCHER; # used only during reload 2482our $RELOAD_WATCHER; # used only during reload
… …
2518 2523
2519 cf::server_tick; # one server iteration 2524 cf::server_tick; # one server iteration
2520 $RUNTIME += $TICK; 2525 $RUNTIME += $TICK;
2521 $NEXT_TICK += $TICK; 2526 $NEXT_TICK += $TICK;
2522 2527
2528 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2529 $NEXT_RUNTIME_WRITE = $NOW + 10;
2530 Coro::async_pool {
2531 write_runtime
2532 or warn "ERROR: unable to write runtime file: $!";
2533 };
2534 }
2535
2523 $WAIT_FOR_TICK->broadcast; 2536 $WAIT_FOR_TICK->broadcast;
2524 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2537 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2525 2538
2526 Event::sweep;
2527 Coro::cede_notself;
2528
2529# my $AFTER = Event::time; 2539# my $AFTER = Event::time;
2530# warn $AFTER - $NOW;#d# 2540# warn $AFTER - $NOW;#d#
2531 2541
2532 # if we are delayed by four ticks or more, skip them all 2542 # if we are delayed by four ticks or more, skip them all
2533 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2543 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2535 $TICK_WATCHER->at ($NEXT_TICK); 2545 $TICK_WATCHER->at ($NEXT_TICK);
2536 $TICK_WATCHER->start; 2546 $TICK_WATCHER->start;
2537 }, 2547 },
2538); 2548);
2539 2549
2550{
2551 BDB::max_poll_time $TICK * 0.1;
2552 $BDB_POLL_WATCHER = Event->io (
2553 reentrant => 0,
2554 fd => BDB::poll_fileno,
2555 poll => 'r',
2556 prio => 0,
2557 data => WF_AUTOCANCEL,
2558 cb => \&BDB::poll_cb,
2559 );
2560 BDB::min_parallel 8;
2561
2562 BDB::set_sync_prepare {
2563 my $status;
2564 my $current = $Coro::current;
2565 (
2566 sub {
2567 $status = $!;
2568 $current->ready; undef $current;
2569 },
2570 sub {
2571 Coro::schedule while defined $current;
2572 $! = $status;
2573 },
2574 )
2575 };
2576
2577 unless ($DB_ENV) {
2578 $DB_ENV = BDB::db_env_create;
2579
2580 cf::sync_job {
2581 eval {
2582 BDB::db_env_open
2583 $DB_ENV,
2584 $BDB_ENV_DIR,
2585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2587 0666;
2588
2589 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2590
2591 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2592 $DB_ENV->set_lk_detect;
2593 };
2594
2595 cf::cleanup "db_env_open(db): $@" if $@;
2596 };
2597 }
2598}
2599
2600{
2601 IO::AIO::min_parallel 8;
2602
2603 undef $Coro::AIO::WATCHER;
2540IO::AIO::max_poll_time $TICK * 0.1; 2604 IO::AIO::max_poll_time $TICK * 0.1;
2541
2542undef $Coro::AIO::WATCHER;
2543$AIO_POLL_WATCHER = Event->io ( 2605 $AIO_POLL_WATCHER = Event->io (
2544 reentrant => 0, 2606 reentrant => 0,
2607 data => WF_AUTOCANCEL,
2545 fd => IO::AIO::poll_fileno, 2608 fd => IO::AIO::poll_fileno,
2546 poll => 'r', 2609 poll => 'r',
2547 prio => 6, 2610 prio => 6,
2548 data => WF_AUTOCANCEL,
2549 cb => \&IO::AIO::poll_cb, 2611 cb => \&IO::AIO::poll_cb,
2550); 2612 );
2551 2613}
2552$WRITE_RUNTIME_WATCHER = Event->timer (
2553 reentrant => 0,
2554 data => WF_AUTOCANCEL,
2555 after => 1,
2556 interval => 10,
2557 prio => 6, # keep it lowest so it acts like a watchdog
2558 cb => Coro::unblock_sub {
2559 write_runtime
2560 or warn "ERROR: unable to write runtime file: $!";
2561 },
2562);
2563 2614
2564END { cf::emergency_save } 2615END { cf::emergency_save }
2565 2616
25661 26171
2567 2618

Diff Legend

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