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.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 {
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") {
… …
1307 my ($self) = @_; 1298 my ($self) = @_;
1308 1299
1309 utf8::encode (my $save = $self->save_path); 1300 utf8::encode (my $save = $self->save_path);
1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1302 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} 1303}
1318 1304
1319sub load_header_from($) { 1305sub load_header_from($) {
1320 my ($self, $path) = @_; 1306 my ($self, $path) = @_;
1321 1307
… …
1820 $map->load; 1806 $map->load;
1821 $map->load_diag; 1807 $map->load_diag;
1822 1808
1823 return unless $self->contr->active; 1809 return unless $self->contr->active;
1824 $self->activate_recursive; 1810 $self->activate_recursive;
1811
1812 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1825 $self->enter_map ($map, $x, $y); 1813 $self->enter_map ($map, $x, $y);
1826} 1814}
1827 1815
1828cf::player->attach ( 1816cf::player->attach (
1829 on_logout => sub { 1817 on_logout => sub {
… …
1842 # try to abort aborted map switching on player login :) 1830 # try to abort aborted map switching on player login :)
1843 # should happen only on crashes 1831 # should happen only on crashes
1844 if ($pl->ob->{_link_pos}) { 1832 if ($pl->ob->{_link_pos}) {
1845 $pl->ob->enter_link; 1833 $pl->ob->enter_link;
1846 (async { 1834 (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, 1835 $pl->ob->reply (undef,
1850 "There was an internal problem at your last logout, " 1836 "There was an internal problem at your last logout, "
1851 . "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.",
1852 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
1853 Coro::Timer::sleep 1; 1841 Coro::Timer::sleep 1;
1854 $pl->ob->leave_link; 1842 $pl->ob->leave_link;
1855 })->prio (2); 1843 })->prio (2);
1856 } 1844 }
1857 }, 1845 },
… …
2256} 2244}
2257 2245
2258############################################################################# 2246#############################################################################
2259# the server's init and main functions 2247# the server's init and main functions
2260 2248
2261sub load_resources { 2249sub init_resources {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2250 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2263 or die "unable to load regions file\n";#d# 2251 or die "unable to load regions file\n";#d#
2264} 2252}
2265 2253
2266sub cfg_load { 2254sub cfg_load {
2267 open my $fh, "<:utf8", cf::confdir . "/config" 2255 open my $fh, "<:utf8", cf::confdir . "/config"
… …
2283 warn $@ if $@; 2271 warn $@ if $@;
2284 } 2272 }
2285} 2273}
2286 2274
2287sub init { 2275sub init {
2288 load_resources; 2276 init_resources;
2289} 2277}
2290 2278
2291sub main { 2279sub main {
2292 # we must not ever block the main coroutine 2280 # we must not ever block the main coroutine
2293 local $Coro::idle = sub { 2281 local $Coro::idle = sub {
… …
2372 2360
2373 warn "reloading..."; 2361 warn "reloading...";
2374 2362
2375 warn "entering sync_job"; 2363 warn "entering sync_job";
2376 2364
2377 sync_job { 2365 cf::sync_job {
2378 write_runtime; 2366 cf::write_runtime; # external watchdog should not bark
2379 cf::emergency_save; 2367 cf::emergency_save;
2380 write_runtime; 2368 cf::write_runtime; # external watchdog should not bark
2381 2369
2382 warn "syncing database to disk"; 2370 warn "syncing database to disk";
2383 BDB::db_env_txn_checkpoint $DB_ENV; 2371 BDB::db_env_txn_checkpoint $DB_ENV;
2384 2372
2385 # 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
… …
2467 _global_reattach; 2455 _global_reattach;
2468 warn "reattaching attachments to maps"; 2456 warn "reattaching attachments to maps";
2469 reattach $_ for values %MAP; 2457 reattach $_ for values %MAP;
2470 2458
2471 warn "loading reloadable resources"; 2459 warn "loading reloadable resources";
2472 load_resources; 2460 init_resources;
2473 2461
2474 warn "leaving sync_job"; 2462 warn "leaving sync_job";
2475 2463
2476 1 2464 1
2477 } or do { 2465 } or do {
… …
2526 $NOW = Event::time; 2514 $NOW = Event::time;
2527 2515
2528 cf::server_tick; # one server iteration 2516 cf::server_tick; # one server iteration
2529 $RUNTIME += $TICK; 2517 $RUNTIME += $TICK;
2530 $NEXT_TICK += $TICK; 2518 $NEXT_TICK += $TICK;
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 }
2531 2527
2532 $WAIT_FOR_TICK->broadcast; 2528 $WAIT_FOR_TICK->broadcast;
2533 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2529 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2534 2530
2535# my $AFTER = Event::time; 2531# my $AFTER = Event::time;
… …
2598 2594
2599 undef $Coro::AIO::WATCHER; 2595 undef $Coro::AIO::WATCHER;
2600 IO::AIO::max_poll_time $TICK * 0.1; 2596 IO::AIO::max_poll_time $TICK * 0.1;
2601 $AIO_POLL_WATCHER = Event->io ( 2597 $AIO_POLL_WATCHER = Event->io (
2602 reentrant => 0, 2598 reentrant => 0,
2599 data => WF_AUTOCANCEL,
2603 fd => IO::AIO::poll_fileno, 2600 fd => IO::AIO::poll_fileno,
2604 poll => 'r', 2601 poll => 'r',
2605 prio => 6, 2602 prio => 6,
2606 data => WF_AUTOCANCEL,
2607 cb => \&IO::AIO::poll_cb, 2603 cb => \&IO::AIO::poll_cb,
2608 ); 2604 );
2609} 2605}
2610 2606
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 } 2607END { cf::emergency_save }
2629 2608
26301 26091
2631 2610

Diff Legend

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