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.221 by pippijn, Fri Mar 2 13:32:52 2007 UTC vs.
Revision 1.238 by root, Sat Apr 14 07:23:00 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;
21use Coro::Storable;
19 22
20use BDB (); 23use BDB ();
21use Data::Dumper; 24use Data::Dumper;
22use Digest::MD5; 25use Digest::MD5;
23use Fcntl; 26use Fcntl;
27use YAML::Syck ();
24use IO::AIO 2.32 (); 28use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 29use Time::HiRes;
27use Compress::LZF; 30use Compress::LZF;
28 31
32# configure various modules to our taste
33#
34$Storable::canonical = 1; # reduce rsync transfers
35Coro::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 36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 37
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 39
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 40# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 41$YAML::Syck::ImplicitUnicode = 1;
37 42
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 43$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
44
45sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39 46
40our %COMMAND = (); 47our %COMMAND = ();
41our %COMMAND_TIME = (); 48our %COMMAND_TIME = ();
42 49
43our @EXTS = (); # list of extension package names 50our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 51our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 52our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 53our %EXT_MAP = (); # pluggable maps
47 54
55our $RELOAD; # number of reloads so far
48our @EVENT; 56our @EVENT;
49our $LIBDIR = datadir . "/ext"; 57our $LIBDIR = datadir . "/ext";
50 58
51our $TICK = MAX_TIME * 1e-6; 59our $TICK = MAX_TIME * 1e-6;
52our $TICK_WATCHER; 60our $TICK_WATCHER;
… …
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 210 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 211 $d
204 } || "[unable to dump $_[0]: '$@']"; 212 } || "[unable to dump $_[0]: '$@']";
205} 213}
206 214
207use JSON::Syck (); # TODO# replace by JSON::PC once working 215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208 216
209=item $ref = cf::from_json $json 217=item $ref = cf::from_json $json
210 218
211Converts a JSON string into the corresponding perl data structure. 219Converts a JSON string into the corresponding perl data structure.
212 220
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 221=item $json = cf::to_json $ref
221 222
222Converts a perl data structure into its JSON representation. 223Converts 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 224
231=item cf::lock_wait $string 225=item cf::lock_wait $string
232 226
233Wait until the given lock is available. See cf::lock_acquire. 227Wait until the given lock is available. See cf::lock_acquire.
234 228
… …
379 373
380 aio_rename "$runtime~", $runtime 374 aio_rename "$runtime~", $runtime
381 and return; 375 and return;
382 376
383 1 377 1
378}
379
380=item cf::datalog type => key => value, ...
381
382Log a datalog packet of the given type with the given key-value pairs.
383
384=cut
385
386sub datalog($@) {
387 my ($type, %kv) = @_;
388 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384} 389}
385 390
386=back 391=back
387 392
388=cut 393=cut
… …
960} 965}
961 966
962sub path($) { 967sub path($) {
963 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964 969
965 (playerdir $login) . "/$login.pl" 970 (playerdir $login) . "/playerdata"
966} 971}
967 972
968sub find_active($) { 973sub find_active($) {
969 $cf::PLAYER{$_[0]} 974 $cf::PLAYER{$_[0]}
970 and $cf::PLAYER{$_[0]}->active 975 and $cf::PLAYER{$_[0]}->active
… …
983 my $login = $_[0]; 988 my $login = $_[0];
984 989
985 my $guard = cf::lock_acquire "user_find:$login"; 990 my $guard = cf::lock_acquire "user_find:$login";
986 991
987 $cf::PLAYER{$_[0]} || do { 992 $cf::PLAYER{$_[0]} || do {
993 # rename old playerfiles to new ones
994 #TODO: remove when no longer required
995 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
996 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
997 aio_unlink +(playerdir $login) . "/$login.pl.pst";
998 aio_unlink +(playerdir $login) . "/$login.pl";
999
988 my $pl = load_pl path $login 1000 my $pl = load_pl path $login
989 or return; 1001 or return;
990 $cf::PLAYER{$login} = $pl 1002 $cf::PLAYER{$login} = $pl
991 } 1003 }
992 } 1004 }
… …
1121 } 1133 }
1122 1134
1123 \@paths 1135 \@paths
1124} 1136}
1125 1137
1126=item $player->ext_reply ($msgid, $msgtype, %msg) 1138=item $player->ext_reply ($msgid, %msg)
1127 1139
1128Sends an ext reply to the player. 1140Sends an ext reply to the player.
1129 1141
1130=cut 1142=cut
1131 1143
1132sub ext_reply($$$%) { 1144sub ext_reply($$%) {
1133 my ($self, $id, %msg) = @_; 1145 my ($self, $id, %msg) = @_;
1134 1146
1135 $msg{msgid} = $id; 1147 $msg{msgid} = $id;
1136 1148
1137 $self->send ("ext " . cf::to_json \%msg); 1149 $self->send ("ext " . cf::to_json \%msg);
1138} 1150}
1139 1151
1140package cf; 1152=item $player->ext_event ($type, %msg)
1153
1154Sends an ext event to the client.
1155
1156=cut
1157
1158sub ext_event($$%) {
1159 my ($self, $type, %msg) = @_;
1160
1161 $self->ns->ext_event ($type, %msg);
1162}
1163
1164=head3 cf::region
1165
1166=over 4
1167
1168=cut
1169
1170package cf::region;
1171
1172=item cf::region::find_by_path $path
1173
1174Tries to decuce the probable region for a map knowing only its path.
1175
1176=cut
1177
1178sub find_by_path($) {
1179 my ($path) = @_;
1180
1181 my ($match, $specificity);
1182
1183 for my $region (list) {
1184 if ($region->match && $path =~ $region->match) {
1185 ($match, $specificity) = ($region, $region->specificity)
1186 if $region->specificity > $specificity;
1187 }
1188 }
1189
1190 $match
1191}
1141 1192
1142=back 1193=back
1143
1144 1194
1145=head3 cf::map 1195=head3 cf::map
1146 1196
1147=over 4 1197=over 4
1148 1198
… …
1379 $self->load_header_orig 1429 $self->load_header_orig
1380 or return; 1430 or return;
1381 $self->prepare_orig; 1431 $self->prepare_orig;
1382 } 1432 }
1383 1433
1434 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region;
1436
1384 1 1437 1
1385} 1438}
1386 1439
1387sub find; 1440sub find;
1388sub find { 1441sub find {
… …
1950 2003
1951 return unless $self->type == cf::PLAYER; 2004 return unless $self->type == cf::PLAYER;
1952 2005
1953 if ($exit->slaying eq "/!") { 2006 if ($exit->slaying eq "/!") {
1954 #TODO: this should de-fi-ni-te-ly not be a sync-job 2007 #TODO: this should de-fi-ni-te-ly not be a sync-job
2008 # the problem is that $exit might not survive long enough
2009 # so it needs to be done right now, right here
1955 cf::sync_job { prepare_random_map $exit }; 2010 cf::sync_job { prepare_random_map $exit };
1956 } 2011 }
1957 2012
1958 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2013 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1959 my $hp = $exit->stats->hp; 2014 my $hp = $exit->stats->hp;
… …
1967 $self->goto ($slaying, $hp, $sp); 2022 $self->goto ($slaying, $hp, $sp);
1968 2023
1969 1; 2024 1;
1970 }) { 2025 }) {
1971 $self->message ("Something went wrong deep within the crossfire server. " 2026 $self->message ("Something went wrong deep within the crossfire server. "
1972 . "I'll try to bring you back to the map you were before. " 2027 . "I'll try to bring you back to the map you were before. "
1973 . "Please report this to the dungeon master!", 2028 . "Please report this to the dungeon master!",
1974 cf::NDI_UNIQUE | cf::NDI_RED); 2029 cf::NDI_UNIQUE | cf::NDI_RED);
1975 2030
1976 warn "ERROR in enter_exit: $@"; 2031 warn "ERROR in enter_exit: $@";
1977 $self->leave_link; 2032 $self->leave_link;
1978 } 2033 }
1979 })->prio (1); 2034 })->prio (1);
… …
1992 2047
1993sub cf::client::send_drawinfo { 2048sub cf::client::send_drawinfo {
1994 my ($self, $text, $flags) = @_; 2049 my ($self, $text, $flags) = @_;
1995 2050
1996 utf8::encode $text; 2051 utf8::encode $text;
1997 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2052 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1998} 2053}
1999 2054
2055=item $client->ext_event ($type, %msg)
2056
2057Sends an exti event to the client.
2058
2059=cut
2060
2061sub cf::client::ext_event($$%) {
2062 my ($self, $type, %msg) = @_;
2063
2064 $msg{msgtype} = "event_$type";
2065 $self->send_packet ("ext " . cf::to_json \%msg);
2066}
2000 2067
2001=item $success = $client->query ($flags, "text", \&cb) 2068=item $success = $client->query ($flags, "text", \&cb)
2002 2069
2003Queues a query to the client, calling the given callback with 2070Queues a query to the client, calling the given callback with
2004the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2071the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2101 2168
2102# here we export the classes and methods available to script code 2169# here we export the classes and methods available to script code
2103 2170
2104=pod 2171=pod
2105 2172
2106The following fucntions and emthods are available within a safe environment: 2173The following functions and methods are available within a safe environment:
2107 2174
2108 cf::object contr pay_amount pay_player map 2175 cf::object contr pay_amount pay_player map
2109 cf::object::player player 2176 cf::object::player player
2110 cf::player peaceful 2177 cf::player peaceful
2111 cf::map trigger 2178 cf::map trigger
… …
2266} 2333}
2267 2334
2268############################################################################# 2335#############################################################################
2269# the server's init and main functions 2336# the server's init and main functions
2270 2337
2338sub load_facedata {
2339 my $path = sprintf "%s/facedata", cf::datadir;
2340
2341 warn "loading facedata from $path\n";
2342
2343 my $facedata;
2344 0 < aio_load $path, $facedata
2345 or die "$path: $!";
2346
2347 $facedata = Coro::Storable::thaw $facedata;
2348
2349 $facedata->{version} == 2
2350 or cf::cleanup "$path: version mismatch, cannot proceed.";
2351
2352 {
2353 my $faces = $facedata->{faceinfo};
2354
2355 while (my ($face, $info) = each %$faces) {
2356 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2357 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2358 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2359 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2360 Coro::cede;
2361 }
2362
2363 while (my ($face, $info) = each %$faces) {
2364 next unless $info->{smooth};
2365 my $idx = cf::face::find $face
2366 or next;
2367 if (my $smooth = cf::face::find $info->{smooth}) {
2368 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2369 } else {
2370 warn "smooth face '$info->{smooth}' not found for face '$face'";
2371 }
2372 Coro::cede;
2373 }
2374 }
2375
2376 {
2377 my $anims = $facedata->{animinfo};
2378
2379 while (my ($anim, $info) = each %$anims) {
2380 cf::anim::set $anim, $info->{frames}, $info->{facings};
2381 Coro::cede;
2382 }
2383
2384 cf::anim::invalidate_all; # d'oh
2385 }
2386
2387 1
2388}
2389
2271sub init_resources { 2390sub reload_resources {
2272 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2391 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2273 or die "unable to load regions file\n";#d# 2392 or die "unable to load regions file\n";#d#
2393 load_facedata
2394 or die "unable to load facedata\n";#d#
2395}
2396
2397sub init {
2398 reload_resources;
2274} 2399}
2275 2400
2276sub cfg_load { 2401sub cfg_load {
2277 open my $fh, "<:utf8", cf::confdir . "/config" 2402 open my $fh, "<:utf8", cf::confdir . "/config"
2278 or return; 2403 or return;
… …
2290 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2415 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2291 and die "WARNING: m(un)lockall failed: $!\n"; 2416 and die "WARNING: m(un)lockall failed: $!\n";
2292 }; 2417 };
2293 warn $@ if $@; 2418 warn $@ if $@;
2294 } 2419 }
2295}
2296
2297sub init {
2298 init_resources;
2299} 2420}
2300 2421
2301sub main { 2422sub main {
2302 # we must not ever block the main coroutine 2423 # we must not ever block the main coroutine
2303 local $Coro::idle = sub { 2424 local $Coro::idle = sub {
… …
2406 Coro::cede; 2527 Coro::cede;
2407 last unless IO::AIO::nreqs || BDB::nreqs; 2528 last unless IO::AIO::nreqs || BDB::nreqs;
2408 warn "iterate..."; 2529 warn "iterate...";
2409 } 2530 }
2410 2531
2532 ++$RELOAD;
2533
2411 warn "cancelling all extension coros"; 2534 warn "cancelling all extension coros";
2412 $_->cancel for values %EXT_CORO; 2535 $_->cancel for values %EXT_CORO;
2413 %EXT_CORO = (); 2536 %EXT_CORO = ();
2414 2537
2415 warn "removing commands"; 2538 warn "removing commands";
… …
2472 2595
2473 warn "loading extensions"; 2596 warn "loading extensions";
2474 cf::load_extensions; 2597 cf::load_extensions;
2475 2598
2476 warn "reattaching attachments to objects/players"; 2599 warn "reattaching attachments to objects/players";
2477 _global_reattach; 2600 _global_reattach; # objects, sockets
2478 warn "reattaching attachments to maps"; 2601 warn "reattaching attachments to maps";
2479 reattach $_ for values %MAP; 2602 reattach $_ for values %MAP;
2603 warn "reattaching attachments to players";
2604 reattach $_ for values %PLAYER;
2480 2605
2481 warn "loading reloadable resources"; 2606 warn "loading reloadable resources";
2482 init_resources; 2607 reload_resources;
2483 2608
2484 warn "leaving sync_job"; 2609 warn "leaving sync_job";
2485 2610
2486 1 2611 1
2487 } or do { 2612 } or do {

Diff Legend

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