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.393 by root, Fri Oct 26 04:47:00 2007 UTC vs.
Revision 1.406 by root, Mon Dec 17 08:27:44 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Event; 9use EV 1.86;
10use Opcode; 10use Opcode;
11use Safe; 11use Safe;
12use Safe::Hole; 12use Safe::Hole;
13use Storable (); 13use Storable ();
14 14
15use Coro 4.1 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML::Syck ();
… …
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 43
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
47 46
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
75 75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
83 82
84our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 84our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 85our $BDB_CHECKPOINT_WATCHER;
… …
89 88
90our %CFG; 89our %CFG;
91 90
92our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 92our $RUNTIME;
93our $NOW;
94 94
95our (%PLAYER, %PLAYER_LOADING); # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 96our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
98 98
… …
162 162
163The raw value load value from the last tick. 163The raw value load value from the last tick.
164 164
165=item %cf::CFG 165=item %cf::CFG
166 166
167Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 168from wherever your confdir points to.
169 169
170=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
171 171
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
215)) { 215)) {
216 no strict 'refs'; 216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 218}
219 219
220$Event::DIED = sub { 220$EV::DIED = sub {
221 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
222}; 222};
223 223
224############################################################################# 224#############################################################################
225 225
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 249 $d
250 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
251} 251}
252 252
253=item $ref = cf::from_json $json 253=item $ref = cf::decode_json $json
254 254
255Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
256 256
257=item $json = cf::to_json $ref 257=item $json = cf::encode_json $ref
258 258
259Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260 260
261=cut 261=cut
262 262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 264
265sub to_json ($) { $json_coder->encode ($_[0]) } 265sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 266sub decode_json($) { $json_coder->decode ($_[0]) }
267 267
268=item cf::lock_wait $string 268=item cf::lock_wait $string
269 269
270Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
271 271
… …
334 my $guard = Coro::guard { 334 my $guard = Coro::guard {
335 $TICK_WATCHER->start; 335 $TICK_WATCHER->start;
336 }; 336 };
337 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
338 $guard 338 $guard
339}
340
341=item cf::periodic $interval, $cb
342
343Like EV::periodic, but randomly selects a starting point so that the actions
344get spread over timer.
345
346=cut
347
348sub periodic($$) {
349 my ($interval, $cb) = @_;
350
351 my $start = rand List::Util::min 180, $interval;
352
353 EV::periodic $start, $interval, 0, $cb
339} 354}
340 355
341=item cf::get_slot $time[, $priority[, $name]] 356=item cf::get_slot $time[, $priority[, $name]]
342 357
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 358Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
406 421
407BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
408 423
409=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
410 425
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 426The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 427is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 428partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 429acceptable.
415 430
416If it must be done, put the blocking parts into C<sync_job>. This will run 431If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
… …
422 437
423sub sync_job(&) { 438sub sync_job(&) {
424 my ($job) = @_; 439 my ($job) = @_;
425 440
426 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 442 my $time = EV::time;
428 443
429 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
431 446
432 LOG llevError, Carp::longmess "sync job";#d# 447 LOG llevError, Carp::longmess "sync job";#d#
… …
447 462
448 while ($busy) { 463 while ($busy) {
449 if (Coro::nready) { 464 if (Coro::nready) {
450 Coro::cede_notself; 465 Coro::cede_notself;
451 } else { 466 } else {
452 Event::one_event; 467 EV::loop EV::LOOP_ONESHOT;
453 } 468 }
454 } 469 }
455 470
456 $time = Event::time - $time; 471 $time = EV::time - $time;
457 472
458 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460 475
461 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
… …
491=item fork_call { }, $args 506=item fork_call { }, $args
492 507
493Executes the given code block with the given arguments in a seperate 508Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 509process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 510Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 511never block itself or use any form of event handling.
497 512
498=cut 513=cut
499 514
500sub fork_call(&@) { 515sub fork_call(&@) {
501 my ($cb, @args) = @_; 516 my ($cb, @args) = @_;
… …
662attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
664 679
665In the following description, CLASS can be any of C<global>, C<object> 680In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 681C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 682Deliantra).
668 683
669=over 4 684=over 4
670 685
671=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
672 687
… …
954 } 969 }
955 970
956 0 971 0
957} 972}
958 973
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 974=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 975
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 977
963Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
964 979
… …
1042cf::attachable->attach ( 1057cf::attachable->attach (
1043 prio => -1000000, 1058 prio => -1000000,
1044 on_instantiate => sub { 1059 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
1046 1061
1047 $data = from_json $data; 1062 $data = decode_json $data;
1048 1063
1049 for (@$data) { 1064 for (@$data) {
1050 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
1051 1066
1052 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
… …
2625 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2626 } 2641 }
2627 2642
2628 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2629 2644
2630 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2631 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2632 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2633 2648
2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
… …
3135 { 3150 {
3136 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
3137 3152
3138 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
3139 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
3140 cf::face::set_visibility $idx, $info->{visibility}; 3156 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap}; 3157 cf::face::set_magicmap $idx, $info->{magicmap};
3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3144 3160
3145 cf::cede_to_tick; 3161 cf::cede_to_tick;
3146 } 3162 }
3147 3163
3148 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
3149 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
3150 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
3151 or next; 3168 or next;
3169
3152 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth; 3171 cf::face::set_smooth $idx, $smooth;
3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155 } else { 3173 } else {
3156 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3174 { 3192 {
3175 # TODO: for gcfclient pleasure, we should give resources 3193 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index. 3194 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource}; 3195 my $res = $facedata->{resource};
3178 3196
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) { 3197 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data; 3200 my $data;
3184 3201
3185 if ($info->{type} & 1) { 3202 if ($info->{type} & 1) {
3186 # prepend meta info 3203 # prepend meta info
3187 3204
3188 my $meta = $enc->encode ({ 3205 my $meta = $enc->encode ({
3189 name => $name, 3206 name => $name,
3190 %{ $info->{meta} || {} }, 3207 %{ $info->{meta} || {} },
3191 }); 3208 });
3192 3209
3193 $data = pack "(w/a*)*", $meta, $info->{data}; 3210 $data = pack "(w/a*)*", $meta, $info->{data};
3211 } else {
3212 $data = $info->{data};
3213 }
3214
3215 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3216 cf::face::set_type $idx, $info->{type};
3194 } else { 3217 } else {
3195 $data = $info->{data}; 3218 $RESOURCE{$name} = $info;
3196 } 3219 }
3197 3220
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick; 3221 cf::cede_to_tick;
3202 } 3222 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 } 3223 }
3224
3225 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222 3226
3223 1 3227 1
3224} 3228}
3229
3230cf::global->attach (on_resource_update => sub {
3231 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3232 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3233
3234 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3235 my $sound = $soundconf->{compat}[$_]
3236 or next;
3237
3238 my $face = cf::face::find "sound/$sound->[1]";
3239 cf::sound::set $sound->[0] => $face;
3240 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3241 }
3242
3243 while (my ($k, $v) = each %{$soundconf->{event}}) {
3244 my $face = cf::face::find "sound/$v";
3245 cf::sound::set $k => $face;
3246 }
3247 }
3248});
3225 3249
3226register_exticmd fx_want => sub { 3250register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_; 3251 my ($ns, $want) = @_;
3228 3252
3229 while (my ($k, $v) = each %$want) { 3253 while (my ($k, $v) = each %$want) {
… …
3306 # we must not ever block the main coroutine 3330 # we must not ever block the main coroutine
3307 local $Coro::idle = sub { 3331 local $Coro::idle = sub {
3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3332 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3309 (async { 3333 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3334 $Coro::current->{desc} = "IDLE BUG HANDLER";
3311 Event::one_event; 3335 EV::loop EV::LOOP_ONESHOT;
3312 })->prio (Coro::PRIO_MAX); 3336 })->prio (Coro::PRIO_MAX);
3313 }; 3337 };
3314 3338
3315 reload_config; 3339 reload_config;
3316 db_init; 3340 db_init;
3317 load_extensions; 3341 load_extensions;
3318 3342
3319 $TICK_WATCHER->start; 3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3320 Event::loop; 3345 EV::loop;
3321} 3346}
3322 3347
3323############################################################################# 3348#############################################################################
3324# initialisation and cleanup 3349# initialisation and cleanup
3325 3350
3326# install some emergency cleanup handlers 3351# install some emergency cleanup handlers
3327BEGIN { 3352BEGIN {
3353 our %SIGWATCHER = ();
3328 for my $signal (qw(INT HUP TERM)) { 3354 for my $signal (qw(INT HUP TERM)) {
3329 Event->signal ( 3355 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3330 reentrant => 0,
3331 data => WF_AUTOCANCEL,
3332 signal => $signal,
3333 prio => 0,
3334 cb => sub {
3335 cf::cleanup "SIG$signal"; 3356 cf::cleanup "SIG$signal";
3336 },
3337 ); 3357 };
3338 } 3358 }
3339} 3359}
3340 3360
3341sub write_runtime { 3361sub write_runtime {
3342 my $runtime = "$LOCALDIR/runtime"; 3362 my $runtime = "$LOCALDIR/runtime";
… …
3436 warn "syncing database to disk"; 3456 warn "syncing database to disk";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3457 BDB::db_env_txn_checkpoint $DB_ENV;
3438 3458
3439 # if anything goes wrong in here, we should simply crash as we already saved 3459 # if anything goes wrong in here, we should simply crash as we already saved
3440 3460
3441 warn "cancelling all WF_AUTOCANCEL watchers";
3442 for (Event::all_watchers) {
3443 $_->cancel if $_->data & WF_AUTOCANCEL;
3444 }
3445
3446 warn "flushing outstanding aio requests"; 3461 warn "flushing outstanding aio requests";
3447 for (;;) { 3462 for (;;) {
3448 BDB::flush; 3463 BDB::flush;
3449 IO::AIO::flush; 3464 IO::AIO::flush;
3450 Coro::cede_notself; 3465 Coro::cede_notself;
… …
3544 3559
3545sub reload_perl() { 3560sub reload_perl() {
3546 # doing reload synchronously and two reloads happen back-to-back, 3561 # doing reload synchronously and two reloads happen back-to-back,
3547 # coro crashes during coro_state_free->destroy here. 3562 # coro crashes during coro_state_free->destroy here.
3548 3563
3549 $RELOAD_WATCHER ||= Event->timer ( 3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3550 reentrant => 0,
3551 after => 0,
3552 data => WF_AUTOCANCEL,
3553 cb => sub {
3554 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3565 undef $RELOAD_WATCHER;
3556 }, 3566 do_reload_perl;
3557 ); 3567 };
3558} 3568}
3559 3569
3560register_command "reload" => sub { 3570register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3571 my ($who, $arg) = @_;
3562 3572
… …
3592 my $signal = new Coro::Signal; 3602 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3603 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3604 $signal->wait;
3595} 3605}
3596 3606
3597$TICK_WATCHER = Event->timer ( 3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3598 reentrant => 0,
3599 parked => 1,
3600 prio => 0,
3601 at => $NEXT_TICK || $TICK,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 if ($Coro::current != $Coro::main) { 3608 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3609 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 3610 unless ++$bug_warning > 10;
3607 return; 3611 return;
3608 } 3612 }
3609 3613
3610 $NOW = $tick_start = Event::time; 3614 $NOW = $tick_start = EV::now;
3611 3615
3612 cf::server_tick; # one server iteration 3616 cf::server_tick; # one server iteration
3613 3617
3614 $RUNTIME += $TICK; 3618 $RUNTIME += $TICK;
3615 $NEXT_TICK += $TICK; 3619 $NEXT_TICK = $_[0]->at;
3616 3620
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3621 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = $NOW + 10; 3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3623 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3624 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3625 write_runtime
3622 or warn "ERROR: unable to write runtime file: $!"; 3626 or warn "ERROR: unable to write runtime file: $!";
3623 };
3624 } 3627 };
3628 }
3625 3629
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627 $sig->send; 3631 $sig->send;
3628 } 3632 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3633 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3634 $sig->send;
3631 } 3635 }
3632 3636
3633 $NOW = Event::time;
3634
3635 # if we are delayed by four ticks or more, skip them all
3636 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3637
3638 $TICK_WATCHER->at ($NEXT_TICK);
3639 $TICK_WATCHER->start;
3640
3641 $LOAD = ($NOW - $tick_start) / $TICK; 3637 $LOAD = ($NOW - $tick_start) / $TICK;
3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643 3639
3644 _post_tick; 3640 _post_tick;
3645 }, 3641};
3646); 3642$TICK_WATCHER->priority (EV::MAXPRI);
3647 3643
3648{ 3644{
3645 # configure BDB
3646
3649 BDB::min_parallel 8; 3647 BDB::min_parallel 8;
3650 BDB::max_poll_time $TICK * 0.1; 3648 BDB::max_poll_reqs $TICK * 0.1;
3651 $BDB_POLL_WATCHER = Event->io ( 3649 $Coro::BDB::WATCHER->priority (1);
3652 reentrant => 0,
3653 fd => BDB::poll_fileno,
3654 poll => 'r',
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => \&BDB::poll_cb,
3658 );
3659
3660 BDB::set_sync_prepare {
3661 my $status;
3662 my $current = $Coro::current;
3663 (
3664 sub {
3665 $status = $!;
3666 $current->ready; undef $current;
3667 },
3668 sub {
3669 Coro::schedule while defined $current;
3670 $! = $status;
3671 },
3672 )
3673 };
3674 3650
3675 unless ($DB_ENV) { 3651 unless ($DB_ENV) {
3676 $DB_ENV = BDB::db_env_create; 3652 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1); 3654 | BDB::LOG_AUTOREMOVE, 1);
… …
3693 3669
3694 cf::cleanup "db_env_open(db): $@" if $@; 3670 cf::cleanup "db_env_open(db): $@" if $@;
3695 }; 3671 };
3696 } 3672 }
3697 3673
3698 $BDB_DEADLOCK_WATCHER = Event->timer ( 3674 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3675 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 ); 3676 };
3708 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3677 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3678 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 ); 3679 };
3718 $BDB_TRICKLE_WATCHER = Event->timer ( 3680 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3681 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 ); 3682 };
3728} 3683}
3729 3684
3730{ 3685{
3686 # configure IO::AIO
3687
3731 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3732
3733 undef $Coro::AIO::WATCHER;
3734 IO::AIO::max_poll_time $TICK * 0.1; 3689 IO::AIO::max_poll_time $TICK * 0.1;
3735 $AIO_POLL_WATCHER = Event->io ( 3690 $Coro::AIO::WATCHER->priority (1);
3736 reentrant => 0,
3737 data => WF_AUTOCANCEL,
3738 fd => IO::AIO::poll_fileno,
3739 poll => 'r',
3740 prio => 0,
3741 cb => \&IO::AIO::poll_cb,
3742 );
3743} 3691}
3744 3692
3745my $_log_backtrace; 3693my $_log_backtrace;
3746 3694
3747sub _log_backtrace { 3695sub _log_backtrace {

Diff Legend

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