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.222 by root, Tue Mar 6 03:06:00 2007 UTC vs.
Revision 1.228 by root, Mon Mar 26 16:53:33 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
… …
1992 1984
1993sub cf::client::send_drawinfo { 1985sub cf::client::send_drawinfo {
1994 my ($self, $text, $flags) = @_; 1986 my ($self, $text, $flags) = @_;
1995 1987
1996 utf8::encode $text; 1988 utf8::encode $text;
1997 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1998} 1990}
1999 1991
2000 1992
2001=item $success = $client->query ($flags, "text", \&cb) 1993=item $success = $client->query ($flags, "text", \&cb)
2002 1994
… …
2101 2093
2102# here we export the classes and methods available to script code 2094# here we export the classes and methods available to script code
2103 2095
2104=pod 2096=pod
2105 2097
2106The following fucntions and emthods are available within a safe environment: 2098The following functions and methods are available within a safe environment:
2107 2099
2108 cf::object contr pay_amount pay_player map 2100 cf::object contr pay_amount pay_player map
2109 cf::object::player player 2101 cf::object::player player
2110 cf::player peaceful 2102 cf::player peaceful
2111 cf::map trigger 2103 cf::map trigger
… …
2266} 2258}
2267 2259
2268############################################################################# 2260#############################################################################
2269# the server's init and main functions 2261# the server's init and main functions
2270 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
2271sub init_resources { 2302sub reload_resources {
2272 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2303 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2273 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;
2274} 2311}
2275 2312
2276sub cfg_load { 2313sub cfg_load {
2277 open my $fh, "<:utf8", cf::confdir . "/config" 2314 open my $fh, "<:utf8", cf::confdir . "/config"
2278 or return; 2315 or return;
… …
2290 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2327 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2291 and die "WARNING: m(un)lockall failed: $!\n"; 2328 and die "WARNING: m(un)lockall failed: $!\n";
2292 }; 2329 };
2293 warn $@ if $@; 2330 warn $@ if $@;
2294 } 2331 }
2295}
2296
2297sub init {
2298 init_resources;
2299} 2332}
2300 2333
2301sub main { 2334sub main {
2302 # we must not ever block the main coroutine 2335 # we must not ever block the main coroutine
2303 local $Coro::idle = sub { 2336 local $Coro::idle = sub {
… …
2406 Coro::cede; 2439 Coro::cede;
2407 last unless IO::AIO::nreqs || BDB::nreqs; 2440 last unless IO::AIO::nreqs || BDB::nreqs;
2408 warn "iterate..."; 2441 warn "iterate...";
2409 } 2442 }
2410 2443
2444 ++$RELOAD;
2445
2411 warn "cancelling all extension coros"; 2446 warn "cancelling all extension coros";
2412 $_->cancel for values %EXT_CORO; 2447 $_->cancel for values %EXT_CORO;
2413 %EXT_CORO = (); 2448 %EXT_CORO = ();
2414 2449
2415 warn "removing commands"; 2450 warn "removing commands";
… …
2479 reattach $_ for values %MAP; 2514 reattach $_ for values %MAP;
2480 warn "reattaching attachments to players"; 2515 warn "reattaching attachments to players";
2481 reattach $_ for values %PLAYER; 2516 reattach $_ for values %PLAYER;
2482 2517
2483 warn "loading reloadable resources"; 2518 warn "loading reloadable resources";
2484 init_resources; 2519 reload_resources;
2485 2520
2486 warn "leaving sync_job"; 2521 warn "leaving sync_job";
2487 2522
2488 1 2523 1
2489 } or do { 2524 } or do {

Diff Legend

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