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.209 by root, Mon Feb 12 01:25:55 2007 UTC vs.
Revision 1.212 by root, Tue Feb 13 19:25:44 2007 UTC

… …
1609 return if $self->players; 1609 return if $self->players;
1610 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1611 1611
1612 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1613 1613
1614 $self->in_memory (cf::MAP_SWAPPED);
1615
1616 # need to save uniques path
1617 unless ($self->{deny_save}) {
1618 my $uniq = $self->uniq_path; utf8::encode $uniq;
1619
1620 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1621 if $uniq;
1622 }
1623
1614 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1615 1625
1616 $self->in_memory (cf::MAP_SWAPPED);
1617 $self->clear; 1626 $self->clear;
1618 1627
1619 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1620 1629
1621 $self->unlink_save; 1630 $self->unlink_save;
… …
2197 2206
2198=cut 2207=cut
2199 2208
2200our $DB; 2209our $DB;
2201 2210
2211sub db_init {
2202unless ($DB) { 2212 unless ($DB) {
2203 $DB = BDB::db_create $DB_ENV; 2213 $DB = BDB::db_create $DB_ENV;
2204 2214
2205 cf::sync_job { 2215 cf::sync_job {
2206 eval { 2216 eval {
2207 $DB->set_flags (BDB::CHKSUM); 2217 $DB->set_flags (BDB::CHKSUM);
2208 2218
2209 BDB::db_open $DB, undef, "db", undef, BDB::BTREE, 2219 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2210 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2220 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2211 cf::cleanup "db_open(db): $!" if $!; 2221 cf::cleanup "db_open(db): $!" if $!;
2222 };
2223 cf::cleanup "db_open(db): $@" if $@;
2212 }; 2224 };
2213 cf::cleanup "db_open(db): $@" if $@;
2214 };
2215 2225
2216 my $path = cf::localdir . "/database.pst"; 2226 my $path = cf::localdir . "/database.pst";
2217 if (stat $path) { 2227 if (stat $path) {
2218 cf::sync_job { 2228 cf::sync_job {
2219 my $pst = Storable::retrieve $path; 2229 my $pst = Storable::retrieve $path;
2220 2230
2221 cf::db_put (board => data => $pst->{board}); 2231 cf::db_put (board => data => $pst->{board});
2222 cf::db_put (guildrules => data => $pst->{guildrules}); 2232 cf::db_put (guildrules => data => $pst->{guildrules});
2223 cf::db_put (rent => balance => $pst->{rent}{balance}); 2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2224 BDB::db_env_txn_checkpoint $DB_ENV; 2234 BDB::db_env_txn_checkpoint $DB_ENV;
2225 2235
2226 unlink $path; 2236 unlink $path;
2237 };
2227 }; 2238 }
2228 } 2239 }
2229} 2240}
2230 2241
2231sub db_get($$) { 2242sub db_get($$) {
2232 my $key = "$_[0]/$_[1]"; 2243 my $key = "$_[0]/$_[1]";
… …
2285 Event::one_event; 2296 Event::one_event;
2286 })->prio (Coro::PRIO_MAX); 2297 })->prio (Coro::PRIO_MAX);
2287 }; 2298 };
2288 2299
2289 cfg_load; 2300 cfg_load;
2301 db_init;
2290 load_extensions; 2302 load_extensions;
2291 2303
2292 $TICK_WATCHER->start; 2304 $TICK_WATCHER->start;
2293 Event::loop; 2305 Event::loop;
2294} 2306}
… …
2342 }; 2354 };
2343 2355
2344 warn "leave emergency perl save\n"; 2356 warn "leave emergency perl save\n";
2345} 2357}
2346 2358
2359sub post_cleanup {
2360 my ($make_core) = @_;
2361
2362 warn Carp::longmess "post_cleanup backtrace"
2363 if $make_core;
2364}
2365
2347sub reload() { 2366sub reload() {
2348 # can/must only be called in main 2367 # can/must only be called in main
2349 if ($Coro::current != $Coro::main) { 2368 if ($Coro::current != $Coro::main) {
2350 warn "can only reload from main coroutine"; 2369 warn "can only reload from main coroutine";
2351 return; 2370 return;
2352 } 2371 }
2353 2372
2354 warn "reloading..."; 2373 warn "reloading...";
2355 2374
2356 warn "cancelling server ticker"; 2375 warn "entering sync_job";
2357 $TICK_WATCHER->cancel;
2358 2376
2377 sync_job {
2378 write_runtime;
2359 cf::emergency_save; 2379 cf::emergency_save;
2380 write_runtime;
2360 2381
2361 eval { 2382 warn "syncing database to disk";
2383 BDB::db_env_txn_checkpoint $DB_ENV;
2384
2362 # if anything goes wrong in here, we should simply crash as we already saved 2385 # if anything goes wrong in here, we should simply crash as we already saved
2363 2386
2364 warn "cancelling all WF_AUTOCANCEL watchers"; 2387 warn "cancelling all WF_AUTOCANCEL watchers";
2365 for (Event::all_watchers) { 2388 for (Event::all_watchers) {
2366 $_->cancel if $_->data & WF_AUTOCANCEL; 2389 $_->cancel if $_->data & WF_AUTOCANCEL;
2367 } 2390 }
2368
2369 warn "syncing database to disk";
2370 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2371 2391
2372 warn "flushing outstanding aio requests"; 2392 warn "flushing outstanding aio requests";
2373 for (;;) { 2393 for (;;) {
2374 BDB::flush; 2394 BDB::flush;
2375 IO::AIO::flush; 2395 IO::AIO::flush;
… …
2449 reattach $_ for values %MAP; 2469 reattach $_ for values %MAP;
2450 2470
2451 warn "loading reloadable resources"; 2471 warn "loading reloadable resources";
2452 load_resources; 2472 load_resources;
2453 2473
2454 warn "restarting server ticker"; 2474 warn "leaving sync_job";
2455 2475
2456 $TICK_WATCHER->start; 2476 1
2457 }; 2477 } or do {
2458
2459 if ($@) {
2460 warn $@; 2478 warn $@;
2461 warn "error while reloading, exiting."; 2479 warn "error while reloading, exiting.";
2462 exit 1; 2480 exit 1;
2463 } 2481 };
2464 2482
2465 warn "reloaded"; 2483 warn "reloaded";
2466}; 2484};
2467 2485
2468our $RELOAD_WATCHER; # used only during reload 2486our $RELOAD_WATCHER; # used only during reload
… …
2512 $NEXT_TICK += $TICK; 2530 $NEXT_TICK += $TICK;
2513 2531
2514 $WAIT_FOR_TICK->broadcast; 2532 $WAIT_FOR_TICK->broadcast;
2515 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2533 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2516 2534
2517 Event::sweep;
2518 Coro::cede_notself;
2519
2520# my $AFTER = Event::time; 2535# my $AFTER = Event::time;
2521# warn $AFTER - $NOW;#d# 2536# warn $AFTER - $NOW;#d#
2522 2537
2523 # if we are delayed by four ticks or more, skip them all 2538 # if we are delayed by four ticks or more, skip them all
2524 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2539 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2594} 2609}
2595 2610
2596$WRITE_RUNTIME_WATCHER = Event->timer ( 2611$WRITE_RUNTIME_WATCHER = Event->timer (
2597 reentrant => 0, 2612 reentrant => 0,
2598 data => WF_AUTOCANCEL, 2613 data => WF_AUTOCANCEL,
2614 parked => 1,
2599 after => 1, 2615 after => 1,
2600 interval => 10, 2616 interval => 10,
2601 prio => 6, # keep it lowest so it acts like a watchdog 2617 prio => 6, # keep it lowest so it acts like a watchdog
2602 cb => Coro::unblock_sub { 2618 cb => sub {
2619 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
2620
2621 Coro::async_pool {
2603 write_runtime 2622 write_runtime
2604 or warn "ERROR: unable to write runtime file: $!"; 2623 or warn "ERROR: unable to write runtime file: $!";
2624 };
2605 }, 2625 },
2606); 2626);
2607 2627
2608END { cf::emergency_save } 2628END { cf::emergency_save }
2609 2629

Diff Legend

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