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.216 by root, Thu Feb 15 14:30:21 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 }
… …
787 } 785 }
788 } else { 786 } else {
789 aio_unlink $filename; 787 aio_unlink $filename;
790 aio_unlink "$filename.pst"; 788 aio_unlink "$filename.pst";
791 } 789 }
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 } 790 }
799} 791}
800 792
801sub object_freezer_as_string { 793sub object_freezer_as_string {
802 my ($rdata, $objs) = @_; 794 my ($rdata, $objs) = @_;
… …
808 800
809sub object_thawer_load { 801sub object_thawer_load {
810 my ($filename) = @_; 802 my ($filename) = @_;
811 803
812 my ($data, $av); 804 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
816 805
817 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
818 or return; 807 or return;
819 808
820 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
… …
1307 my ($self) = @_; 1296 my ($self) = @_;
1308 1297
1309 utf8::encode (my $save = $self->save_path); 1298 utf8::encode (my $save = $self->save_path);
1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1299 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1300 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} 1301}
1318 1302
1319sub load_header_from($) { 1303sub load_header_from($) {
1320 my ($self, $path) = @_; 1304 my ($self, $path) = @_;
1321 1305
… …
1609 return if $self->players; 1593 return if $self->players;
1610 return if $self->isa ("ext::map_per_player");#d# 1594 return if $self->isa ("ext::map_per_player");#d#
1611 1595
1612 warn "resetting map ", $self->path;#d# 1596 warn "resetting map ", $self->path;#d#
1613 1597
1598 $self->in_memory (cf::MAP_SWAPPED);
1599
1600 # need to save uniques path
1601 unless ($self->{deny_save}) {
1602 my $uniq = $self->uniq_path; utf8::encode $uniq;
1603
1604 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1605 if $uniq;
1606 }
1607
1614 delete $cf::MAP{$self->path}; 1608 delete $cf::MAP{$self->path};
1615 1609
1616 $self->in_memory (cf::MAP_SWAPPED);
1617 $self->clear; 1610 $self->clear;
1618 1611
1619 $_->clear_links_to ($self) for values %cf::MAP; 1612 $_->clear_links_to ($self) for values %cf::MAP;
1620 1613
1621 $self->unlink_save; 1614 $self->unlink_save;
… …
1811 $map->load; 1804 $map->load;
1812 $map->load_diag; 1805 $map->load_diag;
1813 1806
1814 return unless $self->contr->active; 1807 return unless $self->contr->active;
1815 $self->activate_recursive; 1808 $self->activate_recursive;
1809
1810 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1816 $self->enter_map ($map, $x, $y); 1811 $self->enter_map ($map, $x, $y);
1817} 1812}
1818 1813
1819cf::player->attach ( 1814cf::player->attach (
1820 on_logout => sub { 1815 on_logout => sub {
… …
1833 # try to abort aborted map switching on player login :) 1828 # try to abort aborted map switching on player login :)
1834 # should happen only on crashes 1829 # should happen only on crashes
1835 if ($pl->ob->{_link_pos}) { 1830 if ($pl->ob->{_link_pos}) {
1836 $pl->ob->enter_link; 1831 $pl->ob->enter_link;
1837 (async { 1832 (async {
1838 # we need this sleep as the login has a concurrent enter_exit running
1839 # and this sleep increases chances of the player not ending up in scorn
1840 $pl->ob->reply (undef, 1833 $pl->ob->reply (undef,
1841 "There was an internal problem at your last logout, " 1834 "There was an internal problem at your last logout, "
1842 . "the server will try to bring you to your intended destination in a second.", 1835 . "the server will try to bring you to your intended destination in a second.",
1843 cf::NDI_RED); 1836 cf::NDI_RED);
1837 # we need this sleep as the login has a concurrent enter_exit running
1838 # and this sleep increases chances of the player not ending up in scorn
1844 Coro::Timer::sleep 1; 1839 Coro::Timer::sleep 1;
1845 $pl->ob->leave_link; 1840 $pl->ob->leave_link;
1846 })->prio (2); 1841 })->prio (2);
1847 } 1842 }
1848 }, 1843 },
… …
2197 2192
2198=cut 2193=cut
2199 2194
2200our $DB; 2195our $DB;
2201 2196
2202sub db_load() { 2197sub db_init {
2203 unless ($DB) { 2198 unless ($DB) {
2204 $DB = BDB::db_create $DB_ENV; 2199 $DB = BDB::db_create $DB_ENV;
2205 2200
2206 cf::sync_job { 2201 cf::sync_job {
2207 eval { 2202 eval {
… …
2287 Event::one_event; 2282 Event::one_event;
2288 })->prio (Coro::PRIO_MAX); 2283 })->prio (Coro::PRIO_MAX);
2289 }; 2284 };
2290 2285
2291 cfg_load; 2286 cfg_load;
2292 db_load; 2287 db_init;
2293 load_extensions; 2288 load_extensions;
2294 2289
2295 $TICK_WATCHER->start; 2290 $TICK_WATCHER->start;
2296 Event::loop; 2291 Event::loop;
2297} 2292}
… …
2345 }; 2340 };
2346 2341
2347 warn "leave emergency perl save\n"; 2342 warn "leave emergency perl save\n";
2348} 2343}
2349 2344
2345sub post_cleanup {
2346 my ($make_core) = @_;
2347
2348 warn Carp::longmess "post_cleanup backtrace"
2349 if $make_core;
2350}
2351
2350sub reload() { 2352sub reload() {
2351 # can/must only be called in main 2353 # can/must only be called in main
2352 if ($Coro::current != $Coro::main) { 2354 if ($Coro::current != $Coro::main) {
2353 warn "can only reload from main coroutine"; 2355 warn "can only reload from main coroutine";
2354 return; 2356 return;
2355 } 2357 }
2356 2358
2357 warn "reloading..."; 2359 warn "reloading...";
2358 2360
2359 warn "cancelling server ticker"; 2361 warn "entering sync_job";
2360 $TICK_WATCHER->cancel;
2361 2362
2363 cf::sync_job {
2364 cf::write_runtime; # external watchdog should not bark
2362 cf::emergency_save; 2365 cf::emergency_save;
2366 cf::write_runtime; # external watchdog should not bark
2363 2367
2364 eval { 2368 warn "syncing database to disk";
2369 BDB::db_env_txn_checkpoint $DB_ENV;
2370
2365 # if anything goes wrong in here, we should simply crash as we already saved 2371 # if anything goes wrong in here, we should simply crash as we already saved
2366 2372
2367 warn "cancelling all WF_AUTOCANCEL watchers"; 2373 warn "cancelling all WF_AUTOCANCEL watchers";
2368 for (Event::all_watchers) { 2374 for (Event::all_watchers) {
2369 $_->cancel if $_->data & WF_AUTOCANCEL; 2375 $_->cancel if $_->data & WF_AUTOCANCEL;
2370 } 2376 }
2371
2372 warn "syncing database to disk";
2373 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2374 2377
2375 warn "flushing outstanding aio requests"; 2378 warn "flushing outstanding aio requests";
2376 for (;;) { 2379 for (;;) {
2377 BDB::flush; 2380 BDB::flush;
2378 IO::AIO::flush; 2381 IO::AIO::flush;
… …
2440 require cf; 2443 require cf;
2441 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2442 2445
2443 warn "loading config and database again"; 2446 warn "loading config and database again";
2444 cf::cfg_load; 2447 cf::cfg_load;
2445 cf::db_load;
2446 2448
2447 warn "loading extensions"; 2449 warn "loading extensions";
2448 cf::load_extensions; 2450 cf::load_extensions;
2449 2451
2450 warn "reattaching attachments to objects/players"; 2452 warn "reattaching attachments to objects/players";
… …
2453 reattach $_ for values %MAP; 2455 reattach $_ for values %MAP;
2454 2456
2455 warn "loading reloadable resources"; 2457 warn "loading reloadable resources";
2456 load_resources; 2458 load_resources;
2457 2459
2458 warn "restarting server ticker"; 2460 warn "leaving sync_job";
2459 2461
2460 $TICK_WATCHER->start; 2462 1
2461 }; 2463 } or do {
2462
2463 if ($@) {
2464 warn $@; 2464 warn $@;
2465 warn "error while reloading, exiting."; 2465 warn "error while reloading, exiting.";
2466 exit 1; 2466 exit 1;
2467 } 2467 };
2468 2468
2469 warn "reloaded"; 2469 warn "reloaded";
2470}; 2470};
2471 2471
2472our $RELOAD_WATCHER; # used only during reload 2472our $RELOAD_WATCHER; # used only during reload
… …
2513 2513
2514 cf::server_tick; # one server iteration 2514 cf::server_tick; # one server iteration
2515 $RUNTIME += $TICK; 2515 $RUNTIME += $TICK;
2516 $NEXT_TICK += $TICK; 2516 $NEXT_TICK += $TICK;
2517 2517
2518 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2519 $NEXT_RUNTIME_WRITE = $NOW + 10;
2520 Coro::async_pool {
2521 write_runtime
2522 or warn "ERROR: unable to write runtime file: $!";
2523 };
2524 }
2525
2526
2518 $WAIT_FOR_TICK->broadcast; 2527 $WAIT_FOR_TICK->broadcast;
2519 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2528 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2520 2529
2521 Event::sweep;
2522 Coro::cede_notself;
2523
2524# my $AFTER = Event::time; 2530# my $AFTER = Event::time;
2525# warn $AFTER - $NOW;#d# 2531# warn $AFTER - $NOW;#d#
2526 2532
2527 # if we are delayed by four ticks or more, skip them all 2533 # if we are delayed by four ticks or more, skip them all
2528 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2534 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2587 2593
2588 undef $Coro::AIO::WATCHER; 2594 undef $Coro::AIO::WATCHER;
2589 IO::AIO::max_poll_time $TICK * 0.1; 2595 IO::AIO::max_poll_time $TICK * 0.1;
2590 $AIO_POLL_WATCHER = Event->io ( 2596 $AIO_POLL_WATCHER = Event->io (
2591 reentrant => 0, 2597 reentrant => 0,
2598 data => WF_AUTOCANCEL,
2592 fd => IO::AIO::poll_fileno, 2599 fd => IO::AIO::poll_fileno,
2593 poll => 'r', 2600 poll => 'r',
2594 prio => 6, 2601 prio => 6,
2595 data => WF_AUTOCANCEL,
2596 cb => \&IO::AIO::poll_cb, 2602 cb => \&IO::AIO::poll_cb,
2597 ); 2603 );
2598} 2604}
2599 2605
2600$WRITE_RUNTIME_WATCHER = Event->timer (
2601 reentrant => 0,
2602 data => WF_AUTOCANCEL,
2603 after => 1,
2604 interval => 10,
2605 prio => 6, # keep it lowest so it acts like a watchdog
2606 cb => Coro::unblock_sub {
2607 write_runtime
2608 or warn "ERROR: unable to write runtime file: $!";
2609 },
2610);
2611
2612END { cf::emergency_save } 2606END { cf::emergency_save }
2613 2607
26141 26081
2615 2609

Diff Legend

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