ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.223 by root, Sun Mar 11 02:12:44 2007 UTC vs.
Revision 1.230 by root, Mon Apr 2 18:04:46 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
… …
203 $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;
204 $d 209 $d
205 } || "[unable to dump $_[0]: '$@']"; 210 } || "[unable to dump $_[0]: '$@']";
206} 211}
207 212
208use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
209 214
210=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
211 216
212Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
213 218
214=cut
215
216sub from_json($) {
217 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
218 JSON::Syck::Load $_[0]
219}
220
221=item $json = cf::to_json $ref 219=item $json = cf::to_json $ref
222 220
223Converts a perl data structure into its JSON representation. 221Converts a perl data structure into its JSON representation.
224
225=cut
226
227sub to_json($) {
228 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
229 JSON::Syck::Dump $_[0]
230}
231 222
232=item cf::lock_wait $string 223=item cf::lock_wait $string
233 224
234Wait until the given lock is available. See cf::lock_acquire. 225Wait until the given lock is available. See cf::lock_acquire.
235 226
… …
380 371
381 aio_rename "$runtime~", $runtime 372 aio_rename "$runtime~", $runtime
382 and return; 373 and return;
383 374
384 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 });
385} 387}
386 388
387=back 389=back
388 390
389=cut 391=cut
… …
1993 1995
1994sub cf::client::send_drawinfo { 1996sub cf::client::send_drawinfo {
1995 my ($self, $text, $flags) = @_; 1997 my ($self, $text, $flags) = @_;
1996 1998
1997 utf8::encode $text; 1999 utf8::encode $text;
1998 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1999} 2001}
2000 2002
2001 2003
2002=item $success = $client->query ($flags, "text", \&cb) 2004=item $success = $client->query ($flags, "text", \&cb)
2003 2005
… …
2102 2104
2103# here we export the classes and methods available to script code 2105# here we export the classes and methods available to script code
2104 2106
2105=pod 2107=pod
2106 2108
2107The following fucntions and emthods are available within a safe environment: 2109The following functions and methods are available within a safe environment:
2108 2110
2109 cf::object contr pay_amount pay_player map 2111 cf::object contr pay_amount pay_player map
2110 cf::object::player player 2112 cf::object::player player
2111 cf::player peaceful 2113 cf::player peaceful
2112 cf::map trigger 2114 cf::map trigger
… …
2267} 2269}
2268 2270
2269############################################################################# 2271#############################################################################
2270# the server's init and main functions 2272# the server's init and main functions
2271 2273
2272sub load_faces { 2274sub load_facedata {
2273 my $path = sprintf "%s/faces", cf::datadir; 2275 my $path = sprintf "%s/facedata", cf::datadir;
2274 2276
2275 warn "loading faces from $path\n"; 2277 warn "loading facedata from $path\n";
2276 2278
2277 my $faces; 2279 my $faces;
2278 0 < aio_load $path, $faces 2280 0 < aio_load $path, $faces
2279 or die "$path: $!"; 2281 or die "$path: $!";
2280 2282
2281 Coro::cede; 2283 Coro::cede;
2282 $faces = Storable::thaw $faces; 2284 $faces = Storable::thaw $faces;
2283 Coro::cede; 2285 Coro::cede;
2286
2287 my $meta = delete $faces->{""};
2288 $meta->{version} == 1
2289 or cf::cleanup "$path: version mismatch, cannot proceed.";
2284 2290
2285 while (my ($face, $info) = each %$faces) { 2291 while (my ($face, $info) = each %$faces) {
2286 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2287 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2293 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2288 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2294 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2295 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2296 Coro::cede;
2297 }
2298
2299 while (my ($face, $info) = each %$faces) {
2300 next unless $info->{smooth};
2301 my $idx = cf::face::find $face
2302 or next;
2303 if (my $smooth = cf::face::find $info->{smooth}) {
2304 cf::face::set_smooth $idx, $smooth;
2305 } else {
2306 warn "smooth face '$info->{smooth}' not found for face '$face'";
2307 }
2289 Coro::cede; 2308 Coro::cede;
2290 } 2309 }
2291 2310
2292 1 2311 1
2293} 2312}
2294 2313
2295sub reload_resources { 2314sub reload_resources {
2296 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2315 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2297 or die "unable to load regions file\n";#d# 2316 or die "unable to load regions file\n";#d#
2298 load_faces 2317 load_facedata
2299 or die "unable to load faces\n";#d# 2318 or die "unable to load facedata\n";#d#
2300} 2319}
2301 2320
2302sub init { 2321sub init {
2303 reload_resources; 2322 reload_resources;
2304} 2323}

Diff Legend

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