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.210 by root, Mon Feb 12 01:32:49 2007 UTC vs.
Revision 1.220 by root, Sat Feb 17 23:54:35 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 {
359 my $guard = cf::lock_acquire "write_runtime";
360
361 my $runtime = cf::localdir . "/runtime"; 361 my $runtime = cf::localdir . "/runtime";
362 362
363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
364 or return; 364 or return;
365 365
… …
787 } 787 }
788 } else { 788 } else {
789 aio_unlink $filename; 789 aio_unlink $filename;
790 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
791 } 791 }
792
793 #d##TODO# nuke non .map-files if exist
794 if ($filename =~ s/\.map$//) {
795 aio_unlink $filename;
796 aio_unlink "$filename.pst";
797 }
798 } 792 }
799} 793}
800 794
801sub object_freezer_as_string { 795sub object_freezer_as_string {
802 my ($rdata, $objs) = @_; 796 my ($rdata, $objs) = @_;
… …
808 802
809sub object_thawer_load { 803sub object_thawer_load {
810 my ($filename) = @_; 804 my ($filename) = @_;
811 805
812 my ($data, $av); 806 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
816 807
817 (aio_load $filename, $data) >= 0 808 (aio_load $filename, $data) >= 0
818 or return; 809 or return;
819 810
820 unless (aio_stat "$filename.pst") { 811 unless (aio_stat "$filename.pst") {
… …
1039=cut 1030=cut
1040 1031
1041sub quit_character { 1032sub quit_character {
1042 my ($pl) = @_; 1033 my ($pl) = @_;
1043 1034
1035 my $name = $pl->ob->name;
1036
1044 $pl->{deny_save} = 1; 1037 $pl->{deny_save} = 1;
1045 $pl->password ("*"); # this should lock out the player until we nuked the dir 1038 $pl->password ("*"); # this should lock out the player until we nuked the dir
1046 1039
1047 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1040 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1048 $pl->deactivate; 1041 $pl->deactivate;
… …
1052 my $path = playerdir $pl; 1045 my $path = playerdir $pl;
1053 my $temp = "$path~$cf::RUNTIME~deleting~"; 1046 my $temp = "$path~$cf::RUNTIME~deleting~";
1054 aio_rename $path, $temp; 1047 aio_rename $path, $temp;
1055 delete $cf::PLAYER{$pl->ob->name}; 1048 delete $cf::PLAYER{$pl->ob->name};
1056 $pl->destroy; 1049 $pl->destroy;
1050
1051 my $prefix = qr<^~\Q$name\E/>;
1052
1053 # nuke player maps
1054 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1055
1057 IO::AIO::aio_rmtree $temp; 1056 IO::AIO::aio_rmtree $temp;
1058} 1057}
1059 1058
1060=item cf::player::list_logins 1059=item cf::player::list_logins
1061 1060
… …
1307 my ($self) = @_; 1306 my ($self) = @_;
1308 1307
1309 utf8::encode (my $save = $self->save_path); 1308 utf8::encode (my $save = $self->save_path);
1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1312
1313 #d#TODO remove .map and also nuke
1314 $save =~ s/\.map// or return;#d#
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1317} 1311}
1318 1312
1319sub load_header_from($) { 1313sub load_header_from($) {
1320 my ($self, $path) = @_; 1314 my ($self, $path) = @_;
1321 1315
… …
1820 $map->load; 1814 $map->load;
1821 $map->load_diag; 1815 $map->load_diag;
1822 1816
1823 return unless $self->contr->active; 1817 return unless $self->contr->active;
1824 $self->activate_recursive; 1818 $self->activate_recursive;
1819
1820 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1825 $self->enter_map ($map, $x, $y); 1821 $self->enter_map ($map, $x, $y);
1826} 1822}
1827 1823
1828cf::player->attach ( 1824cf::player->attach (
1829 on_logout => sub { 1825 on_logout => sub {
… …
1842 # try to abort aborted map switching on player login :) 1838 # try to abort aborted map switching on player login :)
1843 # should happen only on crashes 1839 # should happen only on crashes
1844 if ($pl->ob->{_link_pos}) { 1840 if ($pl->ob->{_link_pos}) {
1845 $pl->ob->enter_link; 1841 $pl->ob->enter_link;
1846 (async { 1842 (async {
1847 # we need this sleep as the login has a concurrent enter_exit running
1848 # and this sleep increases chances of the player not ending up in scorn
1849 $pl->ob->reply (undef, 1843 $pl->ob->reply (undef,
1850 "There was an internal problem at your last logout, " 1844 "There was an internal problem at your last logout, "
1851 . "the server will try to bring you to your intended destination in a second.", 1845 . "the server will try to bring you to your intended destination in a second.",
1852 cf::NDI_RED); 1846 cf::NDI_RED);
1847 # we need this sleep as the login has a concurrent enter_exit running
1848 # and this sleep increases chances of the player not ending up in scorn
1853 Coro::Timer::sleep 1; 1849 Coro::Timer::sleep 1;
1854 $pl->ob->leave_link; 1850 $pl->ob->leave_link;
1855 })->prio (2); 1851 })->prio (2);
1856 } 1852 }
1857 }, 1853 },
… …
2256} 2252}
2257 2253
2258############################################################################# 2254#############################################################################
2259# the server's init and main functions 2255# the server's init and main functions
2260 2256
2261sub load_resources { 2257sub init_resources {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2258 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2263 or die "unable to load regions file\n";#d# 2259 or die "unable to load regions file\n";#d#
2264} 2260}
2265 2261
2266sub cfg_load { 2262sub cfg_load {
2267 open my $fh, "<:utf8", cf::confdir . "/config" 2263 open my $fh, "<:utf8", cf::confdir . "/config"
… …
2283 warn $@ if $@; 2279 warn $@ if $@;
2284 } 2280 }
2285} 2281}
2286 2282
2287sub init { 2283sub init {
2288 load_resources; 2284 init_resources;
2289} 2285}
2290 2286
2291sub main { 2287sub main {
2292 # we must not ever block the main coroutine 2288 # we must not ever block the main coroutine
2293 local $Coro::idle = sub { 2289 local $Coro::idle = sub {
… …
2354 }; 2350 };
2355 2351
2356 warn "leave emergency perl save\n"; 2352 warn "leave emergency perl save\n";
2357} 2353}
2358 2354
2355sub post_cleanup {
2356 my ($make_core) = @_;
2357
2358 warn Carp::longmess "post_cleanup backtrace"
2359 if $make_core;
2360}
2361
2359sub reload() { 2362sub reload() {
2360 # can/must only be called in main 2363 # can/must only be called in main
2361 if ($Coro::current != $Coro::main) { 2364 if ($Coro::current != $Coro::main) {
2362 warn "can only reload from main coroutine"; 2365 warn "can only reload from main coroutine";
2363 return; 2366 return;
2364 } 2367 }
2365 2368
2366 warn "reloading..."; 2369 warn "reloading...";
2367 2370
2368 warn "cancelling server ticker"; 2371 warn "entering sync_job";
2369 $TICK_WATCHER->cancel;
2370 2372
2373 cf::sync_job {
2374 cf::write_runtime; # external watchdog should not bark
2371 cf::emergency_save; 2375 cf::emergency_save;
2376 cf::write_runtime; # external watchdog should not bark
2372 2377
2373 eval { 2378 warn "syncing database to disk";
2379 BDB::db_env_txn_checkpoint $DB_ENV;
2380
2374 # if anything goes wrong in here, we should simply crash as we already saved 2381 # if anything goes wrong in here, we should simply crash as we already saved
2375 2382
2376 warn "cancelling all WF_AUTOCANCEL watchers"; 2383 warn "cancelling all WF_AUTOCANCEL watchers";
2377 for (Event::all_watchers) { 2384 for (Event::all_watchers) {
2378 $_->cancel if $_->data & WF_AUTOCANCEL; 2385 $_->cancel if $_->data & WF_AUTOCANCEL;
2379 } 2386 }
2380
2381 warn "syncing database to disk";
2382 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2383 2387
2384 warn "flushing outstanding aio requests"; 2388 warn "flushing outstanding aio requests";
2385 for (;;) { 2389 for (;;) {
2386 BDB::flush; 2390 BDB::flush;
2387 IO::AIO::flush; 2391 IO::AIO::flush;
… …
2459 _global_reattach; 2463 _global_reattach;
2460 warn "reattaching attachments to maps"; 2464 warn "reattaching attachments to maps";
2461 reattach $_ for values %MAP; 2465 reattach $_ for values %MAP;
2462 2466
2463 warn "loading reloadable resources"; 2467 warn "loading reloadable resources";
2464 load_resources; 2468 init_resources;
2465 2469
2466 warn "restarting server ticker"; 2470 warn "leaving sync_job";
2467 2471
2468 $TICK_WATCHER->start; 2472 1
2469 }; 2473 } or do {
2470
2471 if ($@) {
2472 warn $@; 2474 warn $@;
2473 warn "error while reloading, exiting."; 2475 warn "error while reloading, exiting.";
2474 exit 1; 2476 exit 1;
2475 } 2477 };
2476 2478
2477 warn "reloaded"; 2479 warn "reloaded";
2478}; 2480};
2479 2481
2480our $RELOAD_WATCHER; # used only during reload 2482our $RELOAD_WATCHER; # used only during reload
… …
2521 2523
2522 cf::server_tick; # one server iteration 2524 cf::server_tick; # one server iteration
2523 $RUNTIME += $TICK; 2525 $RUNTIME += $TICK;
2524 $NEXT_TICK += $TICK; 2526 $NEXT_TICK += $TICK;
2525 2527
2528 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2529 $NEXT_RUNTIME_WRITE = $NOW + 10;
2530 Coro::async_pool {
2531 write_runtime
2532 or warn "ERROR: unable to write runtime file: $!";
2533 };
2534 }
2535
2526 $WAIT_FOR_TICK->broadcast; 2536 $WAIT_FOR_TICK->broadcast;
2527 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2537 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2528 2538
2529 Event::sweep;
2530 Coro::cede_notself;
2531
2532# my $AFTER = Event::time; 2539# my $AFTER = Event::time;
2533# warn $AFTER - $NOW;#d# 2540# warn $AFTER - $NOW;#d#
2534 2541
2535 # if we are delayed by four ticks or more, skip them all 2542 # if we are delayed by four ticks or more, skip them all
2536 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2543 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2595 2602
2596 undef $Coro::AIO::WATCHER; 2603 undef $Coro::AIO::WATCHER;
2597 IO::AIO::max_poll_time $TICK * 0.1; 2604 IO::AIO::max_poll_time $TICK * 0.1;
2598 $AIO_POLL_WATCHER = Event->io ( 2605 $AIO_POLL_WATCHER = Event->io (
2599 reentrant => 0, 2606 reentrant => 0,
2607 data => WF_AUTOCANCEL,
2600 fd => IO::AIO::poll_fileno, 2608 fd => IO::AIO::poll_fileno,
2601 poll => 'r', 2609 poll => 'r',
2602 prio => 6, 2610 prio => 6,
2603 data => WF_AUTOCANCEL,
2604 cb => \&IO::AIO::poll_cb, 2611 cb => \&IO::AIO::poll_cb,
2605 ); 2612 );
2606} 2613}
2607 2614
2608$WRITE_RUNTIME_WATCHER = Event->timer (
2609 reentrant => 0,
2610 data => WF_AUTOCANCEL,
2611 after => 1,
2612 interval => 10,
2613 prio => 6, # keep it lowest so it acts like a watchdog
2614 cb => Coro::unblock_sub {
2615 write_runtime
2616 or warn "ERROR: unable to write runtime file: $!";
2617 },
2618);
2619
2620END { cf::emergency_save } 2615END { cf::emergency_save }
2621 2616
26221 26171
2623 2618

Diff Legend

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