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.226 by root, Wed Mar 14 04:12:29 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;
… …
1992 1995
1993sub cf::client::send_drawinfo { 1996sub cf::client::send_drawinfo {
1994 my ($self, $text, $flags) = @_; 1997 my ($self, $text, $flags) = @_;
1995 1998
1996 utf8::encode $text; 1999 utf8::encode $text;
1997 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1998} 2001}
1999 2002
2000 2003
2001=item $success = $client->query ($flags, "text", \&cb) 2004=item $success = $client->query ($flags, "text", \&cb)
2002 2005
… …
2266} 2269}
2267 2270
2268############################################################################# 2271#############################################################################
2269# the server's init and main functions 2272# the server's init and main functions
2270 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 my $meta = delete $faces->{""};
2288 $meta->{version} == 1
2289 or cf::cleanup "$path: version mismatch, cannot proceed.";
2290
2291 while (my ($face, $info) = each %$faces) {
2292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2293 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2294 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2295 Coro::cede;
2296 }
2297
2298 while (my ($face, $info) = each %$faces) {
2299 next unless $info->{smooth};
2300 my $idx = cf::face::find $face
2301 or next;
2302 if (my $smooth = cf::face::find $info->{smooth}) {
2303 cf::face::set_smooth $idx, $smooth;
2304 } else {
2305 warn "smooth face '$info->{smooth}' not found for face '$face'";
2306 }
2307 Coro::cede;
2308 }
2309
2310 1
2311}
2312
2271sub init_resources { 2313sub reload_resources {
2272 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2314 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2273 or die "unable to load regions file\n";#d# 2315 or die "unable to load regions file\n";#d#
2316 load_faces
2317 or die "unable to load faces\n";#d#
2318}
2319
2320sub init {
2321 reload_resources;
2274} 2322}
2275 2323
2276sub cfg_load { 2324sub cfg_load {
2277 open my $fh, "<:utf8", cf::confdir . "/config" 2325 open my $fh, "<:utf8", cf::confdir . "/config"
2278 or return; 2326 or return;
… …
2290 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2338 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2291 and die "WARNING: m(un)lockall failed: $!\n"; 2339 and die "WARNING: m(un)lockall failed: $!\n";
2292 }; 2340 };
2293 warn $@ if $@; 2341 warn $@ if $@;
2294 } 2342 }
2295}
2296
2297sub init {
2298 init_resources;
2299} 2343}
2300 2344
2301sub main { 2345sub main {
2302 # we must not ever block the main coroutine 2346 # we must not ever block the main coroutine
2303 local $Coro::idle = sub { 2347 local $Coro::idle = sub {
… …
2406 Coro::cede; 2450 Coro::cede;
2407 last unless IO::AIO::nreqs || BDB::nreqs; 2451 last unless IO::AIO::nreqs || BDB::nreqs;
2408 warn "iterate..."; 2452 warn "iterate...";
2409 } 2453 }
2410 2454
2455 ++$RELOAD;
2456
2411 warn "cancelling all extension coros"; 2457 warn "cancelling all extension coros";
2412 $_->cancel for values %EXT_CORO; 2458 $_->cancel for values %EXT_CORO;
2413 %EXT_CORO = (); 2459 %EXT_CORO = ();
2414 2460
2415 warn "removing commands"; 2461 warn "removing commands";
… …
2472 2518
2473 warn "loading extensions"; 2519 warn "loading extensions";
2474 cf::load_extensions; 2520 cf::load_extensions;
2475 2521
2476 warn "reattaching attachments to objects/players"; 2522 warn "reattaching attachments to objects/players";
2477 _global_reattach; 2523 _global_reattach; # objects, sockets
2478 warn "reattaching attachments to maps"; 2524 warn "reattaching attachments to maps";
2479 reattach $_ for values %MAP; 2525 reattach $_ for values %MAP;
2526 warn "reattaching attachments to players";
2527 reattach $_ for values %PLAYER;
2480 2528
2481 warn "loading reloadable resources"; 2529 warn "loading reloadable resources";
2482 init_resources; 2530 reload_resources;
2483 2531
2484 warn "leaving sync_job"; 2532 warn "leaving sync_job";
2485 2533
2486 1 2534 1
2487 } or do { 2535 } or do {

Diff Legend

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