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.214 by root, Wed Feb 14 00:40:05 2007 UTC vs.
Revision 1.224 by root, Mon Mar 12 21:42:12 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;
… …
354 357
355 $coro 358 $coro
356} 359}
357 360
358sub write_runtime { 361sub write_runtime {
362 my $guard = cf::lock_acquire "write_runtime";
363
359 my $runtime = cf::localdir . "/runtime"; 364 my $runtime = cf::localdir . "/runtime";
360 365
361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 366 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
362 or return; 367 or return;
363 368
… …
785 } 790 }
786 } else { 791 } else {
787 aio_unlink $filename; 792 aio_unlink $filename;
788 aio_unlink "$filename.pst"; 793 aio_unlink "$filename.pst";
789 } 794 }
790
791 #d##TODO# nuke non .map-files if exist
792 if ($filename =~ s/\.map$//) {
793 aio_unlink $filename;
794 aio_unlink "$filename.pst";
795 }
796 } 795 }
797} 796}
798 797
799sub object_freezer_as_string { 798sub object_freezer_as_string {
800 my ($rdata, $objs) = @_; 799 my ($rdata, $objs) = @_;
… …
806 805
807sub object_thawer_load { 806sub object_thawer_load {
808 my ($filename) = @_; 807 my ($filename) = @_;
809 808
810 my ($data, $av); 809 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
814 810
815 (aio_load $filename, $data) >= 0 811 (aio_load $filename, $data) >= 0
816 or return; 812 or return;
817 813
818 unless (aio_stat "$filename.pst") { 814 unless (aio_stat "$filename.pst") {
… …
1037=cut 1033=cut
1038 1034
1039sub quit_character { 1035sub quit_character {
1040 my ($pl) = @_; 1036 my ($pl) = @_;
1041 1037
1038 my $name = $pl->ob->name;
1039
1042 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1043 $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
1044 1042
1045 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1046 $pl->deactivate; 1044 $pl->deactivate;
… …
1050 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1051 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1052 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1053 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1054 $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
1055 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;
1056} 1074}
1057 1075
1058=item cf::player::list_logins 1076=item cf::player::list_logins
1059 1077
1060Returns 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
… …
1305 my ($self) = @_; 1323 my ($self) = @_;
1306 1324
1307 utf8::encode (my $save = $self->save_path); 1325 utf8::encode (my $save = $self->save_path);
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1326 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1327 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311 #d#TODO remove .map and also nuke
1312 $save =~ s/\.map// or return;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1315} 1328}
1316 1329
1317sub load_header_from($) { 1330sub load_header_from($) {
1318 my ($self, $path) = @_; 1331 my ($self, $path) = @_;
1319 1332
… …
1818 $map->load; 1831 $map->load;
1819 $map->load_diag; 1832 $map->load_diag;
1820 1833
1821 return unless $self->contr->active; 1834 return unless $self->contr->active;
1822 $self->activate_recursive; 1835 $self->activate_recursive;
1836
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1823 $self->enter_map ($map, $x, $y); 1838 $self->enter_map ($map, $x, $y);
1824} 1839}
1825 1840
1826cf::player->attach ( 1841cf::player->attach (
1827 on_logout => sub { 1842 on_logout => sub {
… …
1840 # try to abort aborted map switching on player login :) 1855 # try to abort aborted map switching on player login :)
1841 # should happen only on crashes 1856 # should happen only on crashes
1842 if ($pl->ob->{_link_pos}) { 1857 if ($pl->ob->{_link_pos}) {
1843 $pl->ob->enter_link; 1858 $pl->ob->enter_link;
1844 (async { 1859 (async {
1845 # we need this sleep as the login has a concurrent enter_exit running
1846 # and this sleep increases chances of the player not ending up in scorn
1847 $pl->ob->reply (undef, 1860 $pl->ob->reply (undef,
1848 "There was an internal problem at your last logout, " 1861 "There was an internal problem at your last logout, "
1849 . "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.",
1850 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
1851 Coro::Timer::sleep 1; 1866 Coro::Timer::sleep 1;
1852 $pl->ob->leave_link; 1867 $pl->ob->leave_link;
1853 })->prio (2); 1868 })->prio (2);
1854 } 1869 }
1855 }, 1870 },
… …
2254} 2269}
2255 2270
2256############################################################################# 2271#############################################################################
2257# the server's init and main functions 2272# the server's init and main functions
2258 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 1
2295}
2296
2259sub load_resources { 2297sub reload_resources {
2260 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2298 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2261 or die "unable to load regions file\n";#d# 2299 or die "unable to load regions file\n";#d#
2300 load_faces
2301 or die "unable to load faces\n";#d#
2302}
2303
2304sub init {
2305 reload_resources;
2262} 2306}
2263 2307
2264sub cfg_load { 2308sub cfg_load {
2265 open my $fh, "<:utf8", cf::confdir . "/config" 2309 open my $fh, "<:utf8", cf::confdir . "/config"
2266 or return; 2310 or return;
… …
2278 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2322 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2279 and die "WARNING: m(un)lockall failed: $!\n"; 2323 and die "WARNING: m(un)lockall failed: $!\n";
2280 }; 2324 };
2281 warn $@ if $@; 2325 warn $@ if $@;
2282 } 2326 }
2283}
2284
2285sub init {
2286 load_resources;
2287} 2327}
2288 2328
2289sub main { 2329sub main {
2290 # we must not ever block the main coroutine 2330 # we must not ever block the main coroutine
2291 local $Coro::idle = sub { 2331 local $Coro::idle = sub {
… …
2394 Coro::cede; 2434 Coro::cede;
2395 last unless IO::AIO::nreqs || BDB::nreqs; 2435 last unless IO::AIO::nreqs || BDB::nreqs;
2396 warn "iterate..."; 2436 warn "iterate...";
2397 } 2437 }
2398 2438
2439 ++$RELOAD;
2440
2399 warn "cancelling all extension coros"; 2441 warn "cancelling all extension coros";
2400 $_->cancel for values %EXT_CORO; 2442 $_->cancel for values %EXT_CORO;
2401 %EXT_CORO = (); 2443 %EXT_CORO = ();
2402 2444
2403 warn "removing commands"; 2445 warn "removing commands";
… …
2460 2502
2461 warn "loading extensions"; 2503 warn "loading extensions";
2462 cf::load_extensions; 2504 cf::load_extensions;
2463 2505
2464 warn "reattaching attachments to objects/players"; 2506 warn "reattaching attachments to objects/players";
2465 _global_reattach; 2507 _global_reattach; # objects, sockets
2466 warn "reattaching attachments to maps"; 2508 warn "reattaching attachments to maps";
2467 reattach $_ for values %MAP; 2509 reattach $_ for values %MAP;
2510 warn "reattaching attachments to players";
2511 reattach $_ for values %PLAYER;
2468 2512
2469 warn "loading reloadable resources"; 2513 warn "loading reloadable resources";
2470 load_resources; 2514 reload_resources;
2471 2515
2472 warn "leaving sync_job"; 2516 warn "leaving sync_job";
2473 2517
2474 1 2518 1
2475 } or do { 2519 } or do {
… …
2532 Coro::async_pool { 2576 Coro::async_pool {
2533 write_runtime 2577 write_runtime
2534 or warn "ERROR: unable to write runtime file: $!"; 2578 or warn "ERROR: unable to write runtime file: $!";
2535 }; 2579 };
2536 } 2580 }
2537
2538 2581
2539 $WAIT_FOR_TICK->broadcast; 2582 $WAIT_FOR_TICK->broadcast;
2540 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2583 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2541 2584
2542# my $AFTER = Event::time; 2585# my $AFTER = Event::time;

Diff Legend

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