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.206 by root, Sun Feb 11 22:27:05 2007 UTC vs.
Revision 1.223 by root, Sun Mar 11 02:12:44 2007 UTC

… …
22use Digest::MD5; 22use Digest::MD5;
23use Fcntl; 23use Fcntl;
24use IO::AIO 2.32 (); 24use IO::AIO 2.32 ();
25use YAML::Syck (); 25use YAML::Syck ();
26use Time::HiRes; 26use Time::HiRes;
27use Compress::LZF;
28
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
27 30
28use 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
29 32
30sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
31 34
… …
40our @EXTS = (); # list of extension package names 43our @EXTS = (); # list of extension package names
41our %EXTCMD = (); 44our %EXTCMD = ();
42our %EXT_CORO = (); # coroutines bound to extensions 45our %EXT_CORO = (); # coroutines bound to extensions
43our %EXT_MAP = (); # pluggable maps 46our %EXT_MAP = (); # pluggable maps
44 47
48our $RELOAD; # number of reloads so far
45our @EVENT; 49our @EVENT;
46our $LIBDIR = datadir . "/ext"; 50our $LIBDIR = datadir . "/ext";
47 51
48our $TICK = MAX_TIME * 1e-6; 52our $TICK = MAX_TIME * 1e-6;
49our $TICK_WATCHER; 53our $TICK_WATCHER;
50our $AIO_POLL_WATCHER; 54our $AIO_POLL_WATCHER;
51our $WRITE_RUNTIME_WATCHER; 55our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
52our $NEXT_TICK; 56our $NEXT_TICK;
53our $NOW; 57our $NOW;
54our $USE_FSYNC = 1; # use fsync to write maps - default off 58our $USE_FSYNC = 1; # use fsync to write maps - default off
55 59
56our $BDB_POLL_WATCHER; 60our $BDB_POLL_WATCHER;
… …
270sub freeze_mainloop { 274sub freeze_mainloop {
271 return unless $TICK_WATCHER->is_active; 275 return unless $TICK_WATCHER->is_active;
272 276
273 my $guard = Coro::guard { 277 my $guard = Coro::guard {
274 $TICK_WATCHER->start; 278 $TICK_WATCHER->start;
275 $WRITE_RUNTIME_WATCHER->start;
276 }; 279 };
277 $WRITE_RUNTIME_WATCHER->stop;
278 $TICK_WATCHER->stop; 280 $TICK_WATCHER->stop;
279 $guard 281 $guard
280} 282}
281 283
282=item cf::async { BLOCK } 284=item cf::async { BLOCK }
… …
353 355
354 $coro 356 $coro
355} 357}
356 358
357sub write_runtime { 359sub write_runtime {
360 my $guard = cf::lock_acquire "write_runtime";
361
358 my $runtime = cf::localdir . "/runtime"; 362 my $runtime = cf::localdir . "/runtime";
359 363
360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 364 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
361 or return; 365 or return;
362 366
… …
784 } 788 }
785 } else { 789 } else {
786 aio_unlink $filename; 790 aio_unlink $filename;
787 aio_unlink "$filename.pst"; 791 aio_unlink "$filename.pst";
788 } 792 }
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 } 793 }
796} 794}
797 795
798sub object_freezer_as_string { 796sub object_freezer_as_string {
799 my ($rdata, $objs) = @_; 797 my ($rdata, $objs) = @_;
… …
805 803
806sub object_thawer_load { 804sub object_thawer_load {
807 my ($filename) = @_; 805 my ($filename) = @_;
808 806
809 my ($data, $av); 807 my ($data, $av);
810
811 #d#TODO remove .map if file does not exist
812 aio_stat $filename and $filename =~ s/\.map$//;
813 808
814 (aio_load $filename, $data) >= 0 809 (aio_load $filename, $data) >= 0
815 or return; 810 or return;
816 811
817 unless (aio_stat "$filename.pst") { 812 unless (aio_stat "$filename.pst") {
… …
1036=cut 1031=cut
1037 1032
1038sub quit_character { 1033sub quit_character {
1039 my ($pl) = @_; 1034 my ($pl) = @_;
1040 1035
1036 my $name = $pl->ob->name;
1037
1041 $pl->{deny_save} = 1; 1038 $pl->{deny_save} = 1;
1042 $pl->password ("*"); # this should lock out the player until we nuked the dir 1039 $pl->password ("*"); # this should lock out the player until we nuked the dir
1043 1040
1044 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1041 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1045 $pl->deactivate; 1042 $pl->deactivate;
… …
1049 my $path = playerdir $pl; 1046 my $path = playerdir $pl;
1050 my $temp = "$path~$cf::RUNTIME~deleting~"; 1047 my $temp = "$path~$cf::RUNTIME~deleting~";
1051 aio_rename $path, $temp; 1048 aio_rename $path, $temp;
1052 delete $cf::PLAYER{$pl->ob->name}; 1049 delete $cf::PLAYER{$pl->ob->name};
1053 $pl->destroy; 1050 $pl->destroy;
1051
1052 my $prefix = qr<^~\Q$name\E/>;
1053
1054 # nuke player maps
1055 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1056
1054 IO::AIO::aio_rmtree $temp; 1057 IO::AIO::aio_rmtree $temp;
1058}
1059
1060=item $pl->kick
1061
1062Kicks a player out of the game. This destroys the connection.
1063
1064=cut
1065
1066sub kick {
1067 my ($pl, $kicker) = @_;
1068
1069 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1070 $pl->killer ("kicked");
1071 $pl->ns->destroy;
1055} 1072}
1056 1073
1057=item cf::player::list_logins 1074=item cf::player::list_logins
1058 1075
1059Returns am arrayref of all valid playernames in the system, can take a 1076Returns am arrayref of all valid playernames in the system, can take a
… …
1304 my ($self) = @_; 1321 my ($self) = @_;
1305 1322
1306 utf8::encode (my $save = $self->save_path); 1323 utf8::encode (my $save = $self->save_path);
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1324 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1325 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} 1326}
1315 1327
1316sub load_header_from($) { 1328sub load_header_from($) {
1317 my ($self, $path) = @_; 1329 my ($self, $path) = @_;
1318 1330
… …
1606 return if $self->players; 1618 return if $self->players;
1607 return if $self->isa ("ext::map_per_player");#d# 1619 return if $self->isa ("ext::map_per_player");#d#
1608 1620
1609 warn "resetting map ", $self->path;#d# 1621 warn "resetting map ", $self->path;#d#
1610 1622
1623 $self->in_memory (cf::MAP_SWAPPED);
1624
1625 # need to save uniques path
1626 unless ($self->{deny_save}) {
1627 my $uniq = $self->uniq_path; utf8::encode $uniq;
1628
1629 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1630 if $uniq;
1631 }
1632
1611 delete $cf::MAP{$self->path}; 1633 delete $cf::MAP{$self->path};
1612 1634
1613 $self->in_memory (cf::MAP_SWAPPED);
1614 $self->clear; 1635 $self->clear;
1615 1636
1616 $_->clear_links_to ($self) for values %cf::MAP; 1637 $_->clear_links_to ($self) for values %cf::MAP;
1617 1638
1618 $self->unlink_save; 1639 $self->unlink_save;
… …
1808 $map->load; 1829 $map->load;
1809 $map->load_diag; 1830 $map->load_diag;
1810 1831
1811 return unless $self->contr->active; 1832 return unless $self->contr->active;
1812 $self->activate_recursive; 1833 $self->activate_recursive;
1834
1835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1813 $self->enter_map ($map, $x, $y); 1836 $self->enter_map ($map, $x, $y);
1814} 1837}
1815 1838
1816cf::player->attach ( 1839cf::player->attach (
1817 on_logout => sub { 1840 on_logout => sub {
… …
1830 # try to abort aborted map switching on player login :) 1853 # try to abort aborted map switching on player login :)
1831 # should happen only on crashes 1854 # should happen only on crashes
1832 if ($pl->ob->{_link_pos}) { 1855 if ($pl->ob->{_link_pos}) {
1833 $pl->ob->enter_link; 1856 $pl->ob->enter_link;
1834 (async { 1857 (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, 1858 $pl->ob->reply (undef,
1838 "There was an internal problem at your last logout, " 1859 "There was an internal problem at your last logout, "
1839 . "the server will try to bring you to your intended destination in a second.", 1860 . "the server will try to bring you to your intended destination in a second.",
1840 cf::NDI_RED); 1861 cf::NDI_RED);
1862 # we need this sleep as the login has a concurrent enter_exit running
1863 # and this sleep increases chances of the player not ending up in scorn
1841 Coro::Timer::sleep 1; 1864 Coro::Timer::sleep 1;
1842 $pl->ob->leave_link; 1865 $pl->ob->leave_link;
1843 })->prio (2); 1866 })->prio (2);
1844 } 1867 }
1845 }, 1868 },
… …
2182The parameter C<$family> should best start with the name of the extension 2205The parameter C<$family> should best start with the name of the extension
2183using it, it should be unique. 2206using it, it should be unique.
2184 2207
2185=over 4 2208=over 4
2186 2209
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 2210=item $value = cf::db_get $family => $key
2194 2211
2195Returns a single value from the database 2212Returns 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 2213
2202=item cf::db_put $family => $key => $value 2214=item cf::db_put $family => $key => $value
2203 2215
2204Stores the given C<$value> in the family hash. Updates are delayed, if you 2216Stores 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 2217
2215=cut 2218=cut
2216 2219
2217our $DB; 2220our $DB;
2218 2221
2219{ 2222sub db_init {
2223 unless ($DB) {
2224 $DB = BDB::db_create $DB_ENV;
2225
2226 cf::sync_job {
2227 eval {
2228 $DB->set_flags (BDB::CHKSUM);
2229
2230 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2231 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2232 cf::cleanup "db_open(db): $!" if $!;
2233 };
2234 cf::cleanup "db_open(db): $@" if $@;
2235 };
2236
2220 my $path = cf::localdir . "/database.pst"; 2237 my $path = cf::localdir . "/database.pst";
2238 if (stat $path) {
2239 cf::sync_job {
2240 my $pst = Storable::retrieve $path;
2221 2241
2222 sub db_load() { 2242 cf::db_put (board => data => $pst->{board});
2223 $DB = stat $path ? Storable::retrieve $path : { }; 2243 cf::db_put (guildrules => data => $pst->{guildrules});
2224 } 2244 cf::db_put (rent => balance => $pst->{rent}{balance});
2245 BDB::db_env_txn_checkpoint $DB_ENV;
2225 2246
2226 my $pid; 2247 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 } 2248 };
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 }, 2249 }
2279 ); 2250 }
2251}
2252
2253sub db_get($$) {
2254 my $key = "$_[0]/$_[1]";
2255
2256 cf::sync_job {
2257 BDB::db_get $DB, undef, $key, my $data;
2258
2259 $! ? ()
2260 : Compress::LZF::sthaw $data
2261 }
2262}
2263
2264sub db_put($$$) {
2265 BDB::dbreq_pri 4;
2266 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2280} 2267}
2281 2268
2282############################################################################# 2269#############################################################################
2283# the server's init and main functions 2270# the server's init and main functions
2284 2271
2272sub load_faces {
2273 my $path = sprintf "%s/faces", cf::datadir;
2274
2275 warn "loading faces from $path\n";
2276
2277 my $faces;
2278 0 < aio_load $path, $faces
2279 or die "$path: $!";
2280
2281 Coro::cede;
2282 $faces = Storable::thaw $faces;
2283 Coro::cede;
2284
2285 while (my ($face, $info) = each %$faces) {
2286 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2287 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2288 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2289 Coro::cede;
2290 }
2291
2292 1
2293}
2294
2285sub load_resources { 2295sub reload_resources {
2286 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2296 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2287 or die "unable to load regions file\n";#d# 2297 or die "unable to load regions file\n";#d#
2298 load_faces
2299 or die "unable to load faces\n";#d#
2300}
2301
2302sub init {
2303 reload_resources;
2288} 2304}
2289 2305
2290sub cfg_load { 2306sub cfg_load {
2291 open my $fh, "<:utf8", cf::confdir . "/config" 2307 open my $fh, "<:utf8", cf::confdir . "/config"
2292 or return; 2308 or return;
… …
2304 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2320 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2305 and die "WARNING: m(un)lockall failed: $!\n"; 2321 and die "WARNING: m(un)lockall failed: $!\n";
2306 }; 2322 };
2307 warn $@ if $@; 2323 warn $@ if $@;
2308 } 2324 }
2309}
2310
2311sub init {
2312 load_resources;
2313} 2325}
2314 2326
2315sub main { 2327sub main {
2316 # we must not ever block the main coroutine 2328 # we must not ever block the main coroutine
2317 local $Coro::idle = sub { 2329 local $Coro::idle = sub {
… …
2320 Event::one_event; 2332 Event::one_event;
2321 })->prio (Coro::PRIO_MAX); 2333 })->prio (Coro::PRIO_MAX);
2322 }; 2334 };
2323 2335
2324 cfg_load; 2336 cfg_load;
2325 db_load; 2337 db_init;
2326 load_extensions; 2338 load_extensions;
2327 2339
2328 $TICK_WATCHER->start; 2340 $TICK_WATCHER->start;
2329 Event::loop; 2341 Event::loop;
2330} 2342}
… …
2369 my $map = $cf::MAP{$path} or next; 2381 my $map = $cf::MAP{$path} or next;
2370 $map->valid or next; 2382 $map->valid or next;
2371 $map->save; 2383 $map->save;
2372 } 2384 }
2373 warn "end emergency map save\n"; 2385 warn "end emergency map save\n";
2386
2387 warn "begin emergency database checkpoint\n";
2388 BDB::db_env_txn_checkpoint $DB_ENV;
2389 warn "end emergency database checkpoint\n";
2374 }; 2390 };
2375 2391
2376 warn "leave emergency perl save\n"; 2392 warn "leave emergency perl save\n";
2393}
2394
2395sub post_cleanup {
2396 my ($make_core) = @_;
2397
2398 warn Carp::longmess "post_cleanup backtrace"
2399 if $make_core;
2377} 2400}
2378 2401
2379sub reload() { 2402sub reload() {
2380 # can/must only be called in main 2403 # can/must only be called in main
2381 if ($Coro::current != $Coro::main) { 2404 if ($Coro::current != $Coro::main) {
… …
2383 return; 2406 return;
2384 } 2407 }
2385 2408
2386 warn "reloading..."; 2409 warn "reloading...";
2387 2410
2388 warn "cancelling server ticker"; 2411 warn "entering sync_job";
2389 $TICK_WATCHER->cancel;
2390 2412
2413 cf::sync_job {
2414 cf::write_runtime; # external watchdog should not bark
2391 cf::emergency_save; 2415 cf::emergency_save;
2416 cf::write_runtime; # external watchdog should not bark
2392 2417
2393 eval { 2418 warn "syncing database to disk";
2419 BDB::db_env_txn_checkpoint $DB_ENV;
2420
2394 # if anything goes wrong in here, we should simply crash as we already saved 2421 # 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 2422
2399 warn "cancelling all WF_AUTOCANCEL watchers"; 2423 warn "cancelling all WF_AUTOCANCEL watchers";
2400 for (Event::all_watchers) { 2424 for (Event::all_watchers) {
2401 $_->cancel if $_->data & WF_AUTOCANCEL; 2425 $_->cancel if $_->data & WF_AUTOCANCEL;
2402 } 2426 }
2403 2427
2404 warn "flushing outstanding aio requests"; 2428 warn "flushing outstanding aio requests";
2405 for (;;) { 2429 for (;;) {
2430 BDB::flush;
2406 IO::AIO::flush; 2431 IO::AIO::flush;
2407 Coro::cede; 2432 Coro::cede;
2408 last unless IO::AIO::nreqs; 2433 last unless IO::AIO::nreqs || BDB::nreqs;
2409 warn "iterate..."; 2434 warn "iterate...";
2410 } 2435 }
2436
2437 ++$RELOAD;
2411 2438
2412 warn "cancelling all extension coros"; 2439 warn "cancelling all extension coros";
2413 $_->cancel for values %EXT_CORO; 2440 $_->cancel for values %EXT_CORO;
2414 %EXT_CORO = (); 2441 %EXT_CORO = ();
2415 2442
… …
2468 require cf; 2495 require cf;
2469 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2496 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2470 2497
2471 warn "loading config and database again"; 2498 warn "loading config and database again";
2472 cf::cfg_load; 2499 cf::cfg_load;
2473 cf::db_load;
2474 2500
2475 warn "loading extensions"; 2501 warn "loading extensions";
2476 cf::load_extensions; 2502 cf::load_extensions;
2477 2503
2478 warn "reattaching attachments to objects/players"; 2504 warn "reattaching attachments to objects/players";
2479 _global_reattach; 2505 _global_reattach; # objects, sockets
2480 warn "reattaching attachments to maps"; 2506 warn "reattaching attachments to maps";
2481 reattach $_ for values %MAP; 2507 reattach $_ for values %MAP;
2508 warn "reattaching attachments to players";
2509 reattach $_ for values %PLAYER;
2482 2510
2483 warn "loading reloadable resources"; 2511 warn "loading reloadable resources";
2484 load_resources; 2512 reload_resources;
2485 2513
2486 warn "restarting server ticker"; 2514 warn "leaving sync_job";
2487 2515
2488 $TICK_WATCHER->start; 2516 1
2489 }; 2517 } or do {
2490
2491 if ($@) {
2492 warn $@; 2518 warn $@;
2493 warn "error while reloading, exiting."; 2519 warn "error while reloading, exiting.";
2494 exit 1; 2520 exit 1;
2495 } 2521 };
2496 2522
2497 warn "reloaded"; 2523 warn "reloaded";
2498}; 2524};
2499 2525
2500our $RELOAD_WATCHER; # used only during reload 2526our $RELOAD_WATCHER; # used only during reload
… …
2541 2567
2542 cf::server_tick; # one server iteration 2568 cf::server_tick; # one server iteration
2543 $RUNTIME += $TICK; 2569 $RUNTIME += $TICK;
2544 $NEXT_TICK += $TICK; 2570 $NEXT_TICK += $TICK;
2545 2571
2572 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2573 $NEXT_RUNTIME_WRITE = $NOW + 10;
2574 Coro::async_pool {
2575 write_runtime
2576 or warn "ERROR: unable to write runtime file: $!";
2577 };
2578 }
2579
2546 $WAIT_FOR_TICK->broadcast; 2580 $WAIT_FOR_TICK->broadcast;
2547 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2581 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2548 2582
2549 Event::sweep;
2550 Coro::cede_notself;
2551
2552# my $AFTER = Event::time; 2583# my $AFTER = Event::time;
2553# warn $AFTER - $NOW;#d# 2584# warn $AFTER - $NOW;#d#
2554 2585
2555 # if we are delayed by four ticks or more, skip them all 2586 # if we are delayed by four ticks or more, skip them all
2556 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2587 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2589 2620
2590 unless ($DB_ENV) { 2621 unless ($DB_ENV) {
2591 $DB_ENV = BDB::db_env_create; 2622 $DB_ENV = BDB::db_env_create;
2592 2623
2593 cf::sync_job { 2624 cf::sync_job {
2625 eval {
2594 BDB::db_env_open 2626 BDB::db_env_open
2595 $DB_ENV, 2627 $DB_ENV,
2596 $BDB_ENV_DIR, 2628 $BDB_ENV_DIR,
2597 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2629 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2598 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2630 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2599 0666; 2631 0666;
2600 2632
2601 cf::cleanup "$!" if $!; 2633 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2602 2634
2603 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2635 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2636 $DB_ENV->set_lk_detect;
2637 };
2638
2639 cf::cleanup "db_env_open(db): $@" if $@;
2604 }; 2640 };
2605 } 2641 }
2606} 2642}
2607 2643
2608{ 2644{
… …
2610 2646
2611 undef $Coro::AIO::WATCHER; 2647 undef $Coro::AIO::WATCHER;
2612 IO::AIO::max_poll_time $TICK * 0.1; 2648 IO::AIO::max_poll_time $TICK * 0.1;
2613 $AIO_POLL_WATCHER = Event->io ( 2649 $AIO_POLL_WATCHER = Event->io (
2614 reentrant => 0, 2650 reentrant => 0,
2651 data => WF_AUTOCANCEL,
2615 fd => IO::AIO::poll_fileno, 2652 fd => IO::AIO::poll_fileno,
2616 poll => 'r', 2653 poll => 'r',
2617 prio => 6, 2654 prio => 6,
2618 data => WF_AUTOCANCEL,
2619 cb => \&IO::AIO::poll_cb, 2655 cb => \&IO::AIO::poll_cb,
2620 ); 2656 );
2621} 2657}
2622 2658
2623$WRITE_RUNTIME_WATCHER = Event->timer (
2624 reentrant => 0,
2625 data => WF_AUTOCANCEL,
2626 after => 1,
2627 interval => 10,
2628 prio => 6, # keep it lowest so it acts like a watchdog
2629 cb => Coro::unblock_sub {
2630 write_runtime
2631 or warn "ERROR: unable to write runtime file: $!";
2632 },
2633);
2634
2635END { cf::emergency_save } 2659END { cf::emergency_save }
2636 2660
26371 26611
2638 2662

Diff Legend

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