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.212 by root, Tue Feb 13 19:25:44 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
… …
1820 $map->load; 1804 $map->load;
1821 $map->load_diag; 1805 $map->load_diag;
1822 1806
1823 return unless $self->contr->active; 1807 return unless $self->contr->active;
1824 $self->activate_recursive; 1808 $self->activate_recursive;
1809
1810 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1825 $self->enter_map ($map, $x, $y); 1811 $self->enter_map ($map, $x, $y);
1826} 1812}
1827 1813
1828cf::player->attach ( 1814cf::player->attach (
1829 on_logout => sub { 1815 on_logout => sub {
… …
1842 # try to abort aborted map switching on player login :) 1828 # try to abort aborted map switching on player login :)
1843 # should happen only on crashes 1829 # should happen only on crashes
1844 if ($pl->ob->{_link_pos}) { 1830 if ($pl->ob->{_link_pos}) {
1845 $pl->ob->enter_link; 1831 $pl->ob->enter_link;
1846 (async { 1832 (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, 1833 $pl->ob->reply (undef,
1850 "There was an internal problem at your last logout, " 1834 "There was an internal problem at your last logout, "
1851 . "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.",
1852 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
1853 Coro::Timer::sleep 1; 1839 Coro::Timer::sleep 1;
1854 $pl->ob->leave_link; 1840 $pl->ob->leave_link;
1855 })->prio (2); 1841 })->prio (2);
1856 } 1842 }
1857 }, 1843 },
… …
2372 2358
2373 warn "reloading..."; 2359 warn "reloading...";
2374 2360
2375 warn "entering sync_job"; 2361 warn "entering sync_job";
2376 2362
2377 sync_job { 2363 cf::sync_job {
2378 write_runtime; 2364 cf::write_runtime; # external watchdog should not bark
2379 cf::emergency_save; 2365 cf::emergency_save;
2380 write_runtime; 2366 cf::write_runtime; # external watchdog should not bark
2381 2367
2382 warn "syncing database to disk"; 2368 warn "syncing database to disk";
2383 BDB::db_env_txn_checkpoint $DB_ENV; 2369 BDB::db_env_txn_checkpoint $DB_ENV;
2384 2370
2385 # 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
… …
2526 $NOW = Event::time; 2512 $NOW = Event::time;
2527 2513
2528 cf::server_tick; # one server iteration 2514 cf::server_tick; # one server iteration
2529 $RUNTIME += $TICK; 2515 $RUNTIME += $TICK;
2530 $NEXT_TICK += $TICK; 2516 $NEXT_TICK += $TICK;
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
2531 2526
2532 $WAIT_FOR_TICK->broadcast; 2527 $WAIT_FOR_TICK->broadcast;
2533 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2528 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2534 2529
2535# my $AFTER = Event::time; 2530# my $AFTER = Event::time;
… …
2598 2593
2599 undef $Coro::AIO::WATCHER; 2594 undef $Coro::AIO::WATCHER;
2600 IO::AIO::max_poll_time $TICK * 0.1; 2595 IO::AIO::max_poll_time $TICK * 0.1;
2601 $AIO_POLL_WATCHER = Event->io ( 2596 $AIO_POLL_WATCHER = Event->io (
2602 reentrant => 0, 2597 reentrant => 0,
2598 data => WF_AUTOCANCEL,
2603 fd => IO::AIO::poll_fileno, 2599 fd => IO::AIO::poll_fileno,
2604 poll => 'r', 2600 poll => 'r',
2605 prio => 6, 2601 prio => 6,
2606 data => WF_AUTOCANCEL,
2607 cb => \&IO::AIO::poll_cb, 2602 cb => \&IO::AIO::poll_cb,
2608 ); 2603 );
2609} 2604}
2610 2605
2611$WRITE_RUNTIME_WATCHER = Event->timer (
2612 reentrant => 0,
2613 data => WF_AUTOCANCEL,
2614 parked => 1,
2615 after => 1,
2616 interval => 10,
2617 prio => 6, # keep it lowest so it acts like a watchdog
2618 cb => sub {
2619 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
2620
2621 Coro::async_pool {
2622 write_runtime
2623 or warn "ERROR: unable to write runtime file: $!";
2624 };
2625 },
2626);
2627
2628END { cf::emergency_save } 2606END { cf::emergency_save }
2629 2607
26301 26081
2631 2609

Diff Legend

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