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.487 by root, Fri Oct 16 01:56:41 2009 UTC vs.
Revision 1.501 by root, Sat Jan 16 23:27:21 2010 UTC

… …
32use EV; 32use EV;
33use Opcode; 33use Opcode;
34use Safe; 34use Safe;
35use Safe::Hole; 35use Safe::Hole;
36use Storable (); 36use Storable ();
37use Carp ();
37 38
38use Guard (); 39use Guard ();
39use Coro (); 40use Coro ();
40use Coro::State; 41use Coro::State;
41use Coro::Handle; 42use Coro::Handle;
… …
52use Coro::Util (); 53use Coro::Util ();
53 54
54use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
55use BDB (); 56use BDB ();
56use Data::Dumper; 57use Data::Dumper;
57use Digest::MD5;
58use Fcntl; 58use Fcntl;
59use YAML::XS (); 59use YAML::XS ();
60use IO::AIO (); 60use IO::AIO ();
61use Time::HiRes; 61use Time::HiRes;
62use Compress::LZF; 62use Compress::LZF;
… …
228returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
230 230
231=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
232 232
233This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
235that call. 235that call.
236 236
237=item %cf::REFLECT 237=item %cf::REFLECT
238 238
… …
289)) { 289)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 291}
292 292
293$EV::DIED = sub { 293$EV::DIED = sub {
294 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
295}; 295};
296 296
297############################################################################# 297#############################################################################
298 298
299=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
2009 2009
2010 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
2011 } 2011 }
2012} 2012}
2013 2013
2014sub pre_load { } 2014sub pre_load { }
2015sub post_load { } 2015#sub post_load { } # XS
2016 2016
2017sub load { 2017sub load {
2018 my ($self) = @_; 2018 my ($self) = @_;
2019 2019
2020 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
… …
2341 : normalise $_ 2341 : normalise $_
2342 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2343 ] 2343 ]
2344} 2344}
2345 2345
2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2377
2346=back 2378=back
2347 2379
2348=head3 cf::object 2380=head3 cf::object
2349 2381
2350=cut 2382=cut
… …
2545 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2546 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2547 2579
2548 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2549 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2550 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2551 2583
2552 $map->load; 2584 $map->load;
2553 $map->load_neighbours; 2585 $map->load_neighbours;
2554 2586
2555 return unless $self->contr->active; 2587 return unless $self->contr->active;
… …
2752sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2753 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2754 2786
2755 utf8::encode $text; 2787 utf8::encode $text;
2756 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2789}
2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2757} 2814}
2758 2815
2759=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2760 2817
2761Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2913 my $pkt = "msg " 2970 my $pkt = "msg "
2914 . $self->{json_coder}->encode ( 2971 . $self->{json_coder}->encode (
2915 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2916 ); 2973 );
2917 2974
2918 # try lzf for large packets
2919 $pkt = "lzf " . Compress::LZF::compress $pkt
2920 if 1024 <= length $pkt and $self->{can_lzf};
2921
2922 # split very large packets
2923 if (8192 < length $pkt and $self->{can_lzf}) {
2924 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2925 $pkt = "frag";
2926 }
2927
2928 $self->send_packet ($pkt); 2975 $self->send_big_packet ($pkt);
2929} 2976}
2930 2977
2931=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2932 2979
2933Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2936 2983
2937sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2938 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2939 2986
2940 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2941 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2942 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2943 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2944 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2945 } 2992 }
2946} 2993}
2947 2994
2948=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2949 2996
… …
2953 3000
2954sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2955 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2956 3003
2957 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2958 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2959 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2960 #TODO: version 1, remove 3007 #TODO: version 1, remove
2961 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2962 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2963 } 3010 }
2964} 3011}
2965 3012
2966=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2967 3014
… …
3094our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
3095 3142
3096$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
3097 3144
3098$safe->permit_only (Opcode::opset qw( 3145$safe->permit_only (Opcode::opset qw(
3099 :base_core :base_mem :base_orig :base_math 3146 :base_core :base_mem :base_orig :base_math :base_loop
3100 grepstart grepwhile mapstart mapwhile 3147 grepstart grepwhile mapstart mapwhile
3101 sort time 3148 sort time
3102)); 3149));
3103 3150
3104# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
… …
3156 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3157 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3158 3205
3159 %vars = (_dummy => 0) unless %vars; 3206 %vars = (_dummy => 0) unless %vars;
3160 3207
3208 my @res;
3161 local $_; 3209 local $_;
3162 local @safe::cf::_safe_eval_args = values %vars;
3163 3210
3164 my $eval = 3211 my $eval =
3165 "do {\n" 3212 "do {\n"
3166 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3167 . "#line 0 \"{$qcode}\"\n" 3214 . "#line 0 \"{$qcode}\"\n"
3168 . $code 3215 . $code
3169 . "\n}" 3216 . "\n}"
3170 ; 3217 ;
3171 3218
3219 if ($CFG{safe_eval}) {
3172 sub_generation_inc; 3220 sub_generation_inc;
3221 local @safe::cf::_safe_eval_args = values %vars;
3173 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3222 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3174 sub_generation_inc; 3223 sub_generation_inc;
3224 } else {
3225 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval;
3227 }
3175 3228
3176 if ($@) { 3229 if ($@) {
3177 warn "$@"; 3230 warn "$@";
3178 warn "while executing safe code '$code'\n"; 3231 warn "while executing safe code '$code'\n";
3179 warn "with arguments " . (join " ", %vars) . "\n"; 3232 warn "with arguments " . (join " ", %vars) . "\n";
… …
3198=cut 3251=cut
3199 3252
3200sub register_script_function { 3253sub register_script_function {
3201 my ($fun, $cb) = @_; 3254 my ($fun, $cb) = @_;
3202 3255
3203 no strict 'refs'; 3256 $fun = "safe::$fun" if $CFG{safe_eval};
3204 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3257 *$fun = $safe_hole->wrap ($cb);
3205} 3258}
3206 3259
3207=back 3260=back
3208 3261
3209=cut 3262=cut
… …
3230 3283
3231 $facedata->{version} == 2 3284 $facedata->{version} == 2
3232 or cf::cleanup "$path: version mismatch, cannot proceed."; 3285 or cf::cleanup "$path: version mismatch, cannot proceed.";
3233 3286
3234 # patch in the exptable 3287 # patch in the exptable
3288 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3235 $facedata->{resource}{"res/exp_table"} = { 3289 $facedata->{resource}{"res/exp_table"} = {
3236 type => FT_RSRC, 3290 type => FT_RSRC,
3237 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3291 data => $exp_table,
3292 hash => (Digest::MD5::md5 $exp_table),
3238 }; 3293 };
3239 cf::cede_to_tick; 3294 cf::cede_to_tick;
3240 3295
3241 { 3296 {
3242 my $faces = $facedata->{faceinfo}; 3297 my $faces = $facedata->{faceinfo};
… …
3244 while (my ($face, $info) = each %$faces) { 3299 while (my ($face, $info) = each %$faces) {
3245 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3300 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3246 3301
3247 cf::face::set_visibility $idx, $info->{visibility}; 3302 cf::face::set_visibility $idx, $info->{visibility};
3248 cf::face::set_magicmap $idx, $info->{magicmap}; 3303 cf::face::set_magicmap $idx, $info->{magicmap};
3249 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3250 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3251 3306
3252 cf::cede_to_tick; 3307 cf::cede_to_tick;
3253 } 3308 }
3254 3309
3255 while (my ($face, $info) = each %$faces) { 3310 while (my ($face, $info) = each %$faces) {
… …
3279 3334
3280 cf::anim::invalidate_all; # d'oh 3335 cf::anim::invalidate_all; # d'oh
3281 } 3336 }
3282 3337
3283 { 3338 {
3284 # TODO: for gcfclient pleasure, we should give resources
3285 # that gcfclient doesn't grok a >10000 face index.
3286 my $res = $facedata->{resource}; 3339 my $res = $facedata->{resource};
3287 3340
3288 while (my ($name, $info) = each %$res) { 3341 while (my ($name, $info) = each %$res) {
3289 if (defined $info->{type}) { 3342 if (defined $info->{type}) {
3290 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3343 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3291 my $data;
3292 3344
3293 if ($info->{type} & 1) { 3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3294 # prepend meta info
3295
3296 my $meta = $enc->encode ({
3297 name => $name,
3298 %{ $info->{meta} || {} },
3299 });
3300
3301 $data = pack "(w/a*)*", $meta, $info->{data};
3302 } else {
3303 $data = $info->{data};
3304 }
3305
3306 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3307 cf::face::set_type $idx, $info->{type}; 3346 cf::face::set_type $idx, $info->{type};
3308 } else { 3347 } else {
3309 $RESOURCE{$name} = $info; 3348 $RESOURCE{$name} = $info;
3310 } 3349 }
3311 3350
… …
3474 }; 3513 };
3475 3514
3476 evthread_start IO::AIO::poll_fileno; 3515 evthread_start IO::AIO::poll_fileno;
3477 3516
3478 cf::sync_job { 3517 cf::sync_job {
3518 cf::load_settings;
3519 cf::load_materials;
3520
3479 reload_resources; 3521 reload_resources;
3480 reload_config; 3522 reload_config;
3481 db_init; 3523 db_init;
3482 3524
3483 cf::load_settings;
3484 cf::load_materials;
3485 cf::init_uuid; 3525 cf::init_uuid;
3486 cf::init_signals; 3526 cf::init_signals;
3487 cf::init_commands; 3527 cf::init_commands;
3488 cf::init_skills; 3528 cf::init_skills;
3489 3529
… …
3848 3888
3849our @WAIT_FOR_TICK; 3889our @WAIT_FOR_TICK;
3850our @WAIT_FOR_TICK_BEGIN; 3890our @WAIT_FOR_TICK_BEGIN;
3851 3891
3852sub wait_for_tick { 3892sub wait_for_tick {
3853 return if tick_inhibit || $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3854 3894
3855 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3856 push @WAIT_FOR_TICK, $signal; 3896 push @WAIT_FOR_TICK, $signal;
3857 $signal->wait; 3897 $signal->wait;
3858} 3898}
3859 3899
3860sub wait_for_tick_begin { 3900sub wait_for_tick_begin {
3861 return if tick_inhibit || $Coro::current == $Coro::main; 3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3862 3902
3863 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3864 push @WAIT_FOR_TICK_BEGIN, $signal; 3904 push @WAIT_FOR_TICK_BEGIN, $signal;
3865 $signal->wait; 3905 $signal->wait;
3866} 3906}

Diff Legend

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