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.219 by root, Sat Feb 17 03:19:44 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; 359 my $guard = cf::lock_acquire "write_runtime";
362 360
363 my $runtime = cf::localdir . "/runtime"; 361 my $runtime = cf::localdir . "/runtime";
364 362
365 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
366 or return; 364 or return;
… …
789 } 787 }
790 } else { 788 } else {
791 aio_unlink $filename; 789 aio_unlink $filename;
792 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
793 } 791 }
794
795 #d##TODO# nuke non .map-files if exist
796 if ($filename =~ s/\.map$//) {
797 aio_unlink $filename;
798 aio_unlink "$filename.pst";
799 }
800 } 792 }
801} 793}
802 794
803sub object_freezer_as_string { 795sub object_freezer_as_string {
804 my ($rdata, $objs) = @_; 796 my ($rdata, $objs) = @_;
… …
810 802
811sub object_thawer_load { 803sub object_thawer_load {
812 my ($filename) = @_; 804 my ($filename) = @_;
813 805
814 my ($data, $av); 806 my ($data, $av);
815
816 #d#TODO remove .map if file does not exist
817 aio_stat $filename and $filename =~ s/\.map$//;
818 807
819 (aio_load $filename, $data) >= 0 808 (aio_load $filename, $data) >= 0
820 or return; 809 or return;
821 810
822 unless (aio_stat "$filename.pst") { 811 unless (aio_stat "$filename.pst") {
… …
1309 my ($self) = @_; 1298 my ($self) = @_;
1310 1299
1311 utf8::encode (my $save = $self->save_path); 1300 utf8::encode (my $save = $self->save_path);
1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1314
1315 #d#TODO remove .map and also nuke
1316 $save =~ s/\.map// or return;#d#
1317 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1318 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1319} 1303}
1320 1304
1321sub load_header_from($) { 1305sub load_header_from($) {
1322 my ($self, $path) = @_; 1306 my ($self, $path) = @_;
1323 1307
… …
1822 $map->load; 1806 $map->load;
1823 $map->load_diag; 1807 $map->load_diag;
1824 1808
1825 return unless $self->contr->active; 1809 return unless $self->contr->active;
1826 $self->activate_recursive; 1810 $self->activate_recursive;
1811
1812 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1827 $self->enter_map ($map, $x, $y); 1813 $self->enter_map ($map, $x, $y);
1828} 1814}
1829 1815
1830cf::player->attach ( 1816cf::player->attach (
1831 on_logout => sub { 1817 on_logout => sub {
… …
1844 # try to abort aborted map switching on player login :) 1830 # try to abort aborted map switching on player login :)
1845 # should happen only on crashes 1831 # should happen only on crashes
1846 if ($pl->ob->{_link_pos}) { 1832 if ($pl->ob->{_link_pos}) {
1847 $pl->ob->enter_link; 1833 $pl->ob->enter_link;
1848 (async { 1834 (async {
1849 # we need this sleep as the login has a concurrent enter_exit running
1850 # and this sleep increases chances of the player not ending up in scorn
1851 $pl->ob->reply (undef, 1835 $pl->ob->reply (undef,
1852 "There was an internal problem at your last logout, " 1836 "There was an internal problem at your last logout, "
1853 . "the server will try to bring you to your intended destination in a second.", 1837 . "the server will try to bring you to your intended destination in a second.",
1854 cf::NDI_RED); 1838 cf::NDI_RED);
1839 # we need this sleep as the login has a concurrent enter_exit running
1840 # and this sleep increases chances of the player not ending up in scorn
1855 Coro::Timer::sleep 1; 1841 Coro::Timer::sleep 1;
1856 $pl->ob->leave_link; 1842 $pl->ob->leave_link;
1857 })->prio (2); 1843 })->prio (2);
1858 } 1844 }
1859 }, 1845 },
… …
2258} 2244}
2259 2245
2260############################################################################# 2246#############################################################################
2261# the server's init and main functions 2247# the server's init and main functions
2262 2248
2263sub load_resources { 2249sub init_resources {
2264 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2250 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2265 or die "unable to load regions file\n";#d# 2251 or die "unable to load regions file\n";#d#
2266} 2252}
2267 2253
2268sub cfg_load { 2254sub cfg_load {
2269 open my $fh, "<:utf8", cf::confdir . "/config" 2255 open my $fh, "<:utf8", cf::confdir . "/config"
… …
2285 warn $@ if $@; 2271 warn $@ if $@;
2286 } 2272 }
2287} 2273}
2288 2274
2289sub init { 2275sub init {
2290 load_resources; 2276 init_resources;
2291} 2277}
2292 2278
2293sub main { 2279sub main {
2294 # we must not ever block the main coroutine 2280 # we must not ever block the main coroutine
2295 local $Coro::idle = sub { 2281 local $Coro::idle = sub {
… …
2372 return; 2358 return;
2373 } 2359 }
2374 2360
2375 warn "reloading..."; 2361 warn "reloading...";
2376 2362
2377 warn "cancelling server ticker"; 2363 warn "entering sync_job";
2378 $TICK_WATCHER->cancel;
2379 2364
2365 cf::sync_job {
2366 cf::write_runtime; # external watchdog should not bark
2380 cf::emergency_save; 2367 cf::emergency_save;
2368 cf::write_runtime; # external watchdog should not bark
2381 2369
2382 eval { 2370 warn "syncing database to disk";
2371 BDB::db_env_txn_checkpoint $DB_ENV;
2372
2383 # if anything goes wrong in here, we should simply crash as we already saved 2373 # if anything goes wrong in here, we should simply crash as we already saved
2384 2374
2385 warn "cancelling all WF_AUTOCANCEL watchers"; 2375 warn "cancelling all WF_AUTOCANCEL watchers";
2386 for (Event::all_watchers) { 2376 for (Event::all_watchers) {
2387 $_->cancel if $_->data & WF_AUTOCANCEL; 2377 $_->cancel if $_->data & WF_AUTOCANCEL;
2388 } 2378 }
2389
2390 warn "syncing database to disk";
2391 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2392 2379
2393 warn "flushing outstanding aio requests"; 2380 warn "flushing outstanding aio requests";
2394 for (;;) { 2381 for (;;) {
2395 BDB::flush; 2382 BDB::flush;
2396 IO::AIO::flush; 2383 IO::AIO::flush;
… …
2468 _global_reattach; 2455 _global_reattach;
2469 warn "reattaching attachments to maps"; 2456 warn "reattaching attachments to maps";
2470 reattach $_ for values %MAP; 2457 reattach $_ for values %MAP;
2471 2458
2472 warn "loading reloadable resources"; 2459 warn "loading reloadable resources";
2473 load_resources; 2460 init_resources;
2474 2461
2475 warn "restarting server ticker"; 2462 warn "leaving sync_job";
2476 2463
2477 $TICK_WATCHER->start; 2464 1
2478 }; 2465 } or do {
2479
2480 if ($@) {
2481 warn $@; 2466 warn $@;
2482 warn "error while reloading, exiting."; 2467 warn "error while reloading, exiting.";
2483 exit 1; 2468 exit 1;
2484 } 2469 };
2485 2470
2486 warn "reloaded"; 2471 warn "reloaded";
2487}; 2472};
2488 2473
2489our $RELOAD_WATCHER; # used only during reload 2474our $RELOAD_WATCHER; # used only during reload
… …
2530 2515
2531 cf::server_tick; # one server iteration 2516 cf::server_tick; # one server iteration
2532 $RUNTIME += $TICK; 2517 $RUNTIME += $TICK;
2533 $NEXT_TICK += $TICK; 2518 $NEXT_TICK += $TICK;
2534 2519
2520 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2521 $NEXT_RUNTIME_WRITE = $NOW + 10;
2522 Coro::async_pool {
2523 write_runtime
2524 or warn "ERROR: unable to write runtime file: $!";
2525 };
2526 }
2527
2535 $WAIT_FOR_TICK->broadcast; 2528 $WAIT_FOR_TICK->broadcast;
2536 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2529 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2537 2530
2538 Event::sweep;
2539 Coro::cede_notself;
2540
2541# my $AFTER = Event::time; 2531# my $AFTER = Event::time;
2542# warn $AFTER - $NOW;#d# 2532# warn $AFTER - $NOW;#d#
2543 2533
2544 # if we are delayed by four ticks or more, skip them all 2534 # if we are delayed by four ticks or more, skip them all
2545 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2535 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2604 2594
2605 undef $Coro::AIO::WATCHER; 2595 undef $Coro::AIO::WATCHER;
2606 IO::AIO::max_poll_time $TICK * 0.1; 2596 IO::AIO::max_poll_time $TICK * 0.1;
2607 $AIO_POLL_WATCHER = Event->io ( 2597 $AIO_POLL_WATCHER = Event->io (
2608 reentrant => 0, 2598 reentrant => 0,
2599 data => WF_AUTOCANCEL,
2609 fd => IO::AIO::poll_fileno, 2600 fd => IO::AIO::poll_fileno,
2610 poll => 'r', 2601 poll => 'r',
2611 prio => 6, 2602 prio => 6,
2612 data => WF_AUTOCANCEL,
2613 cb => \&IO::AIO::poll_cb, 2603 cb => \&IO::AIO::poll_cb,
2614 ); 2604 );
2615} 2605}
2616 2606
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 } 2607END { cf::emergency_save }
2630 2608
26311 26091
2632 2610

Diff Legend

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