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.227 by root, Fri Mar 23 18:32:48 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;
19 21
20use BDB (); 22use BDB ();
21use Data::Dumper; 23use Data::Dumper;
22use Digest::MD5; 24use Digest::MD5;
23use Fcntl; 25use Fcntl;
26use YAML::Syck ();
24use IO::AIO 2.32 (); 27use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 28use Time::HiRes;
27use Compress::LZF; 29use Compress::LZF;
28 30
31# configure various modules to our taste
32#
33Coro::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 34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 35
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 36$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 37
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 38# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 39$YAML::Syck::ImplicitUnicode = 1;
37 40
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 41$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
42
43sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39 44
40our %COMMAND = (); 45our %COMMAND = ();
41our %COMMAND_TIME = (); 46our %COMMAND_TIME = ();
42 47
43our @EXTS = (); # list of extension package names 48our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 49our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 50our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 51our %EXT_MAP = (); # pluggable maps
47 52
53our $RELOAD; # number of reloads so far
48our @EVENT; 54our @EVENT;
49our $LIBDIR = datadir . "/ext"; 55our $LIBDIR = datadir . "/ext";
50 56
51our $TICK = MAX_TIME * 1e-6; 57our $TICK = MAX_TIME * 1e-6;
52our $TICK_WATCHER; 58our $TICK_WATCHER;
… …
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 209 $d
204 } || "[unable to dump $_[0]: '$@']"; 210 } || "[unable to dump $_[0]: '$@']";
205} 211}
206 212
207use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208 214
209=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
210 216
211Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
212 218
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 219=item $json = cf::to_json $ref
221 220
222Converts a perl data structure into its JSON representation. 221Converts a perl data structure into its JSON representation.
223
224=cut
225
226sub to_json($) {
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
228 JSON::Syck::Dump $_[0]
229}
230 222
231=item cf::lock_wait $string 223=item cf::lock_wait $string
232 224
233Wait until the given lock is available. See cf::lock_acquire. 225Wait until the given lock is available. See cf::lock_acquire.
234 226
… …
354 346
355 $coro 347 $coro
356} 348}
357 349
358sub write_runtime { 350sub write_runtime {
351 my $guard = cf::lock_acquire "write_runtime";
352
359 my $runtime = cf::localdir . "/runtime"; 353 my $runtime = cf::localdir . "/runtime";
360 354
361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
362 or return; 356 or return;
363 357
… …
785 } 779 }
786 } else { 780 } else {
787 aio_unlink $filename; 781 aio_unlink $filename;
788 aio_unlink "$filename.pst"; 782 aio_unlink "$filename.pst";
789 } 783 }
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 } 784 }
797} 785}
798 786
799sub object_freezer_as_string { 787sub object_freezer_as_string {
800 my ($rdata, $objs) = @_; 788 my ($rdata, $objs) = @_;
… …
806 794
807sub object_thawer_load { 795sub object_thawer_load {
808 my ($filename) = @_; 796 my ($filename) = @_;
809 797
810 my ($data, $av); 798 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
814 799
815 (aio_load $filename, $data) >= 0 800 (aio_load $filename, $data) >= 0
816 or return; 801 or return;
817 802
818 unless (aio_stat "$filename.pst") { 803 unless (aio_stat "$filename.pst") {
… …
1037=cut 1022=cut
1038 1023
1039sub quit_character { 1024sub quit_character {
1040 my ($pl) = @_; 1025 my ($pl) = @_;
1041 1026
1027 my $name = $pl->ob->name;
1028
1042 $pl->{deny_save} = 1; 1029 $pl->{deny_save} = 1;
1043 $pl->password ("*"); # this should lock out the player until we nuked the dir 1030 $pl->password ("*"); # this should lock out the player until we nuked the dir
1044 1031
1045 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1032 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1046 $pl->deactivate; 1033 $pl->deactivate;
… …
1050 my $path = playerdir $pl; 1037 my $path = playerdir $pl;
1051 my $temp = "$path~$cf::RUNTIME~deleting~"; 1038 my $temp = "$path~$cf::RUNTIME~deleting~";
1052 aio_rename $path, $temp; 1039 aio_rename $path, $temp;
1053 delete $cf::PLAYER{$pl->ob->name}; 1040 delete $cf::PLAYER{$pl->ob->name};
1054 $pl->destroy; 1041 $pl->destroy;
1042
1043 my $prefix = qr<^~\Q$name\E/>;
1044
1045 # nuke player maps
1046 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1047
1055 IO::AIO::aio_rmtree $temp; 1048 IO::AIO::aio_rmtree $temp;
1049}
1050
1051=item $pl->kick
1052
1053Kicks a player out of the game. This destroys the connection.
1054
1055=cut
1056
1057sub kick {
1058 my ($pl, $kicker) = @_;
1059
1060 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1061 $pl->killer ("kicked");
1062 $pl->ns->destroy;
1056} 1063}
1057 1064
1058=item cf::player::list_logins 1065=item cf::player::list_logins
1059 1066
1060Returns am arrayref of all valid playernames in the system, can take a 1067Returns am arrayref of all valid playernames in the system, can take a
… …
1305 my ($self) = @_; 1312 my ($self) = @_;
1306 1313
1307 utf8::encode (my $save = $self->save_path); 1314 utf8::encode (my $save = $self->save_path);
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1316 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} 1317}
1316 1318
1317sub load_header_from($) { 1319sub load_header_from($) {
1318 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1319 1321
… …
1818 $map->load; 1820 $map->load;
1819 $map->load_diag; 1821 $map->load_diag;
1820 1822
1821 return unless $self->contr->active; 1823 return unless $self->contr->active;
1822 $self->activate_recursive; 1824 $self->activate_recursive;
1825
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1823 $self->enter_map ($map, $x, $y); 1827 $self->enter_map ($map, $x, $y);
1824} 1828}
1825 1829
1826cf::player->attach ( 1830cf::player->attach (
1827 on_logout => sub { 1831 on_logout => sub {
… …
1840 # try to abort aborted map switching on player login :) 1844 # try to abort aborted map switching on player login :)
1841 # should happen only on crashes 1845 # should happen only on crashes
1842 if ($pl->ob->{_link_pos}) { 1846 if ($pl->ob->{_link_pos}) {
1843 $pl->ob->enter_link; 1847 $pl->ob->enter_link;
1844 (async { 1848 (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, 1849 $pl->ob->reply (undef,
1848 "There was an internal problem at your last logout, " 1850 "There was an internal problem at your last logout, "
1849 . "the server will try to bring you to your intended destination in a second.", 1851 . "the server will try to bring you to your intended destination in a second.",
1850 cf::NDI_RED); 1852 cf::NDI_RED);
1853 # we need this sleep as the login has a concurrent enter_exit running
1854 # and this sleep increases chances of the player not ending up in scorn
1851 Coro::Timer::sleep 1; 1855 Coro::Timer::sleep 1;
1852 $pl->ob->leave_link; 1856 $pl->ob->leave_link;
1853 })->prio (2); 1857 })->prio (2);
1854 } 1858 }
1855 }, 1859 },
… …
1980 1984
1981sub cf::client::send_drawinfo { 1985sub cf::client::send_drawinfo {
1982 my ($self, $text, $flags) = @_; 1986 my ($self, $text, $flags) = @_;
1983 1987
1984 utf8::encode $text; 1988 utf8::encode $text;
1985 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1986} 1990}
1987 1991
1988 1992
1989=item $success = $client->query ($flags, "text", \&cb) 1993=item $success = $client->query ($flags, "text", \&cb)
1990 1994
… …
2254} 2258}
2255 2259
2256############################################################################# 2260#############################################################################
2257# the server's init and main functions 2261# the server's init and main functions
2258 2262
2263sub load_faces {
2264 my $path = sprintf "%s/faces", cf::datadir;
2265
2266 warn "loading faces from $path\n";
2267
2268 my $faces;
2269 0 < aio_load $path, $faces
2270 or die "$path: $!";
2271
2272 Coro::cede;
2273 $faces = Storable::thaw $faces;
2274 Coro::cede;
2275
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1
2278 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279
2280 while (my ($face, $info) = each %$faces) {
2281 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2284 Coro::cede;
2285 }
2286
2287 while (my ($face, $info) = each %$faces) {
2288 next unless $info->{smooth};
2289 my $idx = cf::face::find $face
2290 or next;
2291 if (my $smooth = cf::face::find $info->{smooth}) {
2292 cf::face::set_smooth $idx, $smooth;
2293 } else {
2294 warn "smooth face '$info->{smooth}' not found for face '$face'";
2295 }
2296 Coro::cede;
2297 }
2298
2299 1
2300}
2301
2259sub load_resources { 2302sub reload_resources {
2260 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2303 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2261 or die "unable to load regions file\n";#d# 2304 or die "unable to load regions file\n";#d#
2305 load_faces
2306 or die "unable to load faces\n";#d#
2307}
2308
2309sub init {
2310 reload_resources;
2262} 2311}
2263 2312
2264sub cfg_load { 2313sub cfg_load {
2265 open my $fh, "<:utf8", cf::confdir . "/config" 2314 open my $fh, "<:utf8", cf::confdir . "/config"
2266 or return; 2315 or return;
… …
2278 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2327 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2279 and die "WARNING: m(un)lockall failed: $!\n"; 2328 and die "WARNING: m(un)lockall failed: $!\n";
2280 }; 2329 };
2281 warn $@ if $@; 2330 warn $@ if $@;
2282 } 2331 }
2283}
2284
2285sub init {
2286 load_resources;
2287} 2332}
2288 2333
2289sub main { 2334sub main {
2290 # we must not ever block the main coroutine 2335 # we must not ever block the main coroutine
2291 local $Coro::idle = sub { 2336 local $Coro::idle = sub {
… …
2394 Coro::cede; 2439 Coro::cede;
2395 last unless IO::AIO::nreqs || BDB::nreqs; 2440 last unless IO::AIO::nreqs || BDB::nreqs;
2396 warn "iterate..."; 2441 warn "iterate...";
2397 } 2442 }
2398 2443
2444 ++$RELOAD;
2445
2399 warn "cancelling all extension coros"; 2446 warn "cancelling all extension coros";
2400 $_->cancel for values %EXT_CORO; 2447 $_->cancel for values %EXT_CORO;
2401 %EXT_CORO = (); 2448 %EXT_CORO = ();
2402 2449
2403 warn "removing commands"; 2450 warn "removing commands";
… …
2460 2507
2461 warn "loading extensions"; 2508 warn "loading extensions";
2462 cf::load_extensions; 2509 cf::load_extensions;
2463 2510
2464 warn "reattaching attachments to objects/players"; 2511 warn "reattaching attachments to objects/players";
2465 _global_reattach; 2512 _global_reattach; # objects, sockets
2466 warn "reattaching attachments to maps"; 2513 warn "reattaching attachments to maps";
2467 reattach $_ for values %MAP; 2514 reattach $_ for values %MAP;
2515 warn "reattaching attachments to players";
2516 reattach $_ for values %PLAYER;
2468 2517
2469 warn "loading reloadable resources"; 2518 warn "loading reloadable resources";
2470 load_resources; 2519 reload_resources;
2471 2520
2472 warn "leaving sync_job"; 2521 warn "leaving sync_job";
2473 2522
2474 1 2523 1
2475 } or do { 2524 } or do {
… …
2532 Coro::async_pool { 2581 Coro::async_pool {
2533 write_runtime 2582 write_runtime
2534 or warn "ERROR: unable to write runtime file: $!"; 2583 or warn "ERROR: unable to write runtime file: $!";
2535 }; 2584 };
2536 } 2585 }
2537
2538 2586
2539 $WAIT_FOR_TICK->broadcast; 2587 $WAIT_FOR_TICK->broadcast;
2540 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2588 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2541 2589
2542# my $AFTER = Event::time; 2590# my $AFTER = Event::time;

Diff Legend

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