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.506 by root, Wed Feb 3 20:48:22 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
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;
… …
1392 . "\n};\n1"; 1399 . "\n};\n1";
1393 1400
1394 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1395 } 1402 }
1396 1403
1404 my $pass = 0;
1397 my %done; 1405 my %done;
1398 while (%todo) { 1406 while (%todo) {
1399 my $progress; 1407 my $progress;
1400 1408
1409 ++$pass;
1410
1411 ext:
1401 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1414 next ext
1404 unless exists $done{$_}; 1415 unless exists $done{$_};
1405 } 1416 }
1406 1417
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1419
1409 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1424
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1426 if exists $v->{meta}{mandatory};
1417 1427 } else {
1418 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1419 } 1434 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1435 }
1425 1436
1426 skip: 1437 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1429 } 1445 }
1430 }; 1446 };
1431} 1447}
1432 1448
1433############################################################################# 1449#############################################################################
… …
2009 2025
2010 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
2011 } 2027 }
2012} 2028}
2013 2029
2014sub pre_load { } 2030sub pre_load { }
2015sub post_load { } 2031#sub post_load { } # XS
2016 2032
2017sub load { 2033sub load {
2018 my ($self) = @_; 2034 my ($self) = @_;
2019 2035
2020 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
… …
2341 : normalise $_ 2357 : normalise $_
2342 } @{ aio_readdir $UNIQUEDIR or [] } 2358 } @{ aio_readdir $UNIQUEDIR or [] }
2343 ] 2359 ]
2344} 2360}
2345 2361
2362=item cf::map::static_maps
2363
2364Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2365file in the shared directory excluding F</styles> and F</editor>). May
2366block.
2367
2368=cut
2369
2370sub static_maps() {
2371 my @dirs = "";
2372 my @maps;
2373
2374 while (@dirs) {
2375 my $dir = shift @dirs;
2376
2377 next if $dir eq "/styles" || $dir eq "/editor";
2378
2379 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2380 or return;
2381
2382 for (@$files) {
2383 s/\.map$// or next;
2384 utf8::decode $_;
2385 push @maps, "$dir/$_";
2386 }
2387
2388 push @dirs, map "$dir/$_", @$dirs;
2389 }
2390
2391 \@maps
2392}
2393
2346=back 2394=back
2347 2395
2348=head3 cf::object 2396=head3 cf::object
2349 2397
2350=cut 2398=cut
… …
2545 ($x, $y) = (-1, -1) 2593 ($x, $y) = (-1, -1)
2546 unless (defined $x) && (defined $y); 2594 unless (defined $x) && (defined $y);
2547 2595
2548 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2549 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2550 if $x <=0 && $y <= 0; 2598 if $x <= 0 && $y <= 0;
2551 2599
2552 $map->load; 2600 $map->load;
2553 $map->load_neighbours; 2601 $map->load_neighbours;
2554 2602
2555 return unless $self->contr->active; 2603 return unless $self->contr->active;
… …
2752sub cf::client::send_drawinfo { 2800sub cf::client::send_drawinfo {
2753 my ($self, $text, $flags) = @_; 2801 my ($self, $text, $flags) = @_;
2754 2802
2755 utf8::encode $text; 2803 utf8::encode $text;
2756 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2805}
2806
2807=item $client->send_big_packet ($pkt)
2808
2809Like C<send_packet>, but tries to compress large packets, and fragments
2810them as required.
2811
2812=cut
2813
2814our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2815
2816sub cf::client::send_big_packet {
2817 my ($self, $pkt) = @_;
2818
2819 # try lzf for large packets
2820 $pkt = "lzf " . Compress::LZF::compress $pkt
2821 if 1024 <= length $pkt and $self->{can_lzf};
2822
2823 # split very large packets
2824 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2825 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2826 $pkt = "frag";
2827 }
2828
2829 $self->send_packet ($pkt);
2757} 2830}
2758 2831
2759=item $client->send_msg ($channel, $msg, $color, [extra...]) 2832=item $client->send_msg ($channel, $msg, $color, [extra...])
2760 2833
2761Send a drawinfo or msg packet to the client, formatting the msg for the 2834Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2913 my $pkt = "msg " 2986 my $pkt = "msg "
2914 . $self->{json_coder}->encode ( 2987 . $self->{json_coder}->encode (
2915 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2988 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2916 ); 2989 );
2917 2990
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); 2991 $self->send_big_packet ($pkt);
2929} 2992}
2930 2993
2931=item $client->ext_msg ($type, @msg) 2994=item $client->ext_msg ($type, @msg)
2932 2995
2933Sends an ext event to the client. 2996Sends an ext event to the client.
… …
2936 2999
2937sub cf::client::ext_msg($$@) { 3000sub cf::client::ext_msg($$@) {
2938 my ($self, $type, @msg) = @_; 3001 my ($self, $type, @msg) = @_;
2939 3002
2940 if ($self->extcmd == 2) { 3003 if ($self->extcmd == 2) {
2941 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2942 } elsif ($self->extcmd == 1) { # TODO: remove 3005 } elsif ($self->extcmd == 1) { # TODO: remove
2943 push @msg, msgtype => "event_$type"; 3006 push @msg, msgtype => "event_$type";
2944 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2945 } 3008 }
2946} 3009}
2947 3010
2948=item $client->ext_reply ($msgid, @msg) 3011=item $client->ext_reply ($msgid, @msg)
2949 3012
… …
2953 3016
2954sub cf::client::ext_reply($$@) { 3017sub cf::client::ext_reply($$@) {
2955 my ($self, $id, @msg) = @_; 3018 my ($self, $id, @msg) = @_;
2956 3019
2957 if ($self->extcmd == 2) { 3020 if ($self->extcmd == 2) {
2958 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2959 } elsif ($self->extcmd == 1) { 3022 } elsif ($self->extcmd == 1) {
2960 #TODO: version 1, remove 3023 #TODO: version 1, remove
2961 unshift @msg, msgtype => "reply", msgid => $id; 3024 unshift @msg, msgtype => "reply", msgid => $id;
2962 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2963 } 3026 }
2964} 3027}
2965 3028
2966=item $success = $client->query ($flags, "text", \&cb) 3029=item $success = $client->query ($flags, "text", \&cb)
2967 3030
… …
3094our $safe_hole = new Safe::Hole; 3157our $safe_hole = new Safe::Hole;
3095 3158
3096$SIG{FPE} = 'IGNORE'; 3159$SIG{FPE} = 'IGNORE';
3097 3160
3098$safe->permit_only (Opcode::opset qw( 3161$safe->permit_only (Opcode::opset qw(
3099 :base_core :base_mem :base_orig :base_math 3162 :base_core :base_mem :base_orig :base_math :base_loop
3100 grepstart grepwhile mapstart mapwhile 3163 grepstart grepwhile mapstart mapwhile
3101 sort time 3164 sort time
3102)); 3165));
3103 3166
3104# here we export the classes and methods available to script code 3167# here we export the classes and methods available to script code
… …
3156 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3219 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3157 $qcode =~ s/\n/\\n/g; 3220 $qcode =~ s/\n/\\n/g;
3158 3221
3159 %vars = (_dummy => 0) unless %vars; 3222 %vars = (_dummy => 0) unless %vars;
3160 3223
3224 my @res;
3161 local $_; 3225 local $_;
3162 local @safe::cf::_safe_eval_args = values %vars;
3163 3226
3164 my $eval = 3227 my $eval =
3165 "do {\n" 3228 "do {\n"
3166 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3229 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3167 . "#line 0 \"{$qcode}\"\n" 3230 . "#line 0 \"{$qcode}\"\n"
3168 . $code 3231 . $code
3169 . "\n}" 3232 . "\n}"
3170 ; 3233 ;
3171 3234
3235 if ($CFG{safe_eval}) {
3172 sub_generation_inc; 3236 sub_generation_inc;
3237 local @safe::cf::_safe_eval_args = values %vars;
3173 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3238 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3174 sub_generation_inc; 3239 sub_generation_inc;
3240 } else {
3241 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval;
3243 }
3175 3244
3176 if ($@) { 3245 if ($@) {
3177 warn "$@"; 3246 warn "$@";
3178 warn "while executing safe code '$code'\n"; 3247 warn "while executing safe code '$code'\n";
3179 warn "with arguments " . (join " ", %vars) . "\n"; 3248 warn "with arguments " . (join " ", %vars) . "\n";
… …
3198=cut 3267=cut
3199 3268
3200sub register_script_function { 3269sub register_script_function {
3201 my ($fun, $cb) = @_; 3270 my ($fun, $cb) = @_;
3202 3271
3203 no strict 'refs'; 3272 $fun = "safe::$fun" if $CFG{safe_eval};
3204 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3273 *$fun = $safe_hole->wrap ($cb);
3205} 3274}
3206 3275
3207=back 3276=back
3208 3277
3209=cut 3278=cut
… …
3230 3299
3231 $facedata->{version} == 2 3300 $facedata->{version} == 2
3232 or cf::cleanup "$path: version mismatch, cannot proceed."; 3301 or cf::cleanup "$path: version mismatch, cannot proceed.";
3233 3302
3234 # patch in the exptable 3303 # patch in the exptable
3304 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3235 $facedata->{resource}{"res/exp_table"} = { 3305 $facedata->{resource}{"res/exp_table"} = {
3236 type => FT_RSRC, 3306 type => FT_RSRC,
3237 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3307 data => $exp_table,
3308 hash => (Digest::MD5::md5 $exp_table),
3238 }; 3309 };
3239 cf::cede_to_tick; 3310 cf::cede_to_tick;
3240 3311
3241 { 3312 {
3242 my $faces = $facedata->{faceinfo}; 3313 my $faces = $facedata->{faceinfo};
… …
3244 while (my ($face, $info) = each %$faces) { 3315 while (my ($face, $info) = each %$faces) {
3245 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3316 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3246 3317
3247 cf::face::set_visibility $idx, $info->{visibility}; 3318 cf::face::set_visibility $idx, $info->{visibility};
3248 cf::face::set_magicmap $idx, $info->{magicmap}; 3319 cf::face::set_magicmap $idx, $info->{magicmap};
3249 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3250 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3251 3322
3252 cf::cede_to_tick; 3323 cf::cede_to_tick;
3253 } 3324 }
3254 3325
3255 while (my ($face, $info) = each %$faces) { 3326 while (my ($face, $info) = each %$faces) {
… …
3279 3350
3280 cf::anim::invalidate_all; # d'oh 3351 cf::anim::invalidate_all; # d'oh
3281 } 3352 }
3282 3353
3283 { 3354 {
3284 # TODO: for gcfclient pleasure, we should give resources
3285 # that gcfclient doesn't grok a >10000 face index.
3286 my $res = $facedata->{resource}; 3355 my $res = $facedata->{resource};
3287 3356
3288 while (my ($name, $info) = each %$res) { 3357 while (my ($name, $info) = each %$res) {
3289 if (defined $info->{type}) { 3358 if (defined $info->{type}) {
3290 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3359 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3291 my $data;
3292 3360
3293 if ($info->{type} & 1) { 3361 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}; 3362 cf::face::set_type $idx, $info->{type};
3308 } else { 3363 } else {
3309 $RESOURCE{$name} = $info; 3364 $RESOURCE{$name} = $info;
3310 } 3365 }
3311 3366
… …
3474 }; 3529 };
3475 3530
3476 evthread_start IO::AIO::poll_fileno; 3531 evthread_start IO::AIO::poll_fileno;
3477 3532
3478 cf::sync_job { 3533 cf::sync_job {
3534 cf::load_settings;
3535 cf::load_materials;
3536
3479 reload_resources; 3537 reload_resources;
3480 reload_config; 3538 reload_config;
3481 db_init; 3539 db_init;
3482 3540
3483 cf::load_settings;
3484 cf::load_materials;
3485 cf::init_uuid; 3541 cf::init_uuid;
3486 cf::init_signals; 3542 cf::init_signals;
3487 cf::init_commands; 3543 cf::init_commands;
3488 cf::init_skills; 3544 cf::init_skills;
3489 3545
… …
3517 }; 3573 };
3518 } 3574 }
3519} 3575}
3520 3576
3521sub write_runtime_sync { 3577sub write_runtime_sync {
3578 my $t0 = EV::time;
3579
3522 # first touch the runtime file to show we are still running: 3580 # first touch the runtime file to show we are still running:
3523 # the fsync below can take a very very long time. 3581 # the fsync below can take a very very long time.
3524 3582
3525 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3526 3584
3527 my $guard = cf::lock_acquire "write_runtime"; 3585 my $guard = cf::lock_acquire "write_runtime";
3528 3586
3529 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3587 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3530 or return; 3588 or return;
3531 3589
3532 my $value = $cf::RUNTIME + 90 + 10; 3590 my $value = $cf::RUNTIME + 90 + 10;
3533 # 10 is the runtime save interval, for a monotonic clock 3591 # 10 is the runtime save interval, for a monotonic clock
3534 # 60 allows for the watchdog to kill the server. 3592 # 60 allows for the watchdog to kill the server.
… …
3547 or return; 3605 or return;
3548 3606
3549 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3550 and return; 3608 and return;
3551 3609
3552 warn "runtime file written.\n"; 3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3553 3611
3554 1 3612 1
3555} 3613}
3556 3614
3557our $uuid_lock; 3615our $uuid_lock;
… …
3848 3906
3849our @WAIT_FOR_TICK; 3907our @WAIT_FOR_TICK;
3850our @WAIT_FOR_TICK_BEGIN; 3908our @WAIT_FOR_TICK_BEGIN;
3851 3909
3852sub wait_for_tick { 3910sub wait_for_tick {
3853 return if tick_inhibit || $Coro::current == $Coro::main; 3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3854 3912
3855 my $signal = new Coro::Signal; 3913 my $signal = new Coro::Signal;
3856 push @WAIT_FOR_TICK, $signal; 3914 push @WAIT_FOR_TICK, $signal;
3857 $signal->wait; 3915 $signal->wait;
3858} 3916}
3859 3917
3860sub wait_for_tick_begin { 3918sub wait_for_tick_begin {
3861 return if tick_inhibit || $Coro::current == $Coro::main; 3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3862 3920
3863 my $signal = new Coro::Signal; 3921 my $signal = new Coro::Signal;
3864 push @WAIT_FOR_TICK_BEGIN, $signal; 3922 push @WAIT_FOR_TICK_BEGIN, $signal;
3865 $signal->wait; 3923 $signal->wait;
3866} 3924}
… …
3871 unless ++$bug_warning > 10; 3929 unless ++$bug_warning > 10;
3872 return; 3930 return;
3873 } 3931 }
3874 3932
3875 cf::server_tick; # one server iteration 3933 cf::server_tick; # one server iteration
3934
3935 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3876 3936
3877 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3937 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3878 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3938 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3879 Coro::async_pool { 3939 Coro::async_pool {
3880 $Coro::current->{desc} = "runtime saver"; 3940 $Coro::current->{desc} = "runtime saver";
… …
3903} 3963}
3904 3964
3905{ 3965{
3906 # configure BDB 3966 # configure BDB
3907 3967
3908 BDB::min_parallel 8; 3968 BDB::min_parallel 16;
3909 BDB::max_poll_reqs $TICK * 0.1; 3969 BDB::max_poll_reqs $TICK * 0.1;
3910 $AnyEvent::BDB::WATCHER->priority (1); 3970 $AnyEvent::BDB::WATCHER->priority (1);
3911 3971
3912 unless ($DB_ENV) { 3972 unless ($DB_ENV) {
3913 $DB_ENV = BDB::db_env_create; 3973 $DB_ENV = BDB::db_env_create;

Diff Legend

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