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.209 by root, Mon Feb 12 01:25:55 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
… …
1609 return if $self->players; 1595 return if $self->players;
1610 return if $self->isa ("ext::map_per_player");#d# 1596 return if $self->isa ("ext::map_per_player");#d#
1611 1597
1612 warn "resetting map ", $self->path;#d# 1598 warn "resetting map ", $self->path;#d#
1613 1599
1600 $self->in_memory (cf::MAP_SWAPPED);
1601
1602 # need to save uniques path
1603 unless ($self->{deny_save}) {
1604 my $uniq = $self->uniq_path; utf8::encode $uniq;
1605
1606 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1607 if $uniq;
1608 }
1609
1614 delete $cf::MAP{$self->path}; 1610 delete $cf::MAP{$self->path};
1615 1611
1616 $self->in_memory (cf::MAP_SWAPPED);
1617 $self->clear; 1612 $self->clear;
1618 1613
1619 $_->clear_links_to ($self) for values %cf::MAP; 1614 $_->clear_links_to ($self) for values %cf::MAP;
1620 1615
1621 $self->unlink_save; 1616 $self->unlink_save;
… …
1811 $map->load; 1806 $map->load;
1812 $map->load_diag; 1807 $map->load_diag;
1813 1808
1814 return unless $self->contr->active; 1809 return unless $self->contr->active;
1815 $self->activate_recursive; 1810 $self->activate_recursive;
1811
1812 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1816 $self->enter_map ($map, $x, $y); 1813 $self->enter_map ($map, $x, $y);
1817} 1814}
1818 1815
1819cf::player->attach ( 1816cf::player->attach (
1820 on_logout => sub { 1817 on_logout => sub {
… …
1833 # try to abort aborted map switching on player login :) 1830 # try to abort aborted map switching on player login :)
1834 # should happen only on crashes 1831 # should happen only on crashes
1835 if ($pl->ob->{_link_pos}) { 1832 if ($pl->ob->{_link_pos}) {
1836 $pl->ob->enter_link; 1833 $pl->ob->enter_link;
1837 (async { 1834 (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, 1835 $pl->ob->reply (undef,
1841 "There was an internal problem at your last logout, " 1836 "There was an internal problem at your last logout, "
1842 . "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.",
1843 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
1844 Coro::Timer::sleep 1; 1841 Coro::Timer::sleep 1;
1845 $pl->ob->leave_link; 1842 $pl->ob->leave_link;
1846 })->prio (2); 1843 })->prio (2);
1847 } 1844 }
1848 }, 1845 },
… …
2197 2194
2198=cut 2195=cut
2199 2196
2200our $DB; 2197our $DB;
2201 2198
2199sub db_init {
2202unless ($DB) { 2200 unless ($DB) {
2203 $DB = BDB::db_create $DB_ENV; 2201 $DB = BDB::db_create $DB_ENV;
2204 2202
2205 cf::sync_job { 2203 cf::sync_job {
2206 eval { 2204 eval {
2207 $DB->set_flags (BDB::CHKSUM); 2205 $DB->set_flags (BDB::CHKSUM);
2208 2206
2209 BDB::db_open $DB, undef, "db", undef, BDB::BTREE, 2207 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2210 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2208 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2211 cf::cleanup "db_open(db): $!" if $!; 2209 cf::cleanup "db_open(db): $!" if $!;
2210 };
2211 cf::cleanup "db_open(db): $@" if $@;
2212 }; 2212 };
2213 cf::cleanup "db_open(db): $@" if $@;
2214 };
2215 2213
2216 my $path = cf::localdir . "/database.pst"; 2214 my $path = cf::localdir . "/database.pst";
2217 if (stat $path) { 2215 if (stat $path) {
2218 cf::sync_job { 2216 cf::sync_job {
2219 my $pst = Storable::retrieve $path; 2217 my $pst = Storable::retrieve $path;
2220 2218
2221 cf::db_put (board => data => $pst->{board}); 2219 cf::db_put (board => data => $pst->{board});
2222 cf::db_put (guildrules => data => $pst->{guildrules}); 2220 cf::db_put (guildrules => data => $pst->{guildrules});
2223 cf::db_put (rent => balance => $pst->{rent}{balance}); 2221 cf::db_put (rent => balance => $pst->{rent}{balance});
2224 BDB::db_env_txn_checkpoint $DB_ENV; 2222 BDB::db_env_txn_checkpoint $DB_ENV;
2225 2223
2226 unlink $path; 2224 unlink $path;
2225 };
2227 }; 2226 }
2228 } 2227 }
2229} 2228}
2230 2229
2231sub db_get($$) { 2230sub db_get($$) {
2232 my $key = "$_[0]/$_[1]"; 2231 my $key = "$_[0]/$_[1]";
… …
2245} 2244}
2246 2245
2247############################################################################# 2246#############################################################################
2248# the server's init and main functions 2247# the server's init and main functions
2249 2248
2250sub load_resources { 2249sub init_resources {
2251 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2250 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2252 or die "unable to load regions file\n";#d# 2251 or die "unable to load regions file\n";#d#
2253} 2252}
2254 2253
2255sub cfg_load { 2254sub cfg_load {
2256 open my $fh, "<:utf8", cf::confdir . "/config" 2255 open my $fh, "<:utf8", cf::confdir . "/config"
… …
2272 warn $@ if $@; 2271 warn $@ if $@;
2273 } 2272 }
2274} 2273}
2275 2274
2276sub init { 2275sub init {
2277 load_resources; 2276 init_resources;
2278} 2277}
2279 2278
2280sub main { 2279sub main {
2281 # we must not ever block the main coroutine 2280 # we must not ever block the main coroutine
2282 local $Coro::idle = sub { 2281 local $Coro::idle = sub {
… …
2285 Event::one_event; 2284 Event::one_event;
2286 })->prio (Coro::PRIO_MAX); 2285 })->prio (Coro::PRIO_MAX);
2287 }; 2286 };
2288 2287
2289 cfg_load; 2288 cfg_load;
2289 db_init;
2290 load_extensions; 2290 load_extensions;
2291 2291
2292 $TICK_WATCHER->start; 2292 $TICK_WATCHER->start;
2293 Event::loop; 2293 Event::loop;
2294} 2294}
… …
2342 }; 2342 };
2343 2343
2344 warn "leave emergency perl save\n"; 2344 warn "leave emergency perl save\n";
2345} 2345}
2346 2346
2347sub post_cleanup {
2348 my ($make_core) = @_;
2349
2350 warn Carp::longmess "post_cleanup backtrace"
2351 if $make_core;
2352}
2353
2347sub reload() { 2354sub reload() {
2348 # can/must only be called in main 2355 # can/must only be called in main
2349 if ($Coro::current != $Coro::main) { 2356 if ($Coro::current != $Coro::main) {
2350 warn "can only reload from main coroutine"; 2357 warn "can only reload from main coroutine";
2351 return; 2358 return;
2352 } 2359 }
2353 2360
2354 warn "reloading..."; 2361 warn "reloading...";
2355 2362
2356 warn "cancelling server ticker"; 2363 warn "entering sync_job";
2357 $TICK_WATCHER->cancel;
2358 2364
2365 cf::sync_job {
2366 cf::write_runtime; # external watchdog should not bark
2359 cf::emergency_save; 2367 cf::emergency_save;
2368 cf::write_runtime; # external watchdog should not bark
2360 2369
2361 eval { 2370 warn "syncing database to disk";
2371 BDB::db_env_txn_checkpoint $DB_ENV;
2372
2362 # 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
2363 2374
2364 warn "cancelling all WF_AUTOCANCEL watchers"; 2375 warn "cancelling all WF_AUTOCANCEL watchers";
2365 for (Event::all_watchers) { 2376 for (Event::all_watchers) {
2366 $_->cancel if $_->data & WF_AUTOCANCEL; 2377 $_->cancel if $_->data & WF_AUTOCANCEL;
2367 } 2378 }
2368
2369 warn "syncing database to disk";
2370 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2371 2379
2372 warn "flushing outstanding aio requests"; 2380 warn "flushing outstanding aio requests";
2373 for (;;) { 2381 for (;;) {
2374 BDB::flush; 2382 BDB::flush;
2375 IO::AIO::flush; 2383 IO::AIO::flush;
… …
2447 _global_reattach; 2455 _global_reattach;
2448 warn "reattaching attachments to maps"; 2456 warn "reattaching attachments to maps";
2449 reattach $_ for values %MAP; 2457 reattach $_ for values %MAP;
2450 2458
2451 warn "loading reloadable resources"; 2459 warn "loading reloadable resources";
2452 load_resources; 2460 init_resources;
2453 2461
2454 warn "restarting server ticker"; 2462 warn "leaving sync_job";
2455 2463
2456 $TICK_WATCHER->start; 2464 1
2457 }; 2465 } or do {
2458
2459 if ($@) {
2460 warn $@; 2466 warn $@;
2461 warn "error while reloading, exiting."; 2467 warn "error while reloading, exiting.";
2462 exit 1; 2468 exit 1;
2463 } 2469 };
2464 2470
2465 warn "reloaded"; 2471 warn "reloaded";
2466}; 2472};
2467 2473
2468our $RELOAD_WATCHER; # used only during reload 2474our $RELOAD_WATCHER; # used only during reload
… …
2509 2515
2510 cf::server_tick; # one server iteration 2516 cf::server_tick; # one server iteration
2511 $RUNTIME += $TICK; 2517 $RUNTIME += $TICK;
2512 $NEXT_TICK += $TICK; 2518 $NEXT_TICK += $TICK;
2513 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
2514 $WAIT_FOR_TICK->broadcast; 2528 $WAIT_FOR_TICK->broadcast;
2515 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2529 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2516 2530
2517 Event::sweep;
2518 Coro::cede_notself;
2519
2520# my $AFTER = Event::time; 2531# my $AFTER = Event::time;
2521# warn $AFTER - $NOW;#d# 2532# warn $AFTER - $NOW;#d#
2522 2533
2523 # 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
2524 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2535 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2583 2594
2584 undef $Coro::AIO::WATCHER; 2595 undef $Coro::AIO::WATCHER;
2585 IO::AIO::max_poll_time $TICK * 0.1; 2596 IO::AIO::max_poll_time $TICK * 0.1;
2586 $AIO_POLL_WATCHER = Event->io ( 2597 $AIO_POLL_WATCHER = Event->io (
2587 reentrant => 0, 2598 reentrant => 0,
2599 data => WF_AUTOCANCEL,
2588 fd => IO::AIO::poll_fileno, 2600 fd => IO::AIO::poll_fileno,
2589 poll => 'r', 2601 poll => 'r',
2590 prio => 6, 2602 prio => 6,
2591 data => WF_AUTOCANCEL,
2592 cb => \&IO::AIO::poll_cb, 2603 cb => \&IO::AIO::poll_cb,
2593 ); 2604 );
2594} 2605}
2595 2606
2596$WRITE_RUNTIME_WATCHER = Event->timer (
2597 reentrant => 0,
2598 data => WF_AUTOCANCEL,
2599 after => 1,
2600 interval => 10,
2601 prio => 6, # keep it lowest so it acts like a watchdog
2602 cb => Coro::unblock_sub {
2603 write_runtime
2604 or warn "ERROR: unable to write runtime file: $!";
2605 },
2606);
2607
2608END { cf::emergency_save } 2607END { cf::emergency_save }
2609 2608
26101 26091
2611 2610

Diff Legend

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