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.210 by root, Mon Feb 12 01:32:49 2007 UTC vs.
Revision 1.225 by root, Wed Mar 14 00:04:58 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.5 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
… …
24use IO::AIO 2.32 (); 26use IO::AIO 2.32 ();
25use YAML::Syck (); 27use YAML::Syck ();
26use Time::HiRes; 28use Time::HiRes;
27use Compress::LZF; 29use Compress::LZF;
28 30
31Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 32Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 33$Event::Eval = 1; # no idea why this is required, but it is
32 34
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 35sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 36
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 37# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 38$YAML::Syck::ImplicitUnicode = 1;
… …
43our @EXTS = (); # list of extension package names 45our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 46our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 47our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 48our %EXT_MAP = (); # pluggable maps
47 49
50our $RELOAD; # number of reloads so far
48our @EVENT; 51our @EVENT;
49our $LIBDIR = datadir . "/ext"; 52our $LIBDIR = datadir . "/ext";
50 53
51our $TICK = MAX_TIME * 1e-6; 54our $TICK = MAX_TIME * 1e-6;
52our $TICK_WATCHER; 55our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 56our $AIO_POLL_WATCHER;
54our $WRITE_RUNTIME_WATCHER; 57our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 58our $NEXT_TICK;
56our $NOW; 59our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off 60our $USE_FSYNC = 1; # use fsync to write maps - default off
58 61
59our $BDB_POLL_WATCHER; 62our $BDB_POLL_WATCHER;
… …
273sub freeze_mainloop { 276sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 277 return unless $TICK_WATCHER->is_active;
275 278
276 my $guard = Coro::guard { 279 my $guard = Coro::guard {
277 $TICK_WATCHER->start; 280 $TICK_WATCHER->start;
278 $WRITE_RUNTIME_WATCHER->start;
279 }; 281 };
280 $WRITE_RUNTIME_WATCHER->stop;
281 $TICK_WATCHER->stop; 282 $TICK_WATCHER->stop;
282 $guard 283 $guard
283} 284}
284 285
285=item cf::async { BLOCK } 286=item cf::async { BLOCK }
… …
356 357
357 $coro 358 $coro
358} 359}
359 360
360sub write_runtime { 361sub write_runtime {
362 my $guard = cf::lock_acquire "write_runtime";
363
361 my $runtime = cf::localdir . "/runtime"; 364 my $runtime = cf::localdir . "/runtime";
362 365
363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 366 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
364 or return; 367 or return;
365 368
… …
787 } 790 }
788 } else { 791 } else {
789 aio_unlink $filename; 792 aio_unlink $filename;
790 aio_unlink "$filename.pst"; 793 aio_unlink "$filename.pst";
791 } 794 }
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 } 795 }
799} 796}
800 797
801sub object_freezer_as_string { 798sub object_freezer_as_string {
802 my ($rdata, $objs) = @_; 799 my ($rdata, $objs) = @_;
… …
808 805
809sub object_thawer_load { 806sub object_thawer_load {
810 my ($filename) = @_; 807 my ($filename) = @_;
811 808
812 my ($data, $av); 809 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
816 810
817 (aio_load $filename, $data) >= 0 811 (aio_load $filename, $data) >= 0
818 or return; 812 or return;
819 813
820 unless (aio_stat "$filename.pst") { 814 unless (aio_stat "$filename.pst") {
… …
1039=cut 1033=cut
1040 1034
1041sub quit_character { 1035sub quit_character {
1042 my ($pl) = @_; 1036 my ($pl) = @_;
1043 1037
1038 my $name = $pl->ob->name;
1039
1044 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1045 $pl->password ("*"); # this should lock out the player until we nuked the dir 1041 $pl->password ("*"); # this should lock out the player until we nuked the dir
1046 1042
1047 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1048 $pl->deactivate; 1044 $pl->deactivate;
… …
1052 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1053 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1054 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1055 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1056 $pl->destroy; 1052 $pl->destroy;
1053
1054 my $prefix = qr<^~\Q$name\E/>;
1055
1056 # nuke player maps
1057 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1058
1057 IO::AIO::aio_rmtree $temp; 1059 IO::AIO::aio_rmtree $temp;
1060}
1061
1062=item $pl->kick
1063
1064Kicks a player out of the game. This destroys the connection.
1065
1066=cut
1067
1068sub kick {
1069 my ($pl, $kicker) = @_;
1070
1071 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1072 $pl->killer ("kicked");
1073 $pl->ns->destroy;
1058} 1074}
1059 1075
1060=item cf::player::list_logins 1076=item cf::player::list_logins
1061 1077
1062Returns am arrayref of all valid playernames in the system, can take a 1078Returns am arrayref of all valid playernames in the system, can take a
… …
1307 my ($self) = @_; 1323 my ($self) = @_;
1308 1324
1309 utf8::encode (my $save = $self->save_path); 1325 utf8::encode (my $save = $self->save_path);
1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1326 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1327 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} 1328}
1318 1329
1319sub load_header_from($) { 1330sub load_header_from($) {
1320 my ($self, $path) = @_; 1331 my ($self, $path) = @_;
1321 1332
… …
1820 $map->load; 1831 $map->load;
1821 $map->load_diag; 1832 $map->load_diag;
1822 1833
1823 return unless $self->contr->active; 1834 return unless $self->contr->active;
1824 $self->activate_recursive; 1835 $self->activate_recursive;
1836
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1825 $self->enter_map ($map, $x, $y); 1838 $self->enter_map ($map, $x, $y);
1826} 1839}
1827 1840
1828cf::player->attach ( 1841cf::player->attach (
1829 on_logout => sub { 1842 on_logout => sub {
… …
1842 # try to abort aborted map switching on player login :) 1855 # try to abort aborted map switching on player login :)
1843 # should happen only on crashes 1856 # should happen only on crashes
1844 if ($pl->ob->{_link_pos}) { 1857 if ($pl->ob->{_link_pos}) {
1845 $pl->ob->enter_link; 1858 $pl->ob->enter_link;
1846 (async { 1859 (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, 1860 $pl->ob->reply (undef,
1850 "There was an internal problem at your last logout, " 1861 "There was an internal problem at your last logout, "
1851 . "the server will try to bring you to your intended destination in a second.", 1862 . "the server will try to bring you to your intended destination in a second.",
1852 cf::NDI_RED); 1863 cf::NDI_RED);
1864 # we need this sleep as the login has a concurrent enter_exit running
1865 # and this sleep increases chances of the player not ending up in scorn
1853 Coro::Timer::sleep 1; 1866 Coro::Timer::sleep 1;
1854 $pl->ob->leave_link; 1867 $pl->ob->leave_link;
1855 })->prio (2); 1868 })->prio (2);
1856 } 1869 }
1857 }, 1870 },
… …
1982 1995
1983sub cf::client::send_drawinfo { 1996sub cf::client::send_drawinfo {
1984 my ($self, $text, $flags) = @_; 1997 my ($self, $text, $flags) = @_;
1985 1998
1986 utf8::encode $text; 1999 utf8::encode $text;
1987 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1988} 2001}
1989 2002
1990 2003
1991=item $success = $client->query ($flags, "text", \&cb) 2004=item $success = $client->query ($flags, "text", \&cb)
1992 2005
… …
2256} 2269}
2257 2270
2258############################################################################# 2271#############################################################################
2259# the server's init and main functions 2272# the server's init and main functions
2260 2273
2274sub load_faces {
2275 my $path = sprintf "%s/faces", cf::datadir;
2276
2277 warn "loading faces from $path\n";
2278
2279 my $faces;
2280 0 < aio_load $path, $faces
2281 or die "$path: $!";
2282
2283 Coro::cede;
2284 $faces = Storable::thaw $faces;
2285 Coro::cede;
2286
2287 while (my ($face, $info) = each %$faces) {
2288 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2289 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2290 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2291 Coro::cede;
2292 }
2293
2294 while (my ($face, $info) = each %$faces) {
2295 next unless $info->{smooth};
2296 my $idx = cf::face::find $face
2297 or next;
2298 if (my $smooth = cf::face::find $info->{smooth}) {
2299 cf::face::set_smooth $idx, $smooth;
2300 warn "smooth $idx,$smooth ($face,$info->{smooth})\n";#d#
2301 } else {
2302 warn "smooth face '$info->{smooth}' not found for face '$face'";
2303 }
2304 Coro::cede;
2305 }
2306
2307 1
2308}
2309
2261sub load_resources { 2310sub reload_resources {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2311 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2263 or die "unable to load regions file\n";#d# 2312 or die "unable to load regions file\n";#d#
2313 load_faces
2314 or die "unable to load faces\n";#d#
2315}
2316
2317sub init {
2318 reload_resources;
2264} 2319}
2265 2320
2266sub cfg_load { 2321sub cfg_load {
2267 open my $fh, "<:utf8", cf::confdir . "/config" 2322 open my $fh, "<:utf8", cf::confdir . "/config"
2268 or return; 2323 or return;
… …
2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2335 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2281 and die "WARNING: m(un)lockall failed: $!\n"; 2336 and die "WARNING: m(un)lockall failed: $!\n";
2282 }; 2337 };
2283 warn $@ if $@; 2338 warn $@ if $@;
2284 } 2339 }
2285}
2286
2287sub init {
2288 load_resources;
2289} 2340}
2290 2341
2291sub main { 2342sub main {
2292 # we must not ever block the main coroutine 2343 # we must not ever block the main coroutine
2293 local $Coro::idle = sub { 2344 local $Coro::idle = sub {
… …
2354 }; 2405 };
2355 2406
2356 warn "leave emergency perl save\n"; 2407 warn "leave emergency perl save\n";
2357} 2408}
2358 2409
2410sub post_cleanup {
2411 my ($make_core) = @_;
2412
2413 warn Carp::longmess "post_cleanup backtrace"
2414 if $make_core;
2415}
2416
2359sub reload() { 2417sub reload() {
2360 # can/must only be called in main 2418 # can/must only be called in main
2361 if ($Coro::current != $Coro::main) { 2419 if ($Coro::current != $Coro::main) {
2362 warn "can only reload from main coroutine"; 2420 warn "can only reload from main coroutine";
2363 return; 2421 return;
2364 } 2422 }
2365 2423
2366 warn "reloading..."; 2424 warn "reloading...";
2367 2425
2368 warn "cancelling server ticker"; 2426 warn "entering sync_job";
2369 $TICK_WATCHER->cancel;
2370 2427
2428 cf::sync_job {
2429 cf::write_runtime; # external watchdog should not bark
2371 cf::emergency_save; 2430 cf::emergency_save;
2431 cf::write_runtime; # external watchdog should not bark
2372 2432
2373 eval { 2433 warn "syncing database to disk";
2434 BDB::db_env_txn_checkpoint $DB_ENV;
2435
2374 # if anything goes wrong in here, we should simply crash as we already saved 2436 # if anything goes wrong in here, we should simply crash as we already saved
2375 2437
2376 warn "cancelling all WF_AUTOCANCEL watchers"; 2438 warn "cancelling all WF_AUTOCANCEL watchers";
2377 for (Event::all_watchers) { 2439 for (Event::all_watchers) {
2378 $_->cancel if $_->data & WF_AUTOCANCEL; 2440 $_->cancel if $_->data & WF_AUTOCANCEL;
2379 } 2441 }
2380
2381 warn "syncing database to disk";
2382 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2383 2442
2384 warn "flushing outstanding aio requests"; 2443 warn "flushing outstanding aio requests";
2385 for (;;) { 2444 for (;;) {
2386 BDB::flush; 2445 BDB::flush;
2387 IO::AIO::flush; 2446 IO::AIO::flush;
2388 Coro::cede; 2447 Coro::cede;
2389 last unless IO::AIO::nreqs || BDB::nreqs; 2448 last unless IO::AIO::nreqs || BDB::nreqs;
2390 warn "iterate..."; 2449 warn "iterate...";
2391 } 2450 }
2392 2451
2452 ++$RELOAD;
2453
2393 warn "cancelling all extension coros"; 2454 warn "cancelling all extension coros";
2394 $_->cancel for values %EXT_CORO; 2455 $_->cancel for values %EXT_CORO;
2395 %EXT_CORO = (); 2456 %EXT_CORO = ();
2396 2457
2397 warn "removing commands"; 2458 warn "removing commands";
… …
2454 2515
2455 warn "loading extensions"; 2516 warn "loading extensions";
2456 cf::load_extensions; 2517 cf::load_extensions;
2457 2518
2458 warn "reattaching attachments to objects/players"; 2519 warn "reattaching attachments to objects/players";
2459 _global_reattach; 2520 _global_reattach; # objects, sockets
2460 warn "reattaching attachments to maps"; 2521 warn "reattaching attachments to maps";
2461 reattach $_ for values %MAP; 2522 reattach $_ for values %MAP;
2523 warn "reattaching attachments to players";
2524 reattach $_ for values %PLAYER;
2462 2525
2463 warn "loading reloadable resources"; 2526 warn "loading reloadable resources";
2464 load_resources; 2527 reload_resources;
2465 2528
2466 warn "restarting server ticker"; 2529 warn "leaving sync_job";
2467 2530
2468 $TICK_WATCHER->start; 2531 1
2469 }; 2532 } or do {
2470
2471 if ($@) {
2472 warn $@; 2533 warn $@;
2473 warn "error while reloading, exiting."; 2534 warn "error while reloading, exiting.";
2474 exit 1; 2535 exit 1;
2475 } 2536 };
2476 2537
2477 warn "reloaded"; 2538 warn "reloaded";
2478}; 2539};
2479 2540
2480our $RELOAD_WATCHER; # used only during reload 2541our $RELOAD_WATCHER; # used only during reload
… …
2521 2582
2522 cf::server_tick; # one server iteration 2583 cf::server_tick; # one server iteration
2523 $RUNTIME += $TICK; 2584 $RUNTIME += $TICK;
2524 $NEXT_TICK += $TICK; 2585 $NEXT_TICK += $TICK;
2525 2586
2587 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2588 $NEXT_RUNTIME_WRITE = $NOW + 10;
2589 Coro::async_pool {
2590 write_runtime
2591 or warn "ERROR: unable to write runtime file: $!";
2592 };
2593 }
2594
2526 $WAIT_FOR_TICK->broadcast; 2595 $WAIT_FOR_TICK->broadcast;
2527 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2596 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2528 2597
2529 Event::sweep;
2530 Coro::cede_notself;
2531
2532# my $AFTER = Event::time; 2598# my $AFTER = Event::time;
2533# warn $AFTER - $NOW;#d# 2599# warn $AFTER - $NOW;#d#
2534 2600
2535 # if we are delayed by four ticks or more, skip them all 2601 # if we are delayed by four ticks or more, skip them all
2536 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2602 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2595 2661
2596 undef $Coro::AIO::WATCHER; 2662 undef $Coro::AIO::WATCHER;
2597 IO::AIO::max_poll_time $TICK * 0.1; 2663 IO::AIO::max_poll_time $TICK * 0.1;
2598 $AIO_POLL_WATCHER = Event->io ( 2664 $AIO_POLL_WATCHER = Event->io (
2599 reentrant => 0, 2665 reentrant => 0,
2666 data => WF_AUTOCANCEL,
2600 fd => IO::AIO::poll_fileno, 2667 fd => IO::AIO::poll_fileno,
2601 poll => 'r', 2668 poll => 'r',
2602 prio => 6, 2669 prio => 6,
2603 data => WF_AUTOCANCEL,
2604 cb => \&IO::AIO::poll_cb, 2670 cb => \&IO::AIO::poll_cb,
2605 ); 2671 );
2606} 2672}
2607 2673
2608$WRITE_RUNTIME_WATCHER = Event->timer (
2609 reentrant => 0,
2610 data => WF_AUTOCANCEL,
2611 after => 1,
2612 interval => 10,
2613 prio => 6, # keep it lowest so it acts like a watchdog
2614 cb => Coro::unblock_sub {
2615 write_runtime
2616 or warn "ERROR: unable to write runtime file: $!";
2617 },
2618);
2619
2620END { cf::emergency_save } 2674END { cf::emergency_save }
2621 2675
26221 26761
2623 2677

Diff Legend

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