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.211 by root, Tue Feb 13 16:23:32 2007 UTC vs.
Revision 1.214 by root, Wed Feb 14 00:40:05 2007 UTC

… …
49our $LIBDIR = datadir . "/ext"; 49our $LIBDIR = datadir . "/ext";
50 50
51our $TICK = MAX_TIME * 1e-6; 51our $TICK = MAX_TIME * 1e-6;
52our $TICK_WATCHER; 52our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
54our $WRITE_RUNTIME_WATCHER; 54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 55our $NEXT_TICK;
56our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off 57our $USE_FSYNC = 1; # use fsync to write maps - default off
58 58
59our $BDB_POLL_WATCHER; 59our $BDB_POLL_WATCHER;
… …
273sub freeze_mainloop { 273sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
275 275
276 my $guard = Coro::guard { 276 my $guard = Coro::guard {
277 $TICK_WATCHER->start; 277 $TICK_WATCHER->start;
278 $WRITE_RUNTIME_WATCHER->start;
279 }; 278 };
280 $WRITE_RUNTIME_WATCHER->stop;
281 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
282 $guard 280 $guard
283} 281}
284 282
285=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
356 354
357 $coro 355 $coro
358} 356}
359 357
360sub write_runtime { 358sub write_runtime {
361 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
362
363 my $runtime = cf::localdir . "/runtime"; 359 my $runtime = cf::localdir . "/runtime";
364 360
365 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
366 or return; 362 or return;
367 363
… …
2372 return; 2368 return;
2373 } 2369 }
2374 2370
2375 warn "reloading..."; 2371 warn "reloading...";
2376 2372
2377 warn "cancelling server ticker"; 2373 warn "entering sync_job";
2378 $TICK_WATCHER->cancel;
2379 2374
2375 cf::sync_job {
2376 cf::write_runtime; # external watchdog should not bark
2380 cf::emergency_save; 2377 cf::emergency_save;
2378 cf::write_runtime; # external watchdog should not bark
2381 2379
2382 eval { 2380 warn "syncing database to disk";
2381 BDB::db_env_txn_checkpoint $DB_ENV;
2382
2383 # if anything goes wrong in here, we should simply crash as we already saved 2383 # if anything goes wrong in here, we should simply crash as we already saved
2384 2384
2385 warn "cancelling all WF_AUTOCANCEL watchers"; 2385 warn "cancelling all WF_AUTOCANCEL watchers";
2386 for (Event::all_watchers) { 2386 for (Event::all_watchers) {
2387 $_->cancel if $_->data & WF_AUTOCANCEL; 2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2388 } 2388 }
2389
2390 warn "syncing database to disk";
2391 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2392 2389
2393 warn "flushing outstanding aio requests"; 2390 warn "flushing outstanding aio requests";
2394 for (;;) { 2391 for (;;) {
2395 BDB::flush; 2392 BDB::flush;
2396 IO::AIO::flush; 2393 IO::AIO::flush;
… …
2470 reattach $_ for values %MAP; 2467 reattach $_ for values %MAP;
2471 2468
2472 warn "loading reloadable resources"; 2469 warn "loading reloadable resources";
2473 load_resources; 2470 load_resources;
2474 2471
2475 warn "restarting server ticker"; 2472 warn "leaving sync_job";
2476 2473
2477 $TICK_WATCHER->start; 2474 1
2478 }; 2475 } or do {
2479
2480 if ($@) {
2481 warn $@; 2476 warn $@;
2482 warn "error while reloading, exiting."; 2477 warn "error while reloading, exiting.";
2483 exit 1; 2478 exit 1;
2484 } 2479 };
2485 2480
2486 warn "reloaded"; 2481 warn "reloaded";
2487}; 2482};
2488 2483
2489our $RELOAD_WATCHER; # used only during reload 2484our $RELOAD_WATCHER; # used only during reload
… …
2530 2525
2531 cf::server_tick; # one server iteration 2526 cf::server_tick; # one server iteration
2532 $RUNTIME += $TICK; 2527 $RUNTIME += $TICK;
2533 $NEXT_TICK += $TICK; 2528 $NEXT_TICK += $TICK;
2534 2529
2530 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2531 $NEXT_RUNTIME_WRITE = $NOW + 10;
2532 Coro::async_pool {
2533 write_runtime
2534 or warn "ERROR: unable to write runtime file: $!";
2535 };
2536 }
2537
2538
2535 $WAIT_FOR_TICK->broadcast; 2539 $WAIT_FOR_TICK->broadcast;
2536 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2540 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2537 2541
2538 Event::sweep;
2539 Coro::cede_notself;
2540
2541# my $AFTER = Event::time; 2542# my $AFTER = Event::time;
2542# warn $AFTER - $NOW;#d# 2543# warn $AFTER - $NOW;#d#
2543 2544
2544 # if we are delayed by four ticks or more, skip them all 2545 # if we are delayed by four ticks or more, skip them all
2545 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2546 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2604 2605
2605 undef $Coro::AIO::WATCHER; 2606 undef $Coro::AIO::WATCHER;
2606 IO::AIO::max_poll_time $TICK * 0.1; 2607 IO::AIO::max_poll_time $TICK * 0.1;
2607 $AIO_POLL_WATCHER = Event->io ( 2608 $AIO_POLL_WATCHER = Event->io (
2608 reentrant => 0, 2609 reentrant => 0,
2610 data => WF_AUTOCANCEL,
2609 fd => IO::AIO::poll_fileno, 2611 fd => IO::AIO::poll_fileno,
2610 poll => 'r', 2612 poll => 'r',
2611 prio => 6, 2613 prio => 6,
2612 data => WF_AUTOCANCEL,
2613 cb => \&IO::AIO::poll_cb, 2614 cb => \&IO::AIO::poll_cb,
2614 ); 2615 );
2615} 2616}
2616 2617
2617$WRITE_RUNTIME_WATCHER = Event->timer (
2618 reentrant => 0,
2619 data => WF_AUTOCANCEL,
2620 after => 1,
2621 interval => 10,
2622 prio => 6, # keep it lowest so it acts like a watchdog
2623 cb => Coro::unblock_sub {
2624 write_runtime
2625 or warn "ERROR: unable to write runtime file: $!";
2626 },
2627);
2628
2629END { cf::emergency_save } 2618END { cf::emergency_save }
2630 2619
26311 26201
2632 2621

Diff Legend

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