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.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
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;
2296 Event::loop; 2305 Event::loop;
2297} 2306}
… …
2345 }; 2354 };
2346 2355
2347 warn "leave emergency perl save\n"; 2356 warn "leave emergency perl save\n";
2348} 2357}
2349 2358
2359sub post_cleanup {
2360 my ($make_core) = @_;
2361
2362 warn Carp::longmess "post_cleanup backtrace"
2363 if $make_core;
2364}
2365
2350sub reload() { 2366sub reload() {
2351 # can/must only be called in main 2367 # can/must only be called in main
2352 if ($Coro::current != $Coro::main) { 2368 if ($Coro::current != $Coro::main) {
2353 warn "can only reload from main coroutine"; 2369 warn "can only reload from main coroutine";
2354 return; 2370 return;
2355 } 2371 }
2356 2372
2357 warn "reloading..."; 2373 warn "reloading...";
2358 2374
2359 warn "cancelling server ticker"; 2375 warn "entering sync_job";
2360 $TICK_WATCHER->cancel;
2361 2376
2377 sync_job {
2378 write_runtime;
2362 cf::emergency_save; 2379 cf::emergency_save;
2380 write_runtime;
2363 2381
2364 eval { 2382 warn "syncing database to disk";
2383 BDB::db_env_txn_checkpoint $DB_ENV;
2384
2365 # 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
2366 2386
2367 warn "cancelling all WF_AUTOCANCEL watchers"; 2387 warn "cancelling all WF_AUTOCANCEL watchers";
2368 for (Event::all_watchers) { 2388 for (Event::all_watchers) {
2369 $_->cancel if $_->data & WF_AUTOCANCEL; 2389 $_->cancel if $_->data & WF_AUTOCANCEL;
2370 } 2390 }
2371
2372 warn "syncing database to disk";
2373 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2374 2391
2375 warn "flushing outstanding aio requests"; 2392 warn "flushing outstanding aio requests";
2376 for (;;) { 2393 for (;;) {
2377 BDB::flush; 2394 BDB::flush;
2378 IO::AIO::flush; 2395 IO::AIO::flush;
… …
2440 require cf; 2457 require cf;
2441 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2458 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2442 2459
2443 warn "loading config and database again"; 2460 warn "loading config and database again";
2444 cf::cfg_load; 2461 cf::cfg_load;
2445 cf::db_load;
2446 2462
2447 warn "loading extensions"; 2463 warn "loading extensions";
2448 cf::load_extensions; 2464 cf::load_extensions;
2449 2465
2450 warn "reattaching attachments to objects/players"; 2466 warn "reattaching attachments to objects/players";
… …
2453 reattach $_ for values %MAP; 2469 reattach $_ for values %MAP;
2454 2470
2455 warn "loading reloadable resources"; 2471 warn "loading reloadable resources";
2456 load_resources; 2472 load_resources;
2457 2473
2458 warn "restarting server ticker"; 2474 warn "leaving sync_job";
2459 2475
2460 $TICK_WATCHER->start; 2476 1
2461 }; 2477 } or do {
2462
2463 if ($@) {
2464 warn $@; 2478 warn $@;
2465 warn "error while reloading, exiting."; 2479 warn "error while reloading, exiting.";
2466 exit 1; 2480 exit 1;
2467 } 2481 };
2468 2482
2469 warn "reloaded"; 2483 warn "reloaded";
2470}; 2484};
2471 2485
2472our $RELOAD_WATCHER; # used only during reload 2486our $RELOAD_WATCHER; # used only during reload
… …
2516 $NEXT_TICK += $TICK; 2530 $NEXT_TICK += $TICK;
2517 2531
2518 $WAIT_FOR_TICK->broadcast; 2532 $WAIT_FOR_TICK->broadcast;
2519 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2533 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2520 2534
2521 Event::sweep;
2522 Coro::cede_notself;
2523
2524# my $AFTER = Event::time; 2535# my $AFTER = Event::time;
2525# warn $AFTER - $NOW;#d# 2536# warn $AFTER - $NOW;#d#
2526 2537
2527 # 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
2528 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2539 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2598} 2609}
2599 2610
2600$WRITE_RUNTIME_WATCHER = Event->timer ( 2611$WRITE_RUNTIME_WATCHER = Event->timer (
2601 reentrant => 0, 2612 reentrant => 0,
2602 data => WF_AUTOCANCEL, 2613 data => WF_AUTOCANCEL,
2614 parked => 1,
2603 after => 1, 2615 after => 1,
2604 interval => 10, 2616 interval => 10,
2605 prio => 6, # keep it lowest so it acts like a watchdog 2617 prio => 6, # keep it lowest so it acts like a watchdog
2606 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 {
2607 write_runtime 2622 write_runtime
2608 or warn "ERROR: unable to write runtime file: $!"; 2623 or warn "ERROR: unable to write runtime file: $!";
2624 };
2609 }, 2625 },
2610); 2626);
2611 2627
2612END { cf::emergency_save } 2628END { cf::emergency_save }
2613 2629

Diff Legend

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