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.490 by root, Sat Oct 24 06:16:40 2009 UTC vs.
Revision 1.502 by root, Sat Jan 23 20:24:50 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;
… …
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
… …
423 423
424=cut 424=cut
425 425
426our @SLOT_QUEUE; 426our @SLOT_QUEUE;
427our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
428 429
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
432 433
433 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
434 436
435 while () { 437 while () {
436 next_job: 438 next_job:
439
437 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 441
439 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 446 $job->[2]->send;
443 Coro::cede; 447 Coro::cede;
444 goto next_job; 448 goto next_job;
445 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 451 }
447 } 452 }
448 453
449 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 457 $signal->wait;
453 } else { 458 } else {
459 $busy = 0;
454 Coro::schedule; 460 Coro::schedule;
455 } 461 }
456 } 462 }
457}; 463};
458 464
459sub get_slot($;$$) { 465sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
461 467
462 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
463 469
464 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
465 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
466 473
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
2009 2016
2010 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
2011 } 2018 }
2012} 2019}
2013 2020
2014sub pre_load { } 2021sub pre_load { }
2015sub post_load { } 2022#sub post_load { } # XS
2016 2023
2017sub load { 2024sub load {
2018 my ($self) = @_; 2025 my ($self) = @_;
2019 2026
2020 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
… …
2344} 2351}
2345 2352
2346=item cf::map::static_maps 2353=item cf::map::static_maps
2347 2354
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map> 2355Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles>). May block. 2356file in the shared directory excluding F</styles> and F</editor>). May
2357block.
2350 2358
2351=cut 2359=cut
2352 2360
2353sub static_maps() { 2361sub static_maps() {
2354 my @dirs = ""; 2362 my @dirs = "";
2355 my @maps; 2363 my @maps;
2356 2364
2357 while (@dirs) { 2365 while (@dirs) {
2358 my $dir = shift @dirs; 2366 my $dir = shift @dirs;
2359 2367
2360 next if $dir eq "/styles"; 2368 next if $dir eq "/styles" || $dir eq "/editor";
2361 2369
2362 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2 2370 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2363 or return; 2371 or return;
2364 2372
2365 for (@$files) { 2373 for (@$files) {
… …
2576 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2577 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2578 2586
2579 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2580 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2581 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2582 2590
2583 $map->load; 2591 $map->load;
2584 $map->load_neighbours; 2592 $map->load_neighbours;
2585 2593
2586 return unless $self->contr->active; 2594 return unless $self->contr->active;
… …
2783sub cf::client::send_drawinfo { 2791sub cf::client::send_drawinfo {
2784 my ($self, $text, $flags) = @_; 2792 my ($self, $text, $flags) = @_;
2785 2793
2786 utf8::encode $text; 2794 utf8::encode $text;
2787 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2795 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2796}
2797
2798=item $client->send_big_packet ($pkt)
2799
2800Like C<send_packet>, but tries to compress large packets, and fragments
2801them as required.
2802
2803=cut
2804
2805our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2806
2807sub cf::client::send_big_packet {
2808 my ($self, $pkt) = @_;
2809
2810 # try lzf for large packets
2811 $pkt = "lzf " . Compress::LZF::compress $pkt
2812 if 1024 <= length $pkt and $self->{can_lzf};
2813
2814 # split very large packets
2815 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2816 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2817 $pkt = "frag";
2818 }
2819
2820 $self->send_packet ($pkt);
2788} 2821}
2789 2822
2790=item $client->send_msg ($channel, $msg, $color, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2791 2824
2792Send a drawinfo or msg packet to the client, formatting the msg for the 2825Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2944 my $pkt = "msg " 2977 my $pkt = "msg "
2945 . $self->{json_coder}->encode ( 2978 . $self->{json_coder}->encode (
2946 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2947 ); 2980 );
2948 2981
2949 # try lzf for large packets
2950 $pkt = "lzf " . Compress::LZF::compress $pkt
2951 if 1024 <= length $pkt and $self->{can_lzf};
2952
2953 # split very large packets
2954 if (8192 < length $pkt and $self->{can_lzf}) {
2955 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2956 $pkt = "frag";
2957 }
2958
2959 $self->send_packet ($pkt); 2982 $self->send_big_packet ($pkt);
2960} 2983}
2961 2984
2962=item $client->ext_msg ($type, @msg) 2985=item $client->ext_msg ($type, @msg)
2963 2986
2964Sends an ext event to the client. 2987Sends an ext event to the client.
… …
2967 2990
2968sub cf::client::ext_msg($$@) { 2991sub cf::client::ext_msg($$@) {
2969 my ($self, $type, @msg) = @_; 2992 my ($self, $type, @msg) = @_;
2970 2993
2971 if ($self->extcmd == 2) { 2994 if ($self->extcmd == 2) {
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2973 } elsif ($self->extcmd == 1) { # TODO: remove 2996 } elsif ($self->extcmd == 1) { # TODO: remove
2974 push @msg, msgtype => "event_$type"; 2997 push @msg, msgtype => "event_$type";
2975 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2976 } 2999 }
2977} 3000}
2978 3001
2979=item $client->ext_reply ($msgid, @msg) 3002=item $client->ext_reply ($msgid, @msg)
2980 3003
… …
2984 3007
2985sub cf::client::ext_reply($$@) { 3008sub cf::client::ext_reply($$@) {
2986 my ($self, $id, @msg) = @_; 3009 my ($self, $id, @msg) = @_;
2987 3010
2988 if ($self->extcmd == 2) { 3011 if ($self->extcmd == 2) {
2989 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2990 } elsif ($self->extcmd == 1) { 3013 } elsif ($self->extcmd == 1) {
2991 #TODO: version 1, remove 3014 #TODO: version 1, remove
2992 unshift @msg, msgtype => "reply", msgid => $id; 3015 unshift @msg, msgtype => "reply", msgid => $id;
2993 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2994 } 3017 }
2995} 3018}
2996 3019
2997=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2998 3021
… …
3125our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
3126 3149
3127$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
3128 3151
3129$safe->permit_only (Opcode::opset qw( 3152$safe->permit_only (Opcode::opset qw(
3130 :base_core :base_mem :base_orig :base_math 3153 :base_core :base_mem :base_orig :base_math :base_loop
3131 grepstart grepwhile mapstart mapwhile 3154 grepstart grepwhile mapstart mapwhile
3132 sort time 3155 sort time
3133)); 3156));
3134 3157
3135# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
… …
3187 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3188 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
3189 3212
3190 %vars = (_dummy => 0) unless %vars; 3213 %vars = (_dummy => 0) unless %vars;
3191 3214
3215 my @res;
3192 local $_; 3216 local $_;
3193 local @safe::cf::_safe_eval_args = values %vars;
3194 3217
3195 my $eval = 3218 my $eval =
3196 "do {\n" 3219 "do {\n"
3197 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3198 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
3199 . $code 3222 . $code
3200 . "\n}" 3223 . "\n}"
3201 ; 3224 ;
3202 3225
3226 if ($CFG{safe_eval}) {
3203 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
3204 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3205 sub_generation_inc; 3230 sub_generation_inc;
3231 } else {
3232 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval;
3234 }
3206 3235
3207 if ($@) { 3236 if ($@) {
3208 warn "$@"; 3237 warn "$@";
3209 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
3210 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
… …
3229=cut 3258=cut
3230 3259
3231sub register_script_function { 3260sub register_script_function {
3232 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
3233 3262
3234 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
3235 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
3236} 3265}
3237 3266
3238=back 3267=back
3239 3268
3240=cut 3269=cut
… …
3261 3290
3262 $facedata->{version} == 2 3291 $facedata->{version} == 2
3263 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
3264 3293
3265 # patch in the exptable 3294 # patch in the exptable
3295 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3266 $facedata->{resource}{"res/exp_table"} = { 3296 $facedata->{resource}{"res/exp_table"} = {
3267 type => FT_RSRC, 3297 type => FT_RSRC,
3268 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3298 data => $exp_table,
3299 hash => (Digest::MD5::md5 $exp_table),
3269 }; 3300 };
3270 cf::cede_to_tick; 3301 cf::cede_to_tick;
3271 3302
3272 { 3303 {
3273 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
… …
3275 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
3276 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3277 3308
3278 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
3279 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
3280 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3281 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3282 3313
3283 cf::cede_to_tick; 3314 cf::cede_to_tick;
3284 } 3315 }
3285 3316
3286 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
… …
3310 3341
3311 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
3312 } 3343 }
3313 3344
3314 { 3345 {
3315 # TODO: for gcfclient pleasure, we should give resources
3316 # that gcfclient doesn't grok a >10000 face index.
3317 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
3318 3347
3319 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
3320 if (defined $info->{type}) { 3349 if (defined $info->{type}) {
3321 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3322 my $data;
3323 3351
3324 if ($info->{type} & 1) { 3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3325 # prepend meta info
3326
3327 my $meta = $enc->encode ({
3328 name => $name,
3329 %{ $info->{meta} || {} },
3330 });
3331
3332 $data = pack "(w/a*)*", $meta, $info->{data};
3333 } else {
3334 $data = $info->{data};
3335 }
3336
3337 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3338 cf::face::set_type $idx, $info->{type}; 3353 cf::face::set_type $idx, $info->{type};
3339 } else { 3354 } else {
3340 $RESOURCE{$name} = $info; 3355 $RESOURCE{$name} = $info;
3341 } 3356 }
3342 3357
… …
3505 }; 3520 };
3506 3521
3507 evthread_start IO::AIO::poll_fileno; 3522 evthread_start IO::AIO::poll_fileno;
3508 3523
3509 cf::sync_job { 3524 cf::sync_job {
3525 cf::load_settings;
3526 cf::load_materials;
3527
3510 reload_resources; 3528 reload_resources;
3511 reload_config; 3529 reload_config;
3512 db_init; 3530 db_init;
3513 3531
3514 cf::load_settings;
3515 cf::load_materials;
3516 cf::init_uuid; 3532 cf::init_uuid;
3517 cf::init_signals; 3533 cf::init_signals;
3518 cf::init_commands; 3534 cf::init_commands;
3519 cf::init_skills; 3535 cf::init_skills;
3520 3536
… …
3879 3895
3880our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3881our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3882 3898
3883sub wait_for_tick { 3899sub wait_for_tick {
3884 return if tick_inhibit || $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3885 3901
3886 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3887 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3888 $signal->wait; 3904 $signal->wait;
3889} 3905}
3890 3906
3891sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3892 return if tick_inhibit || $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3893 3909
3894 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3895 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3896 $signal->wait; 3912 $signal->wait;
3897} 3913}
… …
3902 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3903 return; 3919 return;
3904 } 3920 }
3905 3921
3906 cf::server_tick; # one server iteration 3922 cf::server_tick; # one server iteration
3923
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3907 3925
3908 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3909 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3910 Coro::async_pool { 3928 Coro::async_pool {
3911 $Coro::current->{desc} = "runtime saver"; 3929 $Coro::current->{desc} = "runtime saver";

Diff Legend

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