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.496 by root, Sun Nov 15 18:03:59 2009 UTC vs.
Revision 1.499 by root, Sun Jan 10 17:43:46 2010 UTC

… …
3141our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
3142 3142
3143$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
3144 3144
3145$safe->permit_only (Opcode::opset qw( 3145$safe->permit_only (Opcode::opset qw(
3146 :base_core :base_mem :base_orig :base_math 3146 :base_core :base_mem :base_orig :base_math :base_loop
3147 grepstart grepwhile mapstart mapwhile 3147 grepstart grepwhile mapstart mapwhile
3148 sort time 3148 sort time
3149)); 3149));
3150 3150
3151# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
… …
3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3204 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3205 3205
3206 %vars = (_dummy => 0) unless %vars; 3206 %vars = (_dummy => 0) unless %vars;
3207 3207
3208 my @res;
3208 local $_; 3209 local $_;
3209 local @safe::cf::_safe_eval_args = values %vars;
3210 3210
3211 my $eval = 3211 my $eval =
3212 "do {\n" 3212 "do {\n"
3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3214 . "#line 0 \"{$qcode}\"\n" 3214 . "#line 0 \"{$qcode}\"\n"
3215 . $code 3215 . $code
3216 . "\n}" 3216 . "\n}"
3217 ; 3217 ;
3218 3218
3219 if ($CFG{safe_eval}) {
3219 sub_generation_inc; 3220 sub_generation_inc;
3221 local @safe::cf::_safe_eval_args = values %vars;
3220 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3222 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3221 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 }
3222 3228
3223 if ($@) { 3229 if ($@) {
3224 warn "$@"; 3230 warn "$@";
3225 warn "while executing safe code '$code'\n"; 3231 warn "while executing safe code '$code'\n";
3226 warn "with arguments " . (join " ", %vars) . "\n"; 3232 warn "with arguments " . (join " ", %vars) . "\n";
… …
3880 3886
3881our @WAIT_FOR_TICK; 3887our @WAIT_FOR_TICK;
3882our @WAIT_FOR_TICK_BEGIN; 3888our @WAIT_FOR_TICK_BEGIN;
3883 3889
3884sub wait_for_tick { 3890sub wait_for_tick {
3885 return if tick_inhibit || $Coro::current == $Coro::main; 3891 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3886 3892
3887 my $signal = new Coro::Signal; 3893 my $signal = new Coro::Signal;
3888 push @WAIT_FOR_TICK, $signal; 3894 push @WAIT_FOR_TICK, $signal;
3889 $signal->wait; 3895 $signal->wait;
3890} 3896}
3891 3897
3892sub wait_for_tick_begin { 3898sub wait_for_tick_begin {
3893 return if tick_inhibit || $Coro::current == $Coro::main; 3899 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3894 3900
3895 my $signal = new Coro::Signal; 3901 my $signal = new Coro::Signal;
3896 push @WAIT_FOR_TICK_BEGIN, $signal; 3902 push @WAIT_FOR_TICK_BEGIN, $signal;
3897 $signal->wait; 3903 $signal->wait;
3898} 3904}

Diff Legend

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