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

Diff Legend

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