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.493 by root, Mon Oct 26 02:34:37 2009 UTC vs.
Revision 1.501 by root, Sat Jan 16 23:27:21 2010 UTC

… …
53use Coro::Util (); 53use Coro::Util ();
54 54
55use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
56use BDB (); 56use BDB ();
57use Data::Dumper; 57use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 58use Fcntl;
60use YAML::XS (); 59use YAML::XS ();
61use IO::AIO (); 60use IO::AIO ();
62use Time::HiRes; 61use Time::HiRes;
63use Compress::LZF; 62use Compress::LZF;
… …
2010 2009
2011 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
2012 } 2011 }
2013} 2012}
2014 2013
2015sub pre_load { } 2014sub pre_load { }
2016sub post_load { } 2015#sub post_load { } # XS
2017 2016
2018sub load { 2017sub load {
2019 my ($self) = @_; 2018 my ($self) = @_;
2020 2019
2021 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
… …
2785sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2786 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2787 2786
2788 utf8::encode $text; 2787 utf8::encode $text;
2789 $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);
2790} 2814}
2791 2815
2792=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2793 2817
2794Send 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
… …
2946 my $pkt = "msg " 2970 my $pkt = "msg "
2947 . $self->{json_coder}->encode ( 2971 . $self->{json_coder}->encode (
2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2949 ); 2973 );
2950 2974
2951 # try lzf for large packets
2952 $pkt = "lzf " . Compress::LZF::compress $pkt
2953 if 1024 <= length $pkt and $self->{can_lzf};
2954
2955 # split very large packets
2956 if (8192 < length $pkt and $self->{can_lzf}) {
2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2958 $pkt = "frag";
2959 }
2960
2961 $self->send_packet ($pkt); 2975 $self->send_big_packet ($pkt);
2962} 2976}
2963 2977
2964=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2965 2979
2966Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2969 2983
2970sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2971 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2972 2986
2973 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2974 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2975 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2976 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2977 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2978 } 2992 }
2979} 2993}
2980 2994
2981=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2982 2996
… …
2986 3000
2987sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2988 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2989 3003
2990 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2991 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2992 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2993 #TODO: version 1, remove 3007 #TODO: version 1, remove
2994 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2995 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2996 } 3010 }
2997} 3011}
2998 3012
2999=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
3000 3014
… …
3127our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
3128 3142
3129$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
3130 3144
3131$safe->permit_only (Opcode::opset qw( 3145$safe->permit_only (Opcode::opset qw(
3132 :base_core :base_mem :base_orig :base_math 3146 :base_core :base_mem :base_orig :base_math :base_loop
3133 grepstart grepwhile mapstart mapwhile 3147 grepstart grepwhile mapstart mapwhile
3134 sort time 3148 sort time
3135)); 3149));
3136 3150
3137# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
… …
3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3190 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3191 3205
3192 %vars = (_dummy => 0) unless %vars; 3206 %vars = (_dummy => 0) unless %vars;
3193 3207
3208 my @res;
3194 local $_; 3209 local $_;
3195 local @safe::cf::_safe_eval_args = values %vars;
3196 3210
3197 my $eval = 3211 my $eval =
3198 "do {\n" 3212 "do {\n"
3199 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3200 . "#line 0 \"{$qcode}\"\n" 3214 . "#line 0 \"{$qcode}\"\n"
3201 . $code 3215 . $code
3202 . "\n}" 3216 . "\n}"
3203 ; 3217 ;
3204 3218
3219 if ($CFG{safe_eval}) {
3205 sub_generation_inc; 3220 sub_generation_inc;
3221 local @safe::cf::_safe_eval_args = values %vars;
3206 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3222 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3207 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 }
3208 3228
3209 if ($@) { 3229 if ($@) {
3210 warn "$@"; 3230 warn "$@";
3211 warn "while executing safe code '$code'\n"; 3231 warn "while executing safe code '$code'\n";
3212 warn "with arguments " . (join " ", %vars) . "\n"; 3232 warn "with arguments " . (join " ", %vars) . "\n";
… …
3231=cut 3251=cut
3232 3252
3233sub register_script_function { 3253sub register_script_function {
3234 my ($fun, $cb) = @_; 3254 my ($fun, $cb) = @_;
3235 3255
3236 no strict 'refs'; 3256 $fun = "safe::$fun" if $CFG{safe_eval};
3237 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3257 *$fun = $safe_hole->wrap ($cb);
3238} 3258}
3239 3259
3240=back 3260=back
3241 3261
3242=cut 3262=cut
… …
3263 3283
3264 $facedata->{version} == 2 3284 $facedata->{version} == 2
3265 or cf::cleanup "$path: version mismatch, cannot proceed."; 3285 or cf::cleanup "$path: version mismatch, cannot proceed.";
3266 3286
3267 # 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]);
3268 $facedata->{resource}{"res/exp_table"} = { 3289 $facedata->{resource}{"res/exp_table"} = {
3269 type => FT_RSRC, 3290 type => FT_RSRC,
3270 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),
3271 }; 3293 };
3272 cf::cede_to_tick; 3294 cf::cede_to_tick;
3273 3295
3274 { 3296 {
3275 my $faces = $facedata->{faceinfo}; 3297 my $faces = $facedata->{faceinfo};
… …
3277 while (my ($face, $info) = each %$faces) { 3299 while (my ($face, $info) = each %$faces) {
3278 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3300 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3279 3301
3280 cf::face::set_visibility $idx, $info->{visibility}; 3302 cf::face::set_visibility $idx, $info->{visibility};
3281 cf::face::set_magicmap $idx, $info->{magicmap}; 3303 cf::face::set_magicmap $idx, $info->{magicmap};
3282 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3283 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3284 3306
3285 cf::cede_to_tick; 3307 cf::cede_to_tick;
3286 } 3308 }
3287 3309
3288 while (my ($face, $info) = each %$faces) { 3310 while (my ($face, $info) = each %$faces) {
… …
3312 3334
3313 cf::anim::invalidate_all; # d'oh 3335 cf::anim::invalidate_all; # d'oh
3314 } 3336 }
3315 3337
3316 { 3338 {
3317 # TODO: for gcfclient pleasure, we should give resources
3318 # that gcfclient doesn't grok a >10000 face index.
3319 my $res = $facedata->{resource}; 3339 my $res = $facedata->{resource};
3320 3340
3321 while (my ($name, $info) = each %$res) { 3341 while (my ($name, $info) = each %$res) {
3322 if (defined $info->{type}) { 3342 if (defined $info->{type}) {
3323 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3343 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3324 my $data;
3325 3344
3326 if ($info->{type} & 1) { 3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3327 # prepend meta info
3328
3329 my $meta = $enc->encode ({
3330 name => $name,
3331 %{ $info->{meta} || {} },
3332 });
3333
3334 $data = pack "(w/a*)*", $meta, $info->{data};
3335 } else {
3336 $data = $info->{data};
3337 }
3338
3339 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3340 cf::face::set_type $idx, $info->{type}; 3346 cf::face::set_type $idx, $info->{type};
3341 } else { 3347 } else {
3342 $RESOURCE{$name} = $info; 3348 $RESOURCE{$name} = $info;
3343 } 3349 }
3344 3350
… …
3507 }; 3513 };
3508 3514
3509 evthread_start IO::AIO::poll_fileno; 3515 evthread_start IO::AIO::poll_fileno;
3510 3516
3511 cf::sync_job { 3517 cf::sync_job {
3518 cf::load_settings;
3519 cf::load_materials;
3520
3512 reload_resources; 3521 reload_resources;
3513 reload_config; 3522 reload_config;
3514 db_init; 3523 db_init;
3515 3524
3516 cf::load_settings;
3517 cf::load_materials;
3518 cf::init_uuid; 3525 cf::init_uuid;
3519 cf::init_signals; 3526 cf::init_signals;
3520 cf::init_commands; 3527 cf::init_commands;
3521 cf::init_skills; 3528 cf::init_skills;
3522 3529
… …
3881 3888
3882our @WAIT_FOR_TICK; 3889our @WAIT_FOR_TICK;
3883our @WAIT_FOR_TICK_BEGIN; 3890our @WAIT_FOR_TICK_BEGIN;
3884 3891
3885sub wait_for_tick { 3892sub wait_for_tick {
3886 return if tick_inhibit || $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3887 3894
3888 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3889 push @WAIT_FOR_TICK, $signal; 3896 push @WAIT_FOR_TICK, $signal;
3890 $signal->wait; 3897 $signal->wait;
3891} 3898}
3892 3899
3893sub wait_for_tick_begin { 3900sub wait_for_tick_begin {
3894 return if tick_inhibit || $Coro::current == $Coro::main; 3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3895 3902
3896 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3897 push @WAIT_FOR_TICK_BEGIN, $signal; 3904 push @WAIT_FOR_TICK_BEGIN, $signal;
3898 $signal->wait; 3905 $signal->wait;
3899} 3906}

Diff Legend

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