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.231 by root, Wed Apr 4 00:02:06 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
… …
379 371
380 aio_rename "$runtime~", $runtime 372 aio_rename "$runtime~", $runtime
381 and return; 373 and return;
382 374
383 1 375 1
376}
377
378=item cf::datalog type => key => value, ...
379
380Log a datalog packet of the given type with the given key-value pairs.
381
382=cut
383
384sub datalog($@) {
385 my ($type, %kv) = @_;
386 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384} 387}
385 388
386=back 389=back
387 390
388=cut 391=cut
… …
1121 } 1124 }
1122 1125
1123 \@paths 1126 \@paths
1124} 1127}
1125 1128
1126=item $player->ext_reply ($msgid, $msgtype, %msg) 1129=item $player->ext_reply ($msgid, %msg)
1127 1130
1128Sends an ext reply to the player. 1131Sends an ext reply to the player.
1129 1132
1130=cut 1133=cut
1131 1134
1132sub ext_reply($$$%) { 1135sub ext_reply($$%) {
1133 my ($self, $id, %msg) = @_; 1136 my ($self, $id, %msg) = @_;
1134 1137
1135 $msg{msgid} = $id; 1138 $msg{msgid} = $id;
1139
1140 $self->send ("ext " . cf::to_json \%msg);
1141}
1142
1143=item $player->ext_event ($type, %msg)
1144
1145Sends an ext event to the client.
1146
1147=cut
1148
1149sub ext_event($$%) {
1150 my ($self, $type, %msg) = @_;
1151
1152 delete $msg{msgid};
1153 $msg{msgtype} = "event";
1154 $msg{eventtype} = $type;
1136 1155
1137 $self->send ("ext " . cf::to_json \%msg); 1156 $self->send ("ext " . cf::to_json \%msg);
1138} 1157}
1139 1158
1140package cf; 1159package cf;
… …
1992 2011
1993sub cf::client::send_drawinfo { 2012sub cf::client::send_drawinfo {
1994 my ($self, $text, $flags) = @_; 2013 my ($self, $text, $flags) = @_;
1995 2014
1996 utf8::encode $text; 2015 utf8::encode $text;
1997 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2016 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1998} 2017}
1999 2018
2000 2019
2001=item $success = $client->query ($flags, "text", \&cb) 2020=item $success = $client->query ($flags, "text", \&cb)
2002 2021
… …
2101 2120
2102# here we export the classes and methods available to script code 2121# here we export the classes and methods available to script code
2103 2122
2104=pod 2123=pod
2105 2124
2106The following fucntions and emthods are available within a safe environment: 2125The following functions and methods are available within a safe environment:
2107 2126
2108 cf::object contr pay_amount pay_player map 2127 cf::object contr pay_amount pay_player map
2109 cf::object::player player 2128 cf::object::player player
2110 cf::player peaceful 2129 cf::player peaceful
2111 cf::map trigger 2130 cf::map trigger
… …
2266} 2285}
2267 2286
2268############################################################################# 2287#############################################################################
2269# the server's init and main functions 2288# the server's init and main functions
2270 2289
2290sub load_facedata {
2291 my $path = sprintf "%s/facedata", cf::datadir;
2292
2293 warn "loading facedata from $path\n";
2294
2295 my $faces;
2296 0 < aio_load $path, $faces
2297 or die "$path: $!";
2298
2299 Coro::cede;
2300 $faces = Storable::thaw $faces;
2301 Coro::cede;
2302
2303 my $meta = delete $faces->{""};
2304 $meta->{version} == 1
2305 or cf::cleanup "$path: version mismatch, cannot proceed.";
2306
2307 while (my ($face, $info) = each %$faces) {
2308 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2309 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2310 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2311 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2312 Coro::cede;
2313 }
2314
2315 while (my ($face, $info) = each %$faces) {
2316 next unless $info->{smooth};
2317 my $idx = cf::face::find $face
2318 or next;
2319 if (my $smooth = cf::face::find $info->{smooth}) {
2320 cf::face::set_smooth $idx, $smooth;
2321 } else {
2322 warn "smooth face '$info->{smooth}' not found for face '$face'";
2323 }
2324 Coro::cede;
2325 }
2326
2327 1
2328}
2329
2271sub init_resources { 2330sub reload_resources {
2272 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2331 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2273 or die "unable to load regions file\n";#d# 2332 or die "unable to load regions file\n";#d#
2333 load_facedata
2334 or die "unable to load facedata\n";#d#
2335}
2336
2337sub init {
2338 reload_resources;
2274} 2339}
2275 2340
2276sub cfg_load { 2341sub cfg_load {
2277 open my $fh, "<:utf8", cf::confdir . "/config" 2342 open my $fh, "<:utf8", cf::confdir . "/config"
2278 or return; 2343 or return;
… …
2290 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2355 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2291 and die "WARNING: m(un)lockall failed: $!\n"; 2356 and die "WARNING: m(un)lockall failed: $!\n";
2292 }; 2357 };
2293 warn $@ if $@; 2358 warn $@ if $@;
2294 } 2359 }
2295}
2296
2297sub init {
2298 init_resources;
2299} 2360}
2300 2361
2301sub main { 2362sub main {
2302 # we must not ever block the main coroutine 2363 # we must not ever block the main coroutine
2303 local $Coro::idle = sub { 2364 local $Coro::idle = sub {
… …
2406 Coro::cede; 2467 Coro::cede;
2407 last unless IO::AIO::nreqs || BDB::nreqs; 2468 last unless IO::AIO::nreqs || BDB::nreqs;
2408 warn "iterate..."; 2469 warn "iterate...";
2409 } 2470 }
2410 2471
2472 ++$RELOAD;
2473
2411 warn "cancelling all extension coros"; 2474 warn "cancelling all extension coros";
2412 $_->cancel for values %EXT_CORO; 2475 $_->cancel for values %EXT_CORO;
2413 %EXT_CORO = (); 2476 %EXT_CORO = ();
2414 2477
2415 warn "removing commands"; 2478 warn "removing commands";
… …
2472 2535
2473 warn "loading extensions"; 2536 warn "loading extensions";
2474 cf::load_extensions; 2537 cf::load_extensions;
2475 2538
2476 warn "reattaching attachments to objects/players"; 2539 warn "reattaching attachments to objects/players";
2477 _global_reattach; 2540 _global_reattach; # objects, sockets
2478 warn "reattaching attachments to maps"; 2541 warn "reattaching attachments to maps";
2479 reattach $_ for values %MAP; 2542 reattach $_ for values %MAP;
2543 warn "reattaching attachments to players";
2544 reattach $_ for values %PLAYER;
2480 2545
2481 warn "loading reloadable resources"; 2546 warn "loading reloadable resources";
2482 init_resources; 2547 reload_resources;
2483 2548
2484 warn "leaving sync_job"; 2549 warn "leaving sync_job";
2485 2550
2486 1 2551 1
2487 } or do { 2552 } or do {

Diff Legend

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