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.484 by root, Mon Oct 12 14:00:58 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;
… …
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
… …
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
… …
2341 : normalise $_ 2348 : normalise $_
2342 } @{ aio_readdir $UNIQUEDIR or [] } 2349 } @{ aio_readdir $UNIQUEDIR or [] }
2343 ] 2350 ]
2344} 2351}
2345 2352
2353=item cf::map::static_maps
2354
2355Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2356file in the shared directory excluding F</styles> and F</editor>). May
2357block.
2358
2359=cut
2360
2361sub static_maps() {
2362 my @dirs = "";
2363 my @maps;
2364
2365 while (@dirs) {
2366 my $dir = shift @dirs;
2367
2368 next if $dir eq "/styles" || $dir eq "/editor";
2369
2370 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2371 or return;
2372
2373 for (@$files) {
2374 s/\.map$// or next;
2375 utf8::decode $_;
2376 push @maps, "$dir/$_";
2377 }
2378
2379 push @dirs, map "$dir/$_", @$dirs;
2380 }
2381
2382 \@maps
2383}
2384
2346=back 2385=back
2347 2386
2348=head3 cf::object 2387=head3 cf::object
2349 2388
2350=cut 2389=cut
… …
2545 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2546 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2547 2586
2548 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2549 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2550 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2551 2590
2552 $map->load; 2591 $map->load;
2553 $map->load_neighbours; 2592 $map->load_neighbours;
2554 2593
2555 return unless $self->contr->active; 2594 return unless $self->contr->active;
… …
2754 2793
2755 utf8::encode $text; 2794 utf8::encode $text;
2756 $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);
2757} 2796}
2758 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);
2821}
2822
2759=item $client->send_msg ($channel, $msg, $color, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2760 2824
2761Send 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
2762client if neccessary. C<$type> should be a string identifying the type of 2826client if neccessary. C<$type> should be a string identifying the type of
2763the message, with C<log> being the default. If C<$color> is negative, suppress 2827the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2765 2829
2766=cut 2830=cut
2767 2831
2768# non-persistent channels (usually the info channel) 2832# non-persistent channels (usually the info channel)
2769our %CHANNEL = ( 2833our %CHANNEL = (
2834 "c/motd" => {
2835 id => "infobox",
2836 title => "MOTD",
2837 reply => undef,
2838 tooltip => "The message of the day",
2839 },
2770 "c/identify" => { 2840 "c/identify" => {
2771 id => "infobox", 2841 id => "infobox",
2772 title => "Identify", 2842 title => "Identify",
2773 reply => undef, 2843 reply => undef,
2774 tooltip => "Items recently identified", 2844 tooltip => "Items recently identified",
… …
2776 "c/examine" => { 2846 "c/examine" => {
2777 id => "infobox", 2847 id => "infobox",
2778 title => "Examine", 2848 title => "Examine",
2779 reply => undef, 2849 reply => undef,
2780 tooltip => "Signs and other items you examined", 2850 tooltip => "Signs and other items you examined",
2851 },
2852 "c/shopinfo" => {
2853 id => "infobox",
2854 title => "Shop Info",
2855 reply => undef,
2856 tooltip => "What your bargaining skill tells you about the shop",
2781 }, 2857 },
2782 "c/book" => { 2858 "c/book" => {
2783 id => "infobox", 2859 id => "infobox",
2784 title => "Book", 2860 title => "Book",
2785 reply => undef, 2861 reply => undef,
… …
2901 my $pkt = "msg " 2977 my $pkt = "msg "
2902 . $self->{json_coder}->encode ( 2978 . $self->{json_coder}->encode (
2903 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2904 ); 2980 );
2905 2981
2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2909
2910 # split very large packets
2911 if (8192 < length $pkt and $self->{can_lzf}) {
2912 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2913 $pkt = "frag";
2914 }
2915
2916 $self->send_packet ($pkt); 2982 $self->send_big_packet ($pkt);
2917} 2983}
2918 2984
2919=item $client->ext_msg ($type, @msg) 2985=item $client->ext_msg ($type, @msg)
2920 2986
2921Sends an ext event to the client. 2987Sends an ext event to the client.
… …
2924 2990
2925sub cf::client::ext_msg($$@) { 2991sub cf::client::ext_msg($$@) {
2926 my ($self, $type, @msg) = @_; 2992 my ($self, $type, @msg) = @_;
2927 2993
2928 if ($self->extcmd == 2) { 2994 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2930 } elsif ($self->extcmd == 1) { # TODO: remove 2996 } elsif ($self->extcmd == 1) { # TODO: remove
2931 push @msg, msgtype => "event_$type"; 2997 push @msg, msgtype => "event_$type";
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 } 2999 }
2934} 3000}
2935 3001
2936=item $client->ext_reply ($msgid, @msg) 3002=item $client->ext_reply ($msgid, @msg)
2937 3003
… …
2941 3007
2942sub cf::client::ext_reply($$@) { 3008sub cf::client::ext_reply($$@) {
2943 my ($self, $id, @msg) = @_; 3009 my ($self, $id, @msg) = @_;
2944 3010
2945 if ($self->extcmd == 2) { 3011 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2947 } elsif ($self->extcmd == 1) { 3013 } elsif ($self->extcmd == 1) {
2948 #TODO: version 1, remove 3014 #TODO: version 1, remove
2949 unshift @msg, msgtype => "reply", msgid => $id; 3015 unshift @msg, msgtype => "reply", msgid => $id;
2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 } 3017 }
2952} 3018}
2953 3019
2954=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2955 3021
… …
3082our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
3083 3149
3084$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
3085 3151
3086$safe->permit_only (Opcode::opset qw( 3152$safe->permit_only (Opcode::opset qw(
3087 :base_core :base_mem :base_orig :base_math 3153 :base_core :base_mem :base_orig :base_math :base_loop
3088 grepstart grepwhile mapstart mapwhile 3154 grepstart grepwhile mapstart mapwhile
3089 sort time 3155 sort time
3090)); 3156));
3091 3157
3092# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
… …
3144 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3145 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
3146 3212
3147 %vars = (_dummy => 0) unless %vars; 3213 %vars = (_dummy => 0) unless %vars;
3148 3214
3215 my @res;
3149 local $_; 3216 local $_;
3150 local @safe::cf::_safe_eval_args = values %vars;
3151 3217
3152 my $eval = 3218 my $eval =
3153 "do {\n" 3219 "do {\n"
3154 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3155 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
3156 . $code 3222 . $code
3157 . "\n}" 3223 . "\n}"
3158 ; 3224 ;
3159 3225
3226 if ($CFG{safe_eval}) {
3160 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
3161 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3162 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 }
3163 3235
3164 if ($@) { 3236 if ($@) {
3165 warn "$@"; 3237 warn "$@";
3166 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
3167 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
… …
3186=cut 3258=cut
3187 3259
3188sub register_script_function { 3260sub register_script_function {
3189 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
3190 3262
3191 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
3192 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
3193} 3265}
3194 3266
3195=back 3267=back
3196 3268
3197=cut 3269=cut
… …
3218 3290
3219 $facedata->{version} == 2 3291 $facedata->{version} == 2
3220 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
3221 3293
3222 # 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]);
3223 $facedata->{resource}{"res/exp_table"} = { 3296 $facedata->{resource}{"res/exp_table"} = {
3224 type => FT_RSRC, 3297 type => FT_RSRC,
3225 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),
3226 }; 3300 };
3227 cf::cede_to_tick; 3301 cf::cede_to_tick;
3228 3302
3229 { 3303 {
3230 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
… …
3232 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
3233 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3234 3308
3235 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
3236 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
3237 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3238 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3239 3313
3240 cf::cede_to_tick; 3314 cf::cede_to_tick;
3241 } 3315 }
3242 3316
3243 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
… …
3267 3341
3268 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
3269 } 3343 }
3270 3344
3271 { 3345 {
3272 # TODO: for gcfclient pleasure, we should give resources
3273 # that gcfclient doesn't grok a >10000 face index.
3274 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
3275 3347
3276 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
3277 if (defined $info->{type}) { 3349 if (defined $info->{type}) {
3278 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3279 my $data;
3280 3351
3281 if ($info->{type} & 1) { 3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3282 # prepend meta info
3283
3284 my $meta = $enc->encode ({
3285 name => $name,
3286 %{ $info->{meta} || {} },
3287 });
3288
3289 $data = pack "(w/a*)*", $meta, $info->{data};
3290 } else {
3291 $data = $info->{data};
3292 }
3293
3294 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3295 cf::face::set_type $idx, $info->{type}; 3353 cf::face::set_type $idx, $info->{type};
3296 } else { 3354 } else {
3297 $RESOURCE{$name} = $info; 3355 $RESOURCE{$name} = $info;
3298 } 3356 }
3299 3357
… …
3383 3441
3384 warn "finished reloading resource files\n"; 3442 warn "finished reloading resource files\n";
3385} 3443}
3386 3444
3387sub reload_config { 3445sub reload_config {
3446 warn "reloading config file...\n";
3447
3388 open my $fh, "<:utf8", "$CONFDIR/config" 3448 open my $fh, "<:utf8", "$CONFDIR/config"
3389 or return; 3449 or return;
3390 3450
3391 local $/; 3451 local $/;
3392 *CFG = YAML::XS::Load <$fh>; 3452 *CFG = YAML::XS::Load scalar <$fh>;
3393 3453
3394 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3395 3455
3396 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3397 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3401 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3402 and die "WARNING: m(un)lockall failed: $!\n"; 3462 and die "WARNING: m(un)lockall failed: $!\n";
3403 }; 3463 };
3404 warn $@ if $@; 3464 warn $@ if $@;
3405 } 3465 }
3466
3467 warn "finished reloading resource files\n";
3406} 3468}
3407 3469
3408sub pidfile() { 3470sub pidfile() {
3409 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3410 or die "$PIDFILE: $!"; 3472 or die "$PIDFILE: $!";
… …
3458 }; 3520 };
3459 3521
3460 evthread_start IO::AIO::poll_fileno; 3522 evthread_start IO::AIO::poll_fileno;
3461 3523
3462 cf::sync_job { 3524 cf::sync_job {
3525 cf::load_settings;
3526 cf::load_materials;
3527
3463 reload_resources; 3528 reload_resources;
3464 reload_config; 3529 reload_config;
3465 db_init; 3530 db_init;
3466 3531
3467 cf::load_settings;
3468 cf::load_materials;
3469 cf::init_uuid; 3532 cf::init_uuid;
3470 cf::init_signals; 3533 cf::init_signals;
3471 cf::init_commands; 3534 cf::init_commands;
3472 cf::init_skills; 3535 cf::init_skills;
3473 3536
… …
3832 3895
3833our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3834our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3835 3898
3836sub wait_for_tick { 3899sub wait_for_tick {
3837 return if tick_inhibit || $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3838 3901
3839 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3840 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3841 $signal->wait; 3904 $signal->wait;
3842} 3905}
3843 3906
3844sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3845 return if tick_inhibit || $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3846 3909
3847 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3848 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3849 $signal->wait; 3912 $signal->wait;
3850} 3913}
… …
3855 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3856 return; 3919 return;
3857 } 3920 }
3858 3921
3859 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#
3860 3925
3861 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3862 $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.;
3863 Coro::async_pool { 3928 Coro::async_pool {
3864 $Coro::current->{desc} = "runtime saver"; 3929 $Coro::current->{desc} = "runtime saver";

Diff Legend

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