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.410 by root, Tue Jan 15 12:02:24 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 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
198 210
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
215)) { 227)) {
216 no strict 'refs'; 228 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 230}
219 231
220$Event::DIED = sub { 232$EV::DIED = sub {
221 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
222}; 234};
223 235
224############################################################################# 236#############################################################################
225 237
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 261 $d
250 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
251} 263}
252 264
253=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
254 266
255Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
256 268
257=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
258 270
259Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
260 272
261=cut 273=cut
262 274
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 276
265sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
267 279
268=item cf::lock_wait $string 280=item cf::lock_wait $string
269 281
270Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
271 283
… …
334 my $guard = Coro::guard { 346 my $guard = Coro::guard {
335 $TICK_WATCHER->start; 347 $TICK_WATCHER->start;
336 }; 348 };
337 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
338 $guard 350 $guard
351}
352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
339} 366}
340 367
341=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
342 369
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
406 433
407BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
408 435
409=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
410 437
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 439is 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 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 441acceptable.
415 442
416If it must be done, put the blocking parts into C<sync_job>. This will run 443If 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 444the given BLOCK in another coroutine while waiting for the result. The
… …
422 449
423sub sync_job(&) { 450sub sync_job(&) {
424 my ($job) = @_; 451 my ($job) = @_;
425 452
426 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 454 my $time = EV::time;
428 455
429 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
431 458
432 LOG llevError, Carp::longmess "sync job";#d# 459 LOG llevError, Carp::longmess "sync job";#d#
… …
447 474
448 while ($busy) { 475 while ($busy) {
449 if (Coro::nready) { 476 if (Coro::nready) {
450 Coro::cede_notself; 477 Coro::cede_notself;
451 } else { 478 } else {
452 Event::one_event; 479 EV::loop EV::LOOP_ONESHOT;
453 } 480 }
454 } 481 }
455 482
456 $time = Event::time - $time; 483 $time = EV::time - $time;
457 484
458 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460 487
461 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
… …
491=item fork_call { }, $args 518=item fork_call { }, $args
492 519
493Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
497 524
498=cut 525=cut
499 526
500sub fork_call(&@) { 527sub fork_call(&@) {
501 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
… …
662attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
664 691
665In the following description, CLASS can be any of C<global>, C<object> 692In 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 693C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 694Deliantra).
668 695
669=over 4 696=over 4
670 697
671=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
672 699
… …
954 } 981 }
955 982
956 0 983 0
957} 984}
958 985
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 987
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 989
963Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
964 991
… …
1042cf::attachable->attach ( 1069cf::attachable->attach (
1043 prio => -1000000, 1070 prio => -1000000,
1044 on_instantiate => sub { 1071 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
1046 1073
1047 $data = from_json $data; 1074 $data = decode_json $data;
1048 1075
1049 for (@$data) { 1076 for (@$data) {
1050 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
1051 1078
1052 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
1548 1575
1549Expand crossfire pod fragments into protocol xml. 1576Expand crossfire pod fragments into protocol xml.
1550 1577
1551=cut 1578=cut
1552 1579
1553 use re 'eval'; 1580use re 'eval';
1554 1581
1555my $group; 1582my $group;
1556my $interior; $interior = qr{ 1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1557 (?: 1585 (?:
1558 \ (.*?)\ (?{ $group = $^N }) 1586 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) > 1587 | < (??{$interior}) >
1560 ) 1588 )
1561}x; 1589}x;
… …
1627 } 1655 }
1628 1656
1629 $xml 1657 $xml
1630} 1658}
1631 1659
1660no re 'eval';
1661
1632sub hintmode { 1662sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1; 1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode} 1664 $_[0]{hintmode}
1635} 1665}
1636 1666
… …
2622 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2623 } 2653 }
2624 2654
2625 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2626 2656
2627 my $data = cf::to_json $rmp; 2657 my $data = cf::encode_json $rmp;
2628 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2630 2660
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
… …
3132 { 3162 {
3133 my $faces = $facedata->{faceinfo}; 3163 my $faces = $facedata->{faceinfo};
3134 3164
3135 while (my ($face, $info) = each %$faces) { 3165 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3166 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167
3137 cf::face::set_visibility $idx, $info->{visibility}; 3168 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3169 cf::face::set_magicmap $idx, $info->{magicmap};
3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3170 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}; 3171 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3141 3172
3142 cf::cede_to_tick; 3173 cf::cede_to_tick;
3143 } 3174 }
3144 3175
3145 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3177 next unless $info->{smooth};
3178
3147 my $idx = cf::face::find $face 3179 my $idx = cf::face::find $face
3148 or next; 3180 or next;
3181
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3182 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3183 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3185 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3186 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3171 { 3204 {
3172 # TODO: for gcfclient pleasure, we should give resources 3205 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index. 3206 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3207 my $res = $facedata->{resource};
3175 3208
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3209 while (my ($name, $info) = each %$res) {
3210 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3211 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data; 3212 my $data;
3181 3213
3182 if ($info->{type} & 1) { 3214 if ($info->{type} & 1) {
3183 # prepend meta info 3215 # prepend meta info
3184 3216
3185 my $meta = $enc->encode ({ 3217 my $meta = $enc->encode ({
3186 name => $name, 3218 name => $name,
3187 %{ $info->{meta} || {} }, 3219 %{ $info->{meta} || {} },
3188 }); 3220 });
3189 3221
3190 $data = pack "(w/a*)*", $meta, $info->{data}; 3222 $data = pack "(w/a*)*", $meta, $info->{data};
3223 } else {
3224 $data = $info->{data};
3225 }
3226
3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type};
3191 } else { 3229 } else {
3192 $data = $info->{data}; 3230 $RESOURCE{$name} = $info;
3193 } 3231 }
3194 3232
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; 3233 cf::cede_to_tick;
3199 } 3234 }
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 } 3235 }
3236
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3238
3220 1 3239 1
3221} 3240}
3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
3222 3261
3223register_exticmd fx_want => sub { 3262register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_; 3263 my ($ns, $want) = @_;
3225 3264
3226 while (my ($k, $v) = each %$want) { 3265 while (my ($k, $v) = each %$want) {
… …
3281sub reload_config { 3320sub reload_config {
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3321 open my $fh, "<:utf8", "$CONFDIR/config"
3283 or return; 3322 or return;
3284 3323
3285 local $/; 3324 local $/;
3286 *CFG = YAML::Syck::Load <$fh>; 3325 *CFG = YAML::Load <$fh>;
3287 3326
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3289 3328
3290 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3329 $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}; 3330 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3303 # we must not ever block the main coroutine 3342 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3343 local $Coro::idle = sub {
3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3306 (async { 3345 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3346 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3347 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3348 })->prio (Coro::PRIO_MAX);
3310 }; 3349 };
3311 3350
3312 reload_config; 3351 reload_config;
3313 db_init; 3352 db_init;
3314 load_extensions; 3353 load_extensions;
3315 3354
3316 $TICK_WATCHER->start; 3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3317 Event::loop; 3357 EV::loop;
3318} 3358}
3319 3359
3320############################################################################# 3360#############################################################################
3321# initialisation and cleanup 3361# initialisation and cleanup
3322 3362
3323# install some emergency cleanup handlers 3363# install some emergency cleanup handlers
3324BEGIN { 3364BEGIN {
3365 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3366 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3367 $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"; 3368 cf::cleanup "SIG$signal";
3333 },
3334 ); 3369 };
3335 } 3370 }
3336} 3371}
3337 3372
3338sub write_runtime { 3373sub write_runtime {
3339 my $runtime = "$LOCALDIR/runtime"; 3374 my $runtime = "$LOCALDIR/runtime";
… …
3433 warn "syncing database to disk"; 3468 warn "syncing database to disk";
3434 BDB::db_env_txn_checkpoint $DB_ENV; 3469 BDB::db_env_txn_checkpoint $DB_ENV;
3435 3470
3436 # if anything goes wrong in here, we should simply crash as we already saved 3471 # if anything goes wrong in here, we should simply crash as we already saved
3437 3472
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"; 3473 warn "flushing outstanding aio requests";
3444 for (;;) { 3474 for (;;) {
3445 BDB::flush; 3475 BDB::flush;
3446 IO::AIO::flush; 3476 IO::AIO::flush;
3447 Coro::cede_notself; 3477 Coro::cede_notself;
… …
3541 3571
3542sub reload_perl() { 3572sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 3573 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 3574 # coro crashes during coro_state_free->destroy here.
3545 3575
3546 $RELOAD_WATCHER ||= Event->timer ( 3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3547 reentrant => 0,
3548 after => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => sub {
3551 do_reload_perl; 3577 do_reload_perl;
3552 undef $RELOAD_WATCHER; 3578 undef $RELOAD_WATCHER;
3553 },
3554 ); 3579 };
3555} 3580}
3556 3581
3557register_command "reload" => sub { 3582register_command "reload" => sub {
3558 my ($who, $arg) = @_; 3583 my ($who, $arg) = @_;
3559 3584
… …
3589 my $signal = new Coro::Signal; 3614 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 3615 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 3616 $signal->wait;
3592} 3617}
3593 3618
3594$TICK_WATCHER = Event->timer ( 3619$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) { 3620 if ($Coro::current != $Coro::main) {
3602 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3603 unless ++$bug_warning > 10; 3622 unless ++$bug_warning > 10;
3604 return; 3623 return;
3605 } 3624 }
3606 3625
3607 $NOW = $tick_start = Event::time; 3626 $NOW = $tick_start = EV::now;
3608 3627
3609 cf::server_tick; # one server iteration 3628 cf::server_tick; # one server iteration
3610 3629
3611 $RUNTIME += $TICK; 3630 $RUNTIME += $TICK;
3612 $NEXT_TICK += $TICK; 3631 $NEXT_TICK = $_[0]->at;
3613 3632
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3633 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 3635 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 3636 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 3637 write_runtime
3619 or warn "ERROR: unable to write runtime file: $!"; 3638 or warn "ERROR: unable to write runtime file: $!";
3620 };
3621 } 3639 };
3640 }
3622 3641
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 3643 $sig->send;
3625 } 3644 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 3645 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 3646 $sig->send;
3628 } 3647 }
3629 3648
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; 3649 $LOAD = ($NOW - $tick_start) / $TICK;
3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 3651
3641 _post_tick; 3652 _post_tick;
3642 }, 3653};
3643); 3654$TICK_WATCHER->priority (EV::MAXPRI);
3644 3655
3645{ 3656{
3657 # configure BDB
3658
3646 BDB::min_parallel 8; 3659 BDB::min_parallel 8;
3647 BDB::max_poll_time $TICK * 0.1; 3660 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 3661 $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 3662
3672 unless ($DB_ENV) { 3663 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 3664 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3675 | BDB::LOG_AUTOREMOVE, 1); 3666 | BDB::LOG_AUTOREMOVE, 1);
… …
3690 3681
3691 cf::cleanup "db_env_open(db): $@" if $@; 3682 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 3683 };
3693 } 3684 }
3694 3685
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 3686 $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 { }; 3687 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 ); 3688 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3689 $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 { }; 3690 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 3691 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 3692 $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 { }; 3693 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 3694 };
3725} 3695}
3726 3696
3727{ 3697{
3698 # configure IO::AIO
3699
3728 IO::AIO::min_parallel 8; 3700 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 3701 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 3702 $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} 3703}
3741 3704
3742my $_log_backtrace; 3705my $_log_backtrace;
3743 3706
3744sub _log_backtrace { 3707sub _log_backtrace {

Diff Legend

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