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.208 by root, Mon Feb 12 00:27:20 2007 UTC vs.
Revision 1.213 by root, Tue Feb 13 20:01:04 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
2202sub db_load() { 2211sub db_init {
2203 unless ($DB) { 2212 unless ($DB) {
2204 $DB = BDB::db_create $DB_ENV; 2213 $DB = BDB::db_create $DB_ENV;
2205 2214
2206 cf::sync_job { 2215 cf::sync_job {
2207 eval { 2216 eval {
… …
2287 Event::one_event; 2296 Event::one_event;
2288 })->prio (Coro::PRIO_MAX); 2297 })->prio (Coro::PRIO_MAX);
2289 }; 2298 };
2290 2299
2291 cfg_load; 2300 cfg_load;
2292 db_load; 2301 db_init;
2293 load_extensions; 2302 load_extensions;
2294 2303
2295 $TICK_WATCHER->start; 2304 $TICK_WATCHER->start;
2305 $WRITE_RUNTIME_WATCHER->start;
2296 Event::loop; 2306 Event::loop;
2297} 2307}
2298 2308
2299############################################################################# 2309#############################################################################
2300# initialisation and cleanup 2310# initialisation and cleanup
… …
2345 }; 2355 };
2346 2356
2347 warn "leave emergency perl save\n"; 2357 warn "leave emergency perl save\n";
2348} 2358}
2349 2359
2360sub post_cleanup {
2361 my ($make_core) = @_;
2362
2363 warn Carp::longmess "post_cleanup backtrace"
2364 if $make_core;
2365}
2366
2350sub reload() { 2367sub reload() {
2351 # can/must only be called in main 2368 # can/must only be called in main
2352 if ($Coro::current != $Coro::main) { 2369 if ($Coro::current != $Coro::main) {
2353 warn "can only reload from main coroutine"; 2370 warn "can only reload from main coroutine";
2354 return; 2371 return;
2355 } 2372 }
2356 2373
2357 warn "reloading..."; 2374 warn "reloading...";
2358 2375
2359 warn "cancelling server ticker"; 2376 warn "entering sync_job";
2360 $TICK_WATCHER->cancel;
2361 2377
2378 cf::sync_job {
2379 cf::write_runtime;
2362 cf::emergency_save; 2380 cf::emergency_save;
2381 cf::write_runtime;
2363 2382
2364 eval { 2383 warn "syncing database to disk";
2384 BDB::db_env_txn_checkpoint $DB_ENV;
2385
2365 # if anything goes wrong in here, we should simply crash as we already saved 2386 # if anything goes wrong in here, we should simply crash as we already saved
2366 2387
2367 warn "cancelling all WF_AUTOCANCEL watchers"; 2388 warn "cancelling all WF_AUTOCANCEL watchers";
2368 for (Event::all_watchers) { 2389 for (Event::all_watchers) {
2369 $_->cancel if $_->data & WF_AUTOCANCEL; 2390 $_->cancel if $_->data & WF_AUTOCANCEL;
2370 } 2391 }
2371
2372 warn "syncing database to disk";
2373 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2374 2392
2375 warn "flushing outstanding aio requests"; 2393 warn "flushing outstanding aio requests";
2376 for (;;) { 2394 for (;;) {
2377 BDB::flush; 2395 BDB::flush;
2378 IO::AIO::flush; 2396 IO::AIO::flush;
… …
2440 require cf; 2458 require cf;
2441 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2459 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2442 2460
2443 warn "loading config and database again"; 2461 warn "loading config and database again";
2444 cf::cfg_load; 2462 cf::cfg_load;
2445 cf::db_load;
2446 2463
2447 warn "loading extensions"; 2464 warn "loading extensions";
2448 cf::load_extensions; 2465 cf::load_extensions;
2449 2466
2450 warn "reattaching attachments to objects/players"; 2467 warn "reattaching attachments to objects/players";
… …
2453 reattach $_ for values %MAP; 2470 reattach $_ for values %MAP;
2454 2471
2455 warn "loading reloadable resources"; 2472 warn "loading reloadable resources";
2456 load_resources; 2473 load_resources;
2457 2474
2458 warn "restarting server ticker"; 2475 warn "leaving sync_job";
2459 2476
2460 $TICK_WATCHER->start; 2477 1
2461 }; 2478 } or do {
2462
2463 if ($@) {
2464 warn $@; 2479 warn $@;
2465 warn "error while reloading, exiting."; 2480 warn "error while reloading, exiting.";
2466 exit 1; 2481 exit 1;
2467 } 2482 };
2468 2483
2469 warn "reloaded"; 2484 warn "reloaded";
2470}; 2485};
2471 2486
2472our $RELOAD_WATCHER; # used only during reload 2487our $RELOAD_WATCHER; # used only during reload
… …
2516 $NEXT_TICK += $TICK; 2531 $NEXT_TICK += $TICK;
2517 2532
2518 $WAIT_FOR_TICK->broadcast; 2533 $WAIT_FOR_TICK->broadcast;
2519 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2534 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2520 2535
2521 Event::sweep;
2522 Coro::cede_notself;
2523
2524# my $AFTER = Event::time; 2536# my $AFTER = Event::time;
2525# warn $AFTER - $NOW;#d# 2537# warn $AFTER - $NOW;#d#
2526 2538
2527 # if we are delayed by four ticks or more, skip them all 2539 # if we are delayed by four ticks or more, skip them all
2528 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2540 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2598} 2610}
2599 2611
2600$WRITE_RUNTIME_WATCHER = Event->timer ( 2612$WRITE_RUNTIME_WATCHER = Event->timer (
2601 reentrant => 0, 2613 reentrant => 0,
2602 data => WF_AUTOCANCEL, 2614 data => WF_AUTOCANCEL,
2615 parked => 1,
2603 after => 1, 2616 after => 1,
2604 interval => 10, 2617 interval => 10,
2605 prio => 6, # keep it lowest so it acts like a watchdog 2618 prio => 6, # keep it lowest so it acts like a watchdog
2606 cb => Coro::unblock_sub { 2619 cb => sub {
2620 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
2621
2622 Coro::async_pool {
2607 write_runtime 2623 write_runtime
2608 or warn "ERROR: unable to write runtime file: $!"; 2624 or warn "ERROR: unable to write runtime file: $!";
2625 };
2609 }, 2626 },
2610); 2627);
2611 2628
2612END { cf::emergency_save } 2629END { cf::emergency_save }
2613 2630

Diff Legend

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