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.207 by root, Sun Feb 11 22:42:09 2007 UTC vs.
Revision 1.226 by root, Wed Mar 14 04:12:29 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.5 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
… …
22use Digest::MD5; 24use Digest::MD5;
23use Fcntl; 25use Fcntl;
24use IO::AIO 2.32 (); 26use IO::AIO 2.32 ();
25use YAML::Syck (); 27use YAML::Syck ();
26use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
27 30
31Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
32Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
28use Event; $Event::Eval = 1; # no idea why this is required, but it is 33$Event::Eval = 1; # no idea why this is required, but it is
29 34
30sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 35sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
31 36
32# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 37# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
33$YAML::Syck::ImplicitUnicode = 1; 38$YAML::Syck::ImplicitUnicode = 1;
… …
40our @EXTS = (); # list of extension package names 45our @EXTS = (); # list of extension package names
41our %EXTCMD = (); 46our %EXTCMD = ();
42our %EXT_CORO = (); # coroutines bound to extensions 47our %EXT_CORO = (); # coroutines bound to extensions
43our %EXT_MAP = (); # pluggable maps 48our %EXT_MAP = (); # pluggable maps
44 49
50our $RELOAD; # number of reloads so far
45our @EVENT; 51our @EVENT;
46our $LIBDIR = datadir . "/ext"; 52our $LIBDIR = datadir . "/ext";
47 53
48our $TICK = MAX_TIME * 1e-6; 54our $TICK = MAX_TIME * 1e-6;
49our $TICK_WATCHER; 55our $TICK_WATCHER;
50our $AIO_POLL_WATCHER; 56our $AIO_POLL_WATCHER;
51our $WRITE_RUNTIME_WATCHER; 57our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
52our $NEXT_TICK; 58our $NEXT_TICK;
53our $NOW; 59our $NOW;
54our $USE_FSYNC = 1; # use fsync to write maps - default off 60our $USE_FSYNC = 1; # use fsync to write maps - default off
55 61
56our $BDB_POLL_WATCHER; 62our $BDB_POLL_WATCHER;
… …
270sub freeze_mainloop { 276sub freeze_mainloop {
271 return unless $TICK_WATCHER->is_active; 277 return unless $TICK_WATCHER->is_active;
272 278
273 my $guard = Coro::guard { 279 my $guard = Coro::guard {
274 $TICK_WATCHER->start; 280 $TICK_WATCHER->start;
275 $WRITE_RUNTIME_WATCHER->start;
276 }; 281 };
277 $WRITE_RUNTIME_WATCHER->stop;
278 $TICK_WATCHER->stop; 282 $TICK_WATCHER->stop;
279 $guard 283 $guard
280} 284}
281 285
282=item cf::async { BLOCK } 286=item cf::async { BLOCK }
… …
353 357
354 $coro 358 $coro
355} 359}
356 360
357sub write_runtime { 361sub write_runtime {
362 my $guard = cf::lock_acquire "write_runtime";
363
358 my $runtime = cf::localdir . "/runtime"; 364 my $runtime = cf::localdir . "/runtime";
359 365
360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 366 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
361 or return; 367 or return;
362 368
… …
784 } 790 }
785 } else { 791 } else {
786 aio_unlink $filename; 792 aio_unlink $filename;
787 aio_unlink "$filename.pst"; 793 aio_unlink "$filename.pst";
788 } 794 }
789
790 #d##TODO# nuke non .map-files if exist
791 if ($filename =~ s/\.map$//) {
792 aio_unlink $filename;
793 aio_unlink "$filename.pst";
794 }
795 } 795 }
796} 796}
797 797
798sub object_freezer_as_string { 798sub object_freezer_as_string {
799 my ($rdata, $objs) = @_; 799 my ($rdata, $objs) = @_;
… …
805 805
806sub object_thawer_load { 806sub object_thawer_load {
807 my ($filename) = @_; 807 my ($filename) = @_;
808 808
809 my ($data, $av); 809 my ($data, $av);
810
811 #d#TODO remove .map if file does not exist
812 aio_stat $filename and $filename =~ s/\.map$//;
813 810
814 (aio_load $filename, $data) >= 0 811 (aio_load $filename, $data) >= 0
815 or return; 812 or return;
816 813
817 unless (aio_stat "$filename.pst") { 814 unless (aio_stat "$filename.pst") {
… …
1036=cut 1033=cut
1037 1034
1038sub quit_character { 1035sub quit_character {
1039 my ($pl) = @_; 1036 my ($pl) = @_;
1040 1037
1038 my $name = $pl->ob->name;
1039
1041 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1042 $pl->password ("*"); # this should lock out the player until we nuked the dir 1041 $pl->password ("*"); # this should lock out the player until we nuked the dir
1043 1042
1044 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1045 $pl->deactivate; 1044 $pl->deactivate;
… …
1049 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1050 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1051 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1052 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1053 $pl->destroy; 1052 $pl->destroy;
1053
1054 my $prefix = qr<^~\Q$name\E/>;
1055
1056 # nuke player maps
1057 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1058
1054 IO::AIO::aio_rmtree $temp; 1059 IO::AIO::aio_rmtree $temp;
1060}
1061
1062=item $pl->kick
1063
1064Kicks a player out of the game. This destroys the connection.
1065
1066=cut
1067
1068sub kick {
1069 my ($pl, $kicker) = @_;
1070
1071 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1072 $pl->killer ("kicked");
1073 $pl->ns->destroy;
1055} 1074}
1056 1075
1057=item cf::player::list_logins 1076=item cf::player::list_logins
1058 1077
1059Returns am arrayref of all valid playernames in the system, can take a 1078Returns am arrayref of all valid playernames in the system, can take a
… …
1304 my ($self) = @_; 1323 my ($self) = @_;
1305 1324
1306 utf8::encode (my $save = $self->save_path); 1325 utf8::encode (my $save = $self->save_path);
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1326 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1327 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1309
1310 #d#TODO remove .map and also nuke
1311 $save =~ s/\.map// or return;#d#
1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1314} 1328}
1315 1329
1316sub load_header_from($) { 1330sub load_header_from($) {
1317 my ($self, $path) = @_; 1331 my ($self, $path) = @_;
1318 1332
… …
1606 return if $self->players; 1620 return if $self->players;
1607 return if $self->isa ("ext::map_per_player");#d# 1621 return if $self->isa ("ext::map_per_player");#d#
1608 1622
1609 warn "resetting map ", $self->path;#d# 1623 warn "resetting map ", $self->path;#d#
1610 1624
1625 $self->in_memory (cf::MAP_SWAPPED);
1626
1627 # need to save uniques path
1628 unless ($self->{deny_save}) {
1629 my $uniq = $self->uniq_path; utf8::encode $uniq;
1630
1631 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1632 if $uniq;
1633 }
1634
1611 delete $cf::MAP{$self->path}; 1635 delete $cf::MAP{$self->path};
1612 1636
1613 $self->in_memory (cf::MAP_SWAPPED);
1614 $self->clear; 1637 $self->clear;
1615 1638
1616 $_->clear_links_to ($self) for values %cf::MAP; 1639 $_->clear_links_to ($self) for values %cf::MAP;
1617 1640
1618 $self->unlink_save; 1641 $self->unlink_save;
… …
1808 $map->load; 1831 $map->load;
1809 $map->load_diag; 1832 $map->load_diag;
1810 1833
1811 return unless $self->contr->active; 1834 return unless $self->contr->active;
1812 $self->activate_recursive; 1835 $self->activate_recursive;
1836
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1813 $self->enter_map ($map, $x, $y); 1838 $self->enter_map ($map, $x, $y);
1814} 1839}
1815 1840
1816cf::player->attach ( 1841cf::player->attach (
1817 on_logout => sub { 1842 on_logout => sub {
… …
1830 # try to abort aborted map switching on player login :) 1855 # try to abort aborted map switching on player login :)
1831 # should happen only on crashes 1856 # should happen only on crashes
1832 if ($pl->ob->{_link_pos}) { 1857 if ($pl->ob->{_link_pos}) {
1833 $pl->ob->enter_link; 1858 $pl->ob->enter_link;
1834 (async { 1859 (async {
1835 # we need this sleep as the login has a concurrent enter_exit running
1836 # and this sleep increases chances of the player not ending up in scorn
1837 $pl->ob->reply (undef, 1860 $pl->ob->reply (undef,
1838 "There was an internal problem at your last logout, " 1861 "There was an internal problem at your last logout, "
1839 . "the server will try to bring you to your intended destination in a second.", 1862 . "the server will try to bring you to your intended destination in a second.",
1840 cf::NDI_RED); 1863 cf::NDI_RED);
1864 # we need this sleep as the login has a concurrent enter_exit running
1865 # and this sleep increases chances of the player not ending up in scorn
1841 Coro::Timer::sleep 1; 1866 Coro::Timer::sleep 1;
1842 $pl->ob->leave_link; 1867 $pl->ob->leave_link;
1843 })->prio (2); 1868 })->prio (2);
1844 } 1869 }
1845 }, 1870 },
… …
1970 1995
1971sub cf::client::send_drawinfo { 1996sub cf::client::send_drawinfo {
1972 my ($self, $text, $flags) = @_; 1997 my ($self, $text, $flags) = @_;
1973 1998
1974 utf8::encode $text; 1999 utf8::encode $text;
1975 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1976} 2001}
1977 2002
1978 2003
1979=item $success = $client->query ($flags, "text", \&cb) 2004=item $success = $client->query ($flags, "text", \&cb)
1980 2005
… …
2182The parameter C<$family> should best start with the name of the extension 2207The parameter C<$family> should best start with the name of the extension
2183using it, it should be unique. 2208using it, it should be unique.
2184 2209
2185=over 4 2210=over 4
2186 2211
2187=item $hashref = cf::db_get $family
2188
2189Return a hashref for use by the extension C<$family>, which can be
2190modified. After modifications, you have to call C<cf::db_dirty> or
2191C<cf::db_sync>.
2192
2193=item $value = cf::db_get $family => $key 2212=item $value = cf::db_get $family => $key
2194 2213
2195Returns a single value from the database 2214Returns a single value from the database.
2196
2197=item cf::db_put $family => $hashref
2198
2199Stores the given family hashref into the database. Updates are delayed, if
2200you want the data to be synced to disk immediately, use C<cf::db_sync>.
2201 2215
2202=item cf::db_put $family => $key => $value 2216=item cf::db_put $family => $key => $value
2203 2217
2204Stores the given C<$value> in the family hash. Updates are delayed, if you 2218Stores the given C<$value> in the family.
2205want the data to be synced to disk immediately, use C<cf::db_sync>.
2206
2207=item cf::db_dirty
2208
2209Marks the database as dirty, to be updated at a later time.
2210
2211=item cf::db_sync
2212
2213Immediately write the database to disk I<if it is dirty>.
2214 2219
2215=cut 2220=cut
2216 2221
2217our $DB; 2222our $DB;
2218 2223
2219{ 2224sub db_init {
2225 unless ($DB) {
2226 $DB = BDB::db_create $DB_ENV;
2227
2228 cf::sync_job {
2229 eval {
2230 $DB->set_flags (BDB::CHKSUM);
2231
2232 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2233 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2234 cf::cleanup "db_open(db): $!" if $!;
2235 };
2236 cf::cleanup "db_open(db): $@" if $@;
2237 };
2238
2220 my $path = cf::localdir . "/database.pst"; 2239 my $path = cf::localdir . "/database.pst";
2240 if (stat $path) {
2241 cf::sync_job {
2242 my $pst = Storable::retrieve $path;
2221 2243
2222 sub db_load() { 2244 cf::db_put (board => data => $pst->{board});
2223 $DB = stat $path ? Storable::retrieve $path : { }; 2245 cf::db_put (guildrules => data => $pst->{guildrules});
2224 } 2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2225 2248
2226 my $pid; 2249 unlink $path;
2227
2228 sub db_save() {
2229 waitpid $pid, 0 if $pid;
2230 if (0 == ($pid = fork)) {
2231 $DB->{_meta}{version} = 1;
2232 Storable::nstore $DB, "$path~";
2233 rename "$path~", $path;
2234 cf::_exit 0 if defined $pid;
2235 } 2250 };
2236 }
2237
2238 my $dirty;
2239
2240 sub db_sync() {
2241 db_save if $dirty;
2242 undef $dirty;
2243 }
2244
2245 my $idle = Event->idle (
2246 reentrant => 0,
2247 min => 10,
2248 max => 20,
2249 repeat => 0,
2250 data => WF_AUTOCANCEL,
2251 cb => \&db_sync,
2252 );
2253
2254 sub db_dirty() {
2255 $dirty = 1;
2256 $idle->start;
2257 }
2258
2259 sub db_get($;$) {
2260 @_ >= 2
2261 ? $DB->{$_[0]}{$_[1]}
2262 : ($DB->{$_[0]} ||= { })
2263 }
2264
2265 sub db_put($$;$) {
2266 if (@_ >= 3) {
2267 $DB->{$_[0]}{$_[1]} = $_[2];
2268 } else {
2269 $DB->{$_[0]} = $_[1];
2270 }
2271 db_dirty;
2272 }
2273
2274 cf::global->attach (
2275 prio => 10000,
2276 on_cleanup => sub {
2277 db_sync;
2278 }, 2251 }
2279 ); 2252 }
2253}
2254
2255sub db_get($$) {
2256 my $key = "$_[0]/$_[1]";
2257
2258 cf::sync_job {
2259 BDB::db_get $DB, undef, $key, my $data;
2260
2261 $! ? ()
2262 : Compress::LZF::sthaw $data
2263 }
2264}
2265
2266sub db_put($$$) {
2267 BDB::dbreq_pri 4;
2268 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2280} 2269}
2281 2270
2282############################################################################# 2271#############################################################################
2283# the server's init and main functions 2272# the server's init and main functions
2284 2273
2274sub load_faces {
2275 my $path = sprintf "%s/faces", cf::datadir;
2276
2277 warn "loading faces from $path\n";
2278
2279 my $faces;
2280 0 < aio_load $path, $faces
2281 or die "$path: $!";
2282
2283 Coro::cede;
2284 $faces = Storable::thaw $faces;
2285 Coro::cede;
2286
2287 my $meta = delete $faces->{""};
2288 $meta->{version} == 1
2289 or cf::cleanup "$path: version mismatch, cannot proceed.";
2290
2291 while (my ($face, $info) = each %$faces) {
2292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2293 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2294 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2295 Coro::cede;
2296 }
2297
2298 while (my ($face, $info) = each %$faces) {
2299 next unless $info->{smooth};
2300 my $idx = cf::face::find $face
2301 or next;
2302 if (my $smooth = cf::face::find $info->{smooth}) {
2303 cf::face::set_smooth $idx, $smooth;
2304 } else {
2305 warn "smooth face '$info->{smooth}' not found for face '$face'";
2306 }
2307 Coro::cede;
2308 }
2309
2310 1
2311}
2312
2285sub load_resources { 2313sub reload_resources {
2286 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2314 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2287 or die "unable to load regions file\n";#d# 2315 or die "unable to load regions file\n";#d#
2316 load_faces
2317 or die "unable to load faces\n";#d#
2318}
2319
2320sub init {
2321 reload_resources;
2288} 2322}
2289 2323
2290sub cfg_load { 2324sub cfg_load {
2291 open my $fh, "<:utf8", cf::confdir . "/config" 2325 open my $fh, "<:utf8", cf::confdir . "/config"
2292 or return; 2326 or return;
… …
2304 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2338 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2305 and die "WARNING: m(un)lockall failed: $!\n"; 2339 and die "WARNING: m(un)lockall failed: $!\n";
2306 }; 2340 };
2307 warn $@ if $@; 2341 warn $@ if $@;
2308 } 2342 }
2309}
2310
2311sub init {
2312 load_resources;
2313} 2343}
2314 2344
2315sub main { 2345sub main {
2316 # we must not ever block the main coroutine 2346 # we must not ever block the main coroutine
2317 local $Coro::idle = sub { 2347 local $Coro::idle = sub {
… …
2320 Event::one_event; 2350 Event::one_event;
2321 })->prio (Coro::PRIO_MAX); 2351 })->prio (Coro::PRIO_MAX);
2322 }; 2352 };
2323 2353
2324 cfg_load; 2354 cfg_load;
2325 db_load; 2355 db_init;
2326 load_extensions; 2356 load_extensions;
2327 2357
2328 $TICK_WATCHER->start; 2358 $TICK_WATCHER->start;
2329 Event::loop; 2359 Event::loop;
2330} 2360}
… …
2369 my $map = $cf::MAP{$path} or next; 2399 my $map = $cf::MAP{$path} or next;
2370 $map->valid or next; 2400 $map->valid or next;
2371 $map->save; 2401 $map->save;
2372 } 2402 }
2373 warn "end emergency map save\n"; 2403 warn "end emergency map save\n";
2404
2405 warn "begin emergency database checkpoint\n";
2406 BDB::db_env_txn_checkpoint $DB_ENV;
2407 warn "end emergency database checkpoint\n";
2374 }; 2408 };
2375 2409
2376 warn "leave emergency perl save\n"; 2410 warn "leave emergency perl save\n";
2411}
2412
2413sub post_cleanup {
2414 my ($make_core) = @_;
2415
2416 warn Carp::longmess "post_cleanup backtrace"
2417 if $make_core;
2377} 2418}
2378 2419
2379sub reload() { 2420sub reload() {
2380 # can/must only be called in main 2421 # can/must only be called in main
2381 if ($Coro::current != $Coro::main) { 2422 if ($Coro::current != $Coro::main) {
… …
2383 return; 2424 return;
2384 } 2425 }
2385 2426
2386 warn "reloading..."; 2427 warn "reloading...";
2387 2428
2388 warn "cancelling server ticker"; 2429 warn "entering sync_job";
2389 $TICK_WATCHER->cancel;
2390 2430
2431 cf::sync_job {
2432 cf::write_runtime; # external watchdog should not bark
2391 cf::emergency_save; 2433 cf::emergency_save;
2434 cf::write_runtime; # external watchdog should not bark
2392 2435
2393 eval { 2436 warn "syncing database to disk";
2437 BDB::db_env_txn_checkpoint $DB_ENV;
2438
2394 # if anything goes wrong in here, we should simply crash as we already saved 2439 # if anything goes wrong in here, we should simply crash as we already saved
2395
2396 warn "syncing database to disk";
2397 cf::db_sync;
2398 2440
2399 warn "cancelling all WF_AUTOCANCEL watchers"; 2441 warn "cancelling all WF_AUTOCANCEL watchers";
2400 for (Event::all_watchers) { 2442 for (Event::all_watchers) {
2401 $_->cancel if $_->data & WF_AUTOCANCEL; 2443 $_->cancel if $_->data & WF_AUTOCANCEL;
2402 } 2444 }
2403 2445
2404 warn "flushing outstanding aio requests"; 2446 warn "flushing outstanding aio requests";
2405 for (;;) { 2447 for (;;) {
2448 BDB::flush;
2406 IO::AIO::flush; 2449 IO::AIO::flush;
2407 Coro::cede; 2450 Coro::cede;
2408 last unless IO::AIO::nreqs; 2451 last unless IO::AIO::nreqs || BDB::nreqs;
2409 warn "iterate..."; 2452 warn "iterate...";
2410 } 2453 }
2454
2455 ++$RELOAD;
2411 2456
2412 warn "cancelling all extension coros"; 2457 warn "cancelling all extension coros";
2413 $_->cancel for values %EXT_CORO; 2458 $_->cancel for values %EXT_CORO;
2414 %EXT_CORO = (); 2459 %EXT_CORO = ();
2415 2460
… …
2468 require cf; 2513 require cf;
2469 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2514 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2470 2515
2471 warn "loading config and database again"; 2516 warn "loading config and database again";
2472 cf::cfg_load; 2517 cf::cfg_load;
2473 cf::db_load;
2474 2518
2475 warn "loading extensions"; 2519 warn "loading extensions";
2476 cf::load_extensions; 2520 cf::load_extensions;
2477 2521
2478 warn "reattaching attachments to objects/players"; 2522 warn "reattaching attachments to objects/players";
2479 _global_reattach; 2523 _global_reattach; # objects, sockets
2480 warn "reattaching attachments to maps"; 2524 warn "reattaching attachments to maps";
2481 reattach $_ for values %MAP; 2525 reattach $_ for values %MAP;
2526 warn "reattaching attachments to players";
2527 reattach $_ for values %PLAYER;
2482 2528
2483 warn "loading reloadable resources"; 2529 warn "loading reloadable resources";
2484 load_resources; 2530 reload_resources;
2485 2531
2486 warn "restarting server ticker"; 2532 warn "leaving sync_job";
2487 2533
2488 $TICK_WATCHER->start; 2534 1
2489 }; 2535 } or do {
2490
2491 if ($@) {
2492 warn $@; 2536 warn $@;
2493 warn "error while reloading, exiting."; 2537 warn "error while reloading, exiting.";
2494 exit 1; 2538 exit 1;
2495 } 2539 };
2496 2540
2497 warn "reloaded"; 2541 warn "reloaded";
2498}; 2542};
2499 2543
2500our $RELOAD_WATCHER; # used only during reload 2544our $RELOAD_WATCHER; # used only during reload
… …
2541 2585
2542 cf::server_tick; # one server iteration 2586 cf::server_tick; # one server iteration
2543 $RUNTIME += $TICK; 2587 $RUNTIME += $TICK;
2544 $NEXT_TICK += $TICK; 2588 $NEXT_TICK += $TICK;
2545 2589
2590 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2591 $NEXT_RUNTIME_WRITE = $NOW + 10;
2592 Coro::async_pool {
2593 write_runtime
2594 or warn "ERROR: unable to write runtime file: $!";
2595 };
2596 }
2597
2546 $WAIT_FOR_TICK->broadcast; 2598 $WAIT_FOR_TICK->broadcast;
2547 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2599 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2548 2600
2549 Event::sweep;
2550 Coro::cede_notself;
2551
2552# my $AFTER = Event::time; 2601# my $AFTER = Event::time;
2553# warn $AFTER - $NOW;#d# 2602# warn $AFTER - $NOW;#d#
2554 2603
2555 # if we are delayed by four ticks or more, skip them all 2604 # if we are delayed by four ticks or more, skip them all
2556 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2605 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2589 2638
2590 unless ($DB_ENV) { 2639 unless ($DB_ENV) {
2591 $DB_ENV = BDB::db_env_create; 2640 $DB_ENV = BDB::db_env_create;
2592 2641
2593 cf::sync_job { 2642 cf::sync_job {
2643 eval {
2594 BDB::db_env_open 2644 BDB::db_env_open
2595 $DB_ENV, 2645 $DB_ENV,
2596 $BDB_ENV_DIR, 2646 $BDB_ENV_DIR,
2597 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2647 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2598 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2648 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2599 0666; 2649 0666;
2600 2650
2601 cf::cleanup "$!" if $!; 2651 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2602 2652
2603 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2604 $DB_ENV->set_lk_detect; 2654 $DB_ENV->set_lk_detect;
2655 };
2656
2657 cf::cleanup "db_env_open(db): $@" if $@;
2605 }; 2658 };
2606 } 2659 }
2607} 2660}
2608 2661
2609{ 2662{
… …
2611 2664
2612 undef $Coro::AIO::WATCHER; 2665 undef $Coro::AIO::WATCHER;
2613 IO::AIO::max_poll_time $TICK * 0.1; 2666 IO::AIO::max_poll_time $TICK * 0.1;
2614 $AIO_POLL_WATCHER = Event->io ( 2667 $AIO_POLL_WATCHER = Event->io (
2615 reentrant => 0, 2668 reentrant => 0,
2669 data => WF_AUTOCANCEL,
2616 fd => IO::AIO::poll_fileno, 2670 fd => IO::AIO::poll_fileno,
2617 poll => 'r', 2671 poll => 'r',
2618 prio => 6, 2672 prio => 6,
2619 data => WF_AUTOCANCEL,
2620 cb => \&IO::AIO::poll_cb, 2673 cb => \&IO::AIO::poll_cb,
2621 ); 2674 );
2622} 2675}
2623 2676
2624$WRITE_RUNTIME_WATCHER = Event->timer (
2625 reentrant => 0,
2626 data => WF_AUTOCANCEL,
2627 after => 1,
2628 interval => 10,
2629 prio => 6, # keep it lowest so it acts like a watchdog
2630 cb => Coro::unblock_sub {
2631 write_runtime
2632 or warn "ERROR: unable to write runtime file: $!";
2633 },
2634);
2635
2636END { cf::emergency_save } 2677END { cf::emergency_save }
2637 2678
26381 26791
2639 2680

Diff Legend

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