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.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";
… …
1019=cut 1030=cut
1020 1031
1021sub quit_character { 1032sub quit_character {
1022 my ($pl) = @_; 1033 my ($pl) = @_;
1023 1034
1035 my $name = $pl->ob->name;
1036
1024 $pl->{deny_save} = 1; 1037 $pl->{deny_save} = 1;
1025 $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
1026 1039
1027 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1040 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1028 $pl->deactivate; 1041 $pl->deactivate;
… …
1032 my $path = playerdir $pl; 1045 my $path = playerdir $pl;
1033 my $temp = "$path~$cf::RUNTIME~deleting~"; 1046 my $temp = "$path~$cf::RUNTIME~deleting~";
1034 aio_rename $path, $temp; 1047 aio_rename $path, $temp;
1035 delete $cf::PLAYER{$pl->ob->name}; 1048 delete $cf::PLAYER{$pl->ob->name};
1036 $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
1037 IO::AIO::aio_rmtree $temp; 1056 IO::AIO::aio_rmtree $temp;
1038} 1057}
1039 1058
1040=item cf::player::list_logins 1059=item cf::player::list_logins
1041 1060
… …
1070=cut 1089=cut
1071 1090
1072sub maps($) { 1091sub maps($) {
1073 my ($pl) = @_; 1092 my ($pl) = @_;
1074 1093
1094 $pl = ref $pl ? $pl->ob->name : $pl;
1095
1075 my $files = aio_readdir playerdir $pl 1096 my $files = aio_readdir playerdir $pl
1076 or return; 1097 or return;
1077 1098
1078 my @paths; 1099 my @paths;
1079 1100
1080 for (@$files) { 1101 for (@$files) {
1081 utf8::decode $_; 1102 utf8::decode $_;
1082 next if /\.(?:pl|pst)$/; 1103 next if /\.(?:pl|pst)$/;
1083 next unless /^$PATH_SEP/o; 1104 next unless /^$PATH_SEP/o;
1084 1105
1085 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_; 1106 push @paths, cf::map::normalise "~$pl/$_";
1086 } 1107 }
1087 1108
1088 \@paths 1109 \@paths
1089} 1110}
1090 1111
… …
1251 1272
1252# the original (read-only) location 1273# the original (read-only) location
1253sub load_path { 1274sub load_path {
1254 my ($self) = @_; 1275 my ($self) = @_;
1255 1276
1256 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1277 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1257} 1278}
1258 1279
1259# the temporary/swap location 1280# the temporary/swap location
1260sub save_path { 1281sub save_path {
1261 my ($self) = @_; 1282 my ($self) = @_;
1262 1283
1263 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1284 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1264 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1285 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1265} 1286}
1266 1287
1267# the unique path, undef == no special unique path 1288# the unique path, undef == no special unique path
1268sub uniq_path { 1289sub uniq_path {
1269 my ($self) = @_; 1290 my ($self) = @_;
… …
1291 1312
1292sub load_header_from($) { 1313sub load_header_from($) {
1293 my ($self, $path) = @_; 1314 my ($self, $path) = @_;
1294 1315
1295 utf8::encode $path; 1316 utf8::encode $path;
1296 aio_open $path, O_RDONLY, 0 1317 #aio_open $path, O_RDONLY, 0
1297 or return; 1318 # or return;
1298 1319
1299 $self->_load_header ($path) 1320 $self->_load_header ($path)
1300 or return; 1321 or return;
1301 1322
1302 $self->{load_path} = $path; 1323 $self->{load_path} = $path;
… …
1582 return if $self->players; 1603 return if $self->players;
1583 return if $self->isa ("ext::map_per_player");#d# 1604 return if $self->isa ("ext::map_per_player");#d#
1584 1605
1585 warn "resetting map ", $self->path;#d# 1606 warn "resetting map ", $self->path;#d#
1586 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
1587 delete $cf::MAP{$self->path}; 1618 delete $cf::MAP{$self->path};
1588 1619
1589 $self->in_memory (cf::MAP_SWAPPED);
1590 $self->clear; 1620 $self->clear;
1591 1621
1592 $_->clear_links_to ($self) for values %cf::MAP; 1622 $_->clear_links_to ($self) for values %cf::MAP;
1593 1623
1594 $self->unlink_save; 1624 $self->unlink_save;
… …
1784 $map->load; 1814 $map->load;
1785 $map->load_diag; 1815 $map->load_diag;
1786 1816
1787 return unless $self->contr->active; 1817 return unless $self->contr->active;
1788 $self->activate_recursive; 1818 $self->activate_recursive;
1819
1820 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1789 $self->enter_map ($map, $x, $y); 1821 $self->enter_map ($map, $x, $y);
1790} 1822}
1791 1823
1792cf::player->attach ( 1824cf::player->attach (
1793 on_logout => sub { 1825 on_logout => sub {
… …
1806 # try to abort aborted map switching on player login :) 1838 # try to abort aborted map switching on player login :)
1807 # should happen only on crashes 1839 # should happen only on crashes
1808 if ($pl->ob->{_link_pos}) { 1840 if ($pl->ob->{_link_pos}) {
1809 $pl->ob->enter_link; 1841 $pl->ob->enter_link;
1810 (async { 1842 (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, 1843 $pl->ob->reply (undef,
1814 "There was an internal problem at your last logout, " 1844 "There was an internal problem at your last logout, "
1815 . "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.",
1816 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
1817 Coro::Timer::sleep 1; 1849 Coro::Timer::sleep 1;
1818 $pl->ob->leave_link; 1850 $pl->ob->leave_link;
1819 })->prio (2); 1851 })->prio (2);
1820 } 1852 }
1821 }, 1853 },
… …
1987 # get handled first 2019 # get handled first
1988 my $queue = delete $ns->{query_queue} 2020 my $queue = delete $ns->{query_queue}
1989 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
1990 2022
1991 (shift @$queue)->[1]->($msg); 2023 (shift @$queue)->[1]->($msg);
2024 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1992 2025
1993 push @{ $ns->{query_queue} }, @$queue; 2026 push @{ $ns->{query_queue} }, @$queue;
1994 2027
1995 if (@{ $ns->{query_queue} } == @$queue) { 2028 if (@{ $ns->{query_queue} } == @$queue) {
1996 if (@$queue) { 2029 if (@$queue) {
… …
2157The 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
2158using it, it should be unique. 2191using it, it should be unique.
2159 2192
2160=over 4 2193=over 4
2161 2194
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 2195=item $value = cf::db_get $family => $key
2169 2196
2170Returns a single value from the database 2197Returns 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 2198
2177=item cf::db_put $family => $key => $value 2199=item cf::db_put $family => $key => $value
2178 2200
2179Stores the given C<$value> in the family hash. Updates are delayed, if you 2201Stores 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 2202
2190=cut 2203=cut
2191 2204
2192our $DB; 2205our $DB;
2193 2206
2194{ 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
2195 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;
2196 2226
2197 sub db_load() { 2227 cf::db_put (board => data => $pst->{board});
2198 $DB = stat $path ? Storable::retrieve $path : { }; 2228 cf::db_put (guildrules => data => $pst->{guildrules});
2199 } 2229 cf::db_put (rent => balance => $pst->{rent}{balance});
2230 BDB::db_env_txn_checkpoint $DB_ENV;
2200 2231
2201 my $pid; 2232 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 } 2233 };
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 }, 2234 }
2254 ); 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 { };
2255} 2252}
2256 2253
2257############################################################################# 2254#############################################################################
2258# 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}
2259 2261
2260sub cfg_load { 2262sub cfg_load {
2261 open my $fh, "<:utf8", cf::confdir . "/config" 2263 open my $fh, "<:utf8", cf::confdir . "/config"
2262 or return; 2264 or return;
2263 2265
… …
2274 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2276 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2275 and die "WARNING: m(un)lockall failed: $!\n"; 2277 and die "WARNING: m(un)lockall failed: $!\n";
2276 }; 2278 };
2277 warn $@ if $@; 2279 warn $@ if $@;
2278 } 2280 }
2281}
2282
2283sub init {
2284 init_resources;
2279} 2285}
2280 2286
2281sub main { 2287sub main {
2282 # we must not ever block the main coroutine 2288 # we must not ever block the main coroutine
2283 local $Coro::idle = sub { 2289 local $Coro::idle = sub {
… …
2286 Event::one_event; 2292 Event::one_event;
2287 })->prio (Coro::PRIO_MAX); 2293 })->prio (Coro::PRIO_MAX);
2288 }; 2294 };
2289 2295
2290 cfg_load; 2296 cfg_load;
2291 db_load; 2297 db_init;
2292 load_extensions; 2298 load_extensions;
2293 2299
2294 $TICK_WATCHER->start; 2300 $TICK_WATCHER->start;
2295 Event::loop; 2301 Event::loop;
2296} 2302}
… …
2335 my $map = $cf::MAP{$path} or next; 2341 my $map = $cf::MAP{$path} or next;
2336 $map->valid or next; 2342 $map->valid or next;
2337 $map->save; 2343 $map->save;
2338 } 2344 }
2339 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";
2340 }; 2350 };
2341 2351
2342 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;
2343} 2360}
2344 2361
2345sub reload() { 2362sub reload() {
2346 # can/must only be called in main 2363 # can/must only be called in main
2347 if ($Coro::current != $Coro::main) { 2364 if ($Coro::current != $Coro::main) {
… …
2349 return; 2366 return;
2350 } 2367 }
2351 2368
2352 warn "reloading..."; 2369 warn "reloading...";
2353 2370
2354 warn "cancelling server ticker"; 2371 warn "entering sync_job";
2355 $TICK_WATCHER->cancel;
2356 2372
2373 cf::sync_job {
2374 cf::write_runtime; # external watchdog should not bark
2357 cf::emergency_save; 2375 cf::emergency_save;
2376 cf::write_runtime; # external watchdog should not bark
2358 2377
2359 eval { 2378 warn "syncing database to disk";
2379 BDB::db_env_txn_checkpoint $DB_ENV;
2380
2360 # 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
2361
2362 warn "syncing database to disk";
2363 cf::db_sync;
2364 2382
2365 warn "cancelling all WF_AUTOCANCEL watchers"; 2383 warn "cancelling all WF_AUTOCANCEL watchers";
2366 for (Event::all_watchers) { 2384 for (Event::all_watchers) {
2367 $_->cancel if $_->data & WF_AUTOCANCEL; 2385 $_->cancel if $_->data & WF_AUTOCANCEL;
2368 } 2386 }
2369 2387
2370 warn "flushing outstanding aio requests"; 2388 warn "flushing outstanding aio requests";
2371 for (;;) { 2389 for (;;) {
2390 BDB::flush;
2372 IO::AIO::flush; 2391 IO::AIO::flush;
2373 Coro::cede; 2392 Coro::cede;
2374 last unless IO::AIO::nreqs; 2393 last unless IO::AIO::nreqs || BDB::nreqs;
2375 warn "iterate..."; 2394 warn "iterate...";
2376 } 2395 }
2377 2396
2378 warn "cancelling all extension coros"; 2397 warn "cancelling all extension coros";
2379 $_->cancel for values %EXT_CORO; 2398 $_->cancel for values %EXT_CORO;
… …
2434 require cf; 2453 require cf;
2435 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2454 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2436 2455
2437 warn "loading config and database again"; 2456 warn "loading config and database again";
2438 cf::cfg_load; 2457 cf::cfg_load;
2439 cf::db_load;
2440 2458
2441 warn "loading extensions"; 2459 warn "loading extensions";
2442 cf::load_extensions; 2460 cf::load_extensions;
2443 2461
2444 warn "reattaching attachments to objects/players"; 2462 warn "reattaching attachments to objects/players";
2445 _global_reattach; 2463 _global_reattach;
2446 warn "reattaching attachments to maps"; 2464 warn "reattaching attachments to maps";
2447 reattach $_ for values %MAP; 2465 reattach $_ for values %MAP;
2448 2466
2449 warn "restarting server ticker"; 2467 warn "loading reloadable resources";
2468 init_resources;
2450 2469
2451 $TICK_WATCHER->start; 2470 warn "leaving sync_job";
2452 };
2453 2471
2454 if ($@) { 2472 1
2473 } or do {
2455 warn $@; 2474 warn $@;
2456 warn "error while reloading, exiting."; 2475 warn "error while reloading, exiting.";
2457 exit 1; 2476 exit 1;
2458 } 2477 };
2459 2478
2460 warn "reloaded"; 2479 warn "reloaded";
2461}; 2480};
2462 2481
2463our $RELOAD_WATCHER; # used only during reload 2482our $RELOAD_WATCHER; # used only during reload
… …
2504 2523
2505 cf::server_tick; # one server iteration 2524 cf::server_tick; # one server iteration
2506 $RUNTIME += $TICK; 2525 $RUNTIME += $TICK;
2507 $NEXT_TICK += $TICK; 2526 $NEXT_TICK += $TICK;
2508 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
2509 $WAIT_FOR_TICK->broadcast; 2536 $WAIT_FOR_TICK->broadcast;
2510 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2537 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2511 2538
2512 Event::sweep;
2513 Coro::cede_notself;
2514
2515# my $AFTER = Event::time; 2539# my $AFTER = Event::time;
2516# warn $AFTER - $NOW;#d# 2540# warn $AFTER - $NOW;#d#
2517 2541
2518 # 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
2519 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2543 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2521 $TICK_WATCHER->at ($NEXT_TICK); 2545 $TICK_WATCHER->at ($NEXT_TICK);
2522 $TICK_WATCHER->start; 2546 $TICK_WATCHER->start;
2523 }, 2547 },
2524); 2548);
2525 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;
2526IO::AIO::max_poll_time $TICK * 0.1; 2604 IO::AIO::max_poll_time $TICK * 0.1;
2527
2528undef $Coro::AIO::WATCHER;
2529$AIO_POLL_WATCHER = Event->io ( 2605 $AIO_POLL_WATCHER = Event->io (
2530 reentrant => 0, 2606 reentrant => 0,
2607 data => WF_AUTOCANCEL,
2531 fd => IO::AIO::poll_fileno, 2608 fd => IO::AIO::poll_fileno,
2532 poll => 'r', 2609 poll => 'r',
2533 prio => 6, 2610 prio => 6,
2534 data => WF_AUTOCANCEL,
2535 cb => \&IO::AIO::poll_cb, 2611 cb => \&IO::AIO::poll_cb,
2536); 2612 );
2537 2613}
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 2614
2550END { cf::emergency_save } 2615END { cf::emergency_save }
2551 2616
25521 26171
2553 2618

Diff Legend

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