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.221 by pippijn, Fri Mar 2 13:32:52 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;
1057}
1058
1059=item $pl->kick
1060
1061Kicks a player out of the game. This destroys the connection.
1062
1063=cut
1064
1065sub kick {
1066 my ($pl, $kicker) = @_;
1067
1068 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1069 $pl->killer ("kicked");
1070 $pl->ns->destroy;
1058} 1071}
1059 1072
1060=item cf::player::list_logins 1073=item cf::player::list_logins
1061 1074
1062Returns am arrayref of all valid playernames in the system, can take a 1075Returns am arrayref of all valid playernames in the system, can take a
… …
1307 my ($self) = @_; 1320 my ($self) = @_;
1308 1321
1309 utf8::encode (my $save = $self->save_path); 1322 utf8::encode (my $save = $self->save_path);
1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1323 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1324 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} 1325}
1318 1326
1319sub load_header_from($) { 1327sub load_header_from($) {
1320 my ($self, $path) = @_; 1328 my ($self, $path) = @_;
1321 1329
… …
1609 return if $self->players; 1617 return if $self->players;
1610 return if $self->isa ("ext::map_per_player");#d# 1618 return if $self->isa ("ext::map_per_player");#d#
1611 1619
1612 warn "resetting map ", $self->path;#d# 1620 warn "resetting map ", $self->path;#d#
1613 1621
1622 $self->in_memory (cf::MAP_SWAPPED);
1623
1624 # need to save uniques path
1625 unless ($self->{deny_save}) {
1626 my $uniq = $self->uniq_path; utf8::encode $uniq;
1627
1628 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1629 if $uniq;
1630 }
1631
1614 delete $cf::MAP{$self->path}; 1632 delete $cf::MAP{$self->path};
1615 1633
1616 $self->in_memory (cf::MAP_SWAPPED);
1617 $self->clear; 1634 $self->clear;
1618 1635
1619 $_->clear_links_to ($self) for values %cf::MAP; 1636 $_->clear_links_to ($self) for values %cf::MAP;
1620 1637
1621 $self->unlink_save; 1638 $self->unlink_save;
… …
1811 $map->load; 1828 $map->load;
1812 $map->load_diag; 1829 $map->load_diag;
1813 1830
1814 return unless $self->contr->active; 1831 return unless $self->contr->active;
1815 $self->activate_recursive; 1832 $self->activate_recursive;
1833
1834 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1816 $self->enter_map ($map, $x, $y); 1835 $self->enter_map ($map, $x, $y);
1817} 1836}
1818 1837
1819cf::player->attach ( 1838cf::player->attach (
1820 on_logout => sub { 1839 on_logout => sub {
… …
1833 # try to abort aborted map switching on player login :) 1852 # try to abort aborted map switching on player login :)
1834 # should happen only on crashes 1853 # should happen only on crashes
1835 if ($pl->ob->{_link_pos}) { 1854 if ($pl->ob->{_link_pos}) {
1836 $pl->ob->enter_link; 1855 $pl->ob->enter_link;
1837 (async { 1856 (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, 1857 $pl->ob->reply (undef,
1841 "There was an internal problem at your last logout, " 1858 "There was an internal problem at your last logout, "
1842 . "the server will try to bring you to your intended destination in a second.", 1859 . "the server will try to bring you to your intended destination in a second.",
1843 cf::NDI_RED); 1860 cf::NDI_RED);
1861 # we need this sleep as the login has a concurrent enter_exit running
1862 # and this sleep increases chances of the player not ending up in scorn
1844 Coro::Timer::sleep 1; 1863 Coro::Timer::sleep 1;
1845 $pl->ob->leave_link; 1864 $pl->ob->leave_link;
1846 })->prio (2); 1865 })->prio (2);
1847 } 1866 }
1848 }, 1867 },
… …
2197 2216
2198=cut 2217=cut
2199 2218
2200our $DB; 2219our $DB;
2201 2220
2202sub db_load() { 2221sub db_init {
2203 unless ($DB) { 2222 unless ($DB) {
2204 $DB = BDB::db_create $DB_ENV; 2223 $DB = BDB::db_create $DB_ENV;
2205 2224
2206 cf::sync_job { 2225 cf::sync_job {
2207 eval { 2226 eval {
… …
2247} 2266}
2248 2267
2249############################################################################# 2268#############################################################################
2250# the server's init and main functions 2269# the server's init and main functions
2251 2270
2252sub load_resources { 2271sub init_resources {
2253 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2272 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2254 or die "unable to load regions file\n";#d# 2273 or die "unable to load regions file\n";#d#
2255} 2274}
2256 2275
2257sub cfg_load { 2276sub cfg_load {
2258 open my $fh, "<:utf8", cf::confdir . "/config" 2277 open my $fh, "<:utf8", cf::confdir . "/config"
… …
2274 warn $@ if $@; 2293 warn $@ if $@;
2275 } 2294 }
2276} 2295}
2277 2296
2278sub init { 2297sub init {
2279 load_resources; 2298 init_resources;
2280} 2299}
2281 2300
2282sub main { 2301sub main {
2283 # we must not ever block the main coroutine 2302 # we must not ever block the main coroutine
2284 local $Coro::idle = sub { 2303 local $Coro::idle = sub {
… …
2287 Event::one_event; 2306 Event::one_event;
2288 })->prio (Coro::PRIO_MAX); 2307 })->prio (Coro::PRIO_MAX);
2289 }; 2308 };
2290 2309
2291 cfg_load; 2310 cfg_load;
2292 db_load; 2311 db_init;
2293 load_extensions; 2312 load_extensions;
2294 2313
2295 $TICK_WATCHER->start; 2314 $TICK_WATCHER->start;
2296 Event::loop; 2315 Event::loop;
2297} 2316}
… …
2345 }; 2364 };
2346 2365
2347 warn "leave emergency perl save\n"; 2366 warn "leave emergency perl save\n";
2348} 2367}
2349 2368
2369sub post_cleanup {
2370 my ($make_core) = @_;
2371
2372 warn Carp::longmess "post_cleanup backtrace"
2373 if $make_core;
2374}
2375
2350sub reload() { 2376sub reload() {
2351 # can/must only be called in main 2377 # can/must only be called in main
2352 if ($Coro::current != $Coro::main) { 2378 if ($Coro::current != $Coro::main) {
2353 warn "can only reload from main coroutine"; 2379 warn "can only reload from main coroutine";
2354 return; 2380 return;
2355 } 2381 }
2356 2382
2357 warn "reloading..."; 2383 warn "reloading...";
2358 2384
2359 warn "cancelling server ticker"; 2385 warn "entering sync_job";
2360 $TICK_WATCHER->cancel;
2361 2386
2387 cf::sync_job {
2388 cf::write_runtime; # external watchdog should not bark
2362 cf::emergency_save; 2389 cf::emergency_save;
2390 cf::write_runtime; # external watchdog should not bark
2363 2391
2364 eval { 2392 warn "syncing database to disk";
2393 BDB::db_env_txn_checkpoint $DB_ENV;
2394
2365 # if anything goes wrong in here, we should simply crash as we already saved 2395 # if anything goes wrong in here, we should simply crash as we already saved
2366 2396
2367 warn "cancelling all WF_AUTOCANCEL watchers"; 2397 warn "cancelling all WF_AUTOCANCEL watchers";
2368 for (Event::all_watchers) { 2398 for (Event::all_watchers) {
2369 $_->cancel if $_->data & WF_AUTOCANCEL; 2399 $_->cancel if $_->data & WF_AUTOCANCEL;
2370 } 2400 }
2371
2372 warn "syncing database to disk";
2373 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2374 2401
2375 warn "flushing outstanding aio requests"; 2402 warn "flushing outstanding aio requests";
2376 for (;;) { 2403 for (;;) {
2377 BDB::flush; 2404 BDB::flush;
2378 IO::AIO::flush; 2405 IO::AIO::flush;
… …
2440 require cf; 2467 require cf;
2441 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2468 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2442 2469
2443 warn "loading config and database again"; 2470 warn "loading config and database again";
2444 cf::cfg_load; 2471 cf::cfg_load;
2445 cf::db_load;
2446 2472
2447 warn "loading extensions"; 2473 warn "loading extensions";
2448 cf::load_extensions; 2474 cf::load_extensions;
2449 2475
2450 warn "reattaching attachments to objects/players"; 2476 warn "reattaching attachments to objects/players";
2451 _global_reattach; 2477 _global_reattach;
2452 warn "reattaching attachments to maps"; 2478 warn "reattaching attachments to maps";
2453 reattach $_ for values %MAP; 2479 reattach $_ for values %MAP;
2454 2480
2455 warn "loading reloadable resources"; 2481 warn "loading reloadable resources";
2456 load_resources; 2482 init_resources;
2457 2483
2458 warn "restarting server ticker"; 2484 warn "leaving sync_job";
2459 2485
2460 $TICK_WATCHER->start; 2486 1
2461 }; 2487 } or do {
2462
2463 if ($@) {
2464 warn $@; 2488 warn $@;
2465 warn "error while reloading, exiting."; 2489 warn "error while reloading, exiting.";
2466 exit 1; 2490 exit 1;
2467 } 2491 };
2468 2492
2469 warn "reloaded"; 2493 warn "reloaded";
2470}; 2494};
2471 2495
2472our $RELOAD_WATCHER; # used only during reload 2496our $RELOAD_WATCHER; # used only during reload
… …
2513 2537
2514 cf::server_tick; # one server iteration 2538 cf::server_tick; # one server iteration
2515 $RUNTIME += $TICK; 2539 $RUNTIME += $TICK;
2516 $NEXT_TICK += $TICK; 2540 $NEXT_TICK += $TICK;
2517 2541
2542 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2543 $NEXT_RUNTIME_WRITE = $NOW + 10;
2544 Coro::async_pool {
2545 write_runtime
2546 or warn "ERROR: unable to write runtime file: $!";
2547 };
2548 }
2549
2518 $WAIT_FOR_TICK->broadcast; 2550 $WAIT_FOR_TICK->broadcast;
2519 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2551 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2520 2552
2521 Event::sweep;
2522 Coro::cede_notself;
2523
2524# my $AFTER = Event::time; 2553# my $AFTER = Event::time;
2525# warn $AFTER - $NOW;#d# 2554# warn $AFTER - $NOW;#d#
2526 2555
2527 # if we are delayed by four ticks or more, skip them all 2556 # if we are delayed by four ticks or more, skip them all
2528 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2557 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2587 2616
2588 undef $Coro::AIO::WATCHER; 2617 undef $Coro::AIO::WATCHER;
2589 IO::AIO::max_poll_time $TICK * 0.1; 2618 IO::AIO::max_poll_time $TICK * 0.1;
2590 $AIO_POLL_WATCHER = Event->io ( 2619 $AIO_POLL_WATCHER = Event->io (
2591 reentrant => 0, 2620 reentrant => 0,
2621 data => WF_AUTOCANCEL,
2592 fd => IO::AIO::poll_fileno, 2622 fd => IO::AIO::poll_fileno,
2593 poll => 'r', 2623 poll => 'r',
2594 prio => 6, 2624 prio => 6,
2595 data => WF_AUTOCANCEL,
2596 cb => \&IO::AIO::poll_cb, 2625 cb => \&IO::AIO::poll_cb,
2597 ); 2626 );
2598} 2627}
2599 2628
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 } 2629END { cf::emergency_save }
2613 2630
26141 26311
2615 2632

Diff Legend

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