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.387 by root, Mon Oct 15 23:49:10 2007 UTC vs.
Revision 1.398 by root, Wed Dec 5 11:08:34 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;
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.1 ();
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::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS (); 26use JSON::XS 2.01 ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
… …
37# configure various modules to our taste 37# configure various modules to our taste
38# 38#
39$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::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 41Compress::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 42
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
47 45
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
… …
162 160
163The raw value load value from the last tick. 161The raw value load value from the last tick.
164 162
165=item %cf::CFG 163=item %cf::CFG
166 164
167Configuration for the server, loaded from C</etc/crossfire/config>, or 165Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 166from wherever your confdir points to.
169 167
170=item cf::wait_for_tick, cf::wait_for_tick_begin 168=item cf::wait_for_tick, cf::wait_for_tick_begin
171 169
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 170These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
215)) { 213)) {
216 no strict 'refs'; 214 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 216}
219 217
220$Event::DIED = sub { 218$EV::DIED = sub {
221 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
222}; 220};
223 221
224############################################################################# 222#############################################################################
225 223
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 247 $d
250 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
251} 249}
252 250
253=item $ref = cf::from_json $json 251=item $ref = cf::decode_json $json
254 252
255Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
256 254
257=item $json = cf::to_json $ref 255=item $json = cf::encode_json $ref
258 256
259Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
260 258
261=cut 259=cut
262 260
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 262
265sub to_json ($) { $json_coder->encode ($_[0]) } 263sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 264sub decode_json($) { $json_coder->decode ($_[0]) }
267 265
268=item cf::lock_wait $string 266=item cf::lock_wait $string
269 267
270Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
271 269
… …
334 my $guard = Coro::guard { 332 my $guard = Coro::guard {
335 $TICK_WATCHER->start; 333 $TICK_WATCHER->start;
336 }; 334 };
337 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
338 $guard 336 $guard
337}
338
339=item cf::periodic $interval, $cb
340
341Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer.
343
344=cut
345
346sub periodic($$) {
347 my ($interval, $cb) = @_;
348
349 my $start = rand List::Util::min 180, $interval;
350
351 EV::periodic $start, $interval, 0, $cb
339} 352}
340 353
341=item cf::get_slot $time[, $priority[, $name]] 354=item cf::get_slot $time[, $priority[, $name]]
342 355
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 356Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
406 419
407BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
408 421
409=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
410 423
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 424The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 425is 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 426partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 427acceptable.
415 428
416If it must be done, put the blocking parts into C<sync_job>. This will run 429If 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 430the given BLOCK in another coroutine while waiting for the result. The
… …
422 435
423sub sync_job(&) { 436sub sync_job(&) {
424 my ($job) = @_; 437 my ($job) = @_;
425 438
426 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 440 my $time = EV::time;
428 441
429 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
431 444
432 LOG llevError, Carp::longmess "sync job";#d# 445 LOG llevError, Carp::longmess "sync job";#d#
… …
447 460
448 while ($busy) { 461 while ($busy) {
449 if (Coro::nready) { 462 if (Coro::nready) {
450 Coro::cede_notself; 463 Coro::cede_notself;
451 } else { 464 } else {
452 Event::one_event; 465 EV::loop EV::LOOP_ONESHOT;
453 } 466 }
454 } 467 }
455 468
456 $time = Event::time - $time; 469 $time = EV::time - $time;
457 470
458 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460 473
461 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
… …
491=item fork_call { }, $args 504=item fork_call { }, $args
492 505
493Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
497 510
498=cut 511=cut
499 512
500sub fork_call(&@) { 513sub fork_call(&@) {
501 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
… …
662attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
664 677
665In the following description, CLASS can be any of C<global>, C<object> 678In 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 679C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 680Deliantra).
668 681
669=over 4 682=over 4
670 683
671=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
672 685
… …
1042cf::attachable->attach ( 1055cf::attachable->attach (
1043 prio => -1000000, 1056 prio => -1000000,
1044 on_instantiate => sub { 1057 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1058 my ($obj, $data) = @_;
1046 1059
1047 $data = from_json $data; 1060 $data = decode_json $data;
1048 1061
1049 for (@$data) { 1062 for (@$data) {
1050 my ($name, $args) = @$_; 1063 my ($name, $args) = @$_;
1051 1064
1052 $obj->attach ($name, %{$args || {} }); 1065 $obj->attach ($name, %{$args || {} });
… …
1081 close $fh; 1094 close $fh;
1082 1095
1083 if (@$objs) { 1096 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1102 close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1104 }
… …
1122 1135
1123 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1124 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1125 or return; 1138 or return;
1126 1139
1127 my $st = eval { Coro::Storable::thaw $av } 1140 my $st = eval { Coro::Storable::thaw $av };
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs}; 1141 $av = $st->{objs};
1130 } 1142 }
1131 1143
1132 utf8::decode (my $decname = $filename); 1144 utf8::decode (my $decname = $filename);
1133 warn sprintf "loading %s (%d,%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
… …
1549 1561
1550Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1551 1563
1552=cut 1564=cut
1553 1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1554sub expand_cfpod { 1577sub expand_cfpod {
1555 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1556 1579
1557 # escape & and < 1580 my $xml;
1558 s/&/&amp;/g;
1559 s/(?<![BIUGHT])</&lt;/g;
1560 1581
1561 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1562 1585
1563 1 while 1586 $group =~ s/&/&amp;/g;
1564 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1565 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1566 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1567 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1591 ([BCGHITU])
1569 # replace G<male|female> tags 1592 <
1570 || s{G<([^>|]*)\|([^>]*)>}{ 1593 (?:
1571 $self->gender ? $2 : $1 1594 ([^<>]*) (?{ $group = $^N })
1572 }ge 1595 | < $interior >
1573 # replace H<hint text> 1596 )
1574 || s{H<([^\>]*)>} 1597 >
1598 %gcsx
1575 { 1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1576 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1577 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1578 "") 1619 "")
1579 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1580 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1581 1631
1632 for ($xml) {
1582 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1583 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1584 1635
1585 # compress some whitespace 1636 # compress some whitespace
1586 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1587 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1588 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1589 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1590 1642
1591 $_ 1643 $xml
1592} 1644}
1645
1646no re 'eval';
1593 1647
1594sub hintmode { 1648sub hintmode {
1595 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1596 $_[0]{hintmode} 1650 $_[0]{hintmode}
1597} 1651}
… …
2584 $rmp->{origin_y} = $exit->y; 2638 $rmp->{origin_y} = $exit->y;
2585 } 2639 }
2586 2640
2587 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2588 2642
2589 my $data = cf::to_json $rmp; 2643 my $data = cf::encode_json $rmp;
2590 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2591 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2592 2646
2593 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2594 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
… …
2667the message, with C<log> being the default. If C<$color> is negative, suppress 2721the message, with C<log> being the default. If C<$color> is negative, suppress
2668the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2669 2723
2670=cut 2724=cut
2671 2725
2726# non-persistent channels (usually the info channel)
2672our %CHANNEL = ( 2727our %CHANNEL = (
2673 "c/identify" => { 2728 "c/identify" => {
2674 id => "infobox", 2729 id => "infobox",
2675 title => "Identify", 2730 title => "Identify",
2676 reply => undef, 2731 reply => undef,
… …
2680 id => "infobox", 2735 id => "infobox",
2681 title => "Examine", 2736 title => "Examine",
2682 reply => undef, 2737 reply => undef,
2683 tooltip => "Signs and other items you examined", 2738 tooltip => "Signs and other items you examined",
2684 }, 2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2685 "c/lookat" => { 2746 "c/lookat" => {
2686 id => "infobox", 2747 id => "infobox",
2687 title => "Look", 2748 title => "Look",
2688 reply => undef, 2749 reply => undef,
2689 tooltip => "What you saw there", 2750 tooltip => "What you saw there",
2751 },
2752 "c/who" => {
2753 id => "infobox",
2754 title => "Players",
2755 reply => undef,
2756 tooltip => "Shows players who are currently online",
2757 },
2758 "c/body" => {
2759 id => "infobox",
2760 title => "Body Parts",
2761 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available",
2763 },
2764 "c/uptime" => {
2765 id => "infobox",
2766 title => "Uptime",
2767 reply => undef,
2768 tooltip => "How long the server has been running since last restart",
2769 },
2770 "c/mapinfo" => {
2771 id => "infobox",
2772 title => "Map Info",
2773 reply => undef,
2774 tooltip => "Information related to the maps",
2690 }, 2775 },
2691); 2776);
2692 2777
2693sub cf::client::send_msg { 2778sub cf::client::send_msg {
2694 my ($self, $channel, $msg, $color, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
… …
3234 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
3235 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3237 (async { 3322 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3239 Event::one_event; 3324 EV::loop EV::LOOP_ONESHOT;
3240 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
3241 }; 3326 };
3242 3327
3243 reload_config; 3328 reload_config;
3244 db_init; 3329 db_init;
3245 load_extensions; 3330 load_extensions;
3246 3331
3247 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3248 Event::loop; 3334 EV::loop;
3249} 3335}
3250 3336
3251############################################################################# 3337#############################################################################
3252# initialisation and cleanup 3338# initialisation and cleanup
3253 3339
3254# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
3255BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
3256 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
3257 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3258 reentrant => 0,
3259 data => WF_AUTOCANCEL,
3260 signal => $signal,
3261 prio => 0,
3262 cb => sub {
3263 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
3264 },
3265 ); 3346 };
3266 } 3347 }
3267} 3348}
3268 3349
3269sub write_runtime { 3350sub write_runtime {
3270 my $runtime = "$LOCALDIR/runtime"; 3351 my $runtime = "$LOCALDIR/runtime";
… …
3364 warn "syncing database to disk"; 3445 warn "syncing database to disk";
3365 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
3366 3447
3367 # if anything goes wrong in here, we should simply crash as we already saved 3448 # if anything goes wrong in here, we should simply crash as we already saved
3368 3449
3369 warn "cancelling all WF_AUTOCANCEL watchers";
3370 for (Event::all_watchers) {
3371 $_->cancel if $_->data & WF_AUTOCANCEL;
3372 }
3373
3374 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
3375 for (;;) { 3451 for (;;) {
3376 BDB::flush; 3452 BDB::flush;
3377 IO::AIO::flush; 3453 IO::AIO::flush;
3378 Coro::cede_notself; 3454 Coro::cede_notself;
… …
3472 3548
3473sub reload_perl() { 3549sub reload_perl() {
3474 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
3475 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
3476 3552
3477 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3478 reentrant => 0,
3479 after => 0,
3480 data => WF_AUTOCANCEL,
3481 cb => sub {
3482 do_reload_perl;
3483 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
3484 }, 3555 do_reload_perl;
3485 ); 3556 };
3486} 3557}
3487 3558
3488register_command "reload" => sub { 3559register_command "reload" => sub {
3489 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
3490 3561
… …
3520 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
3521 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
3522 $signal->wait; 3593 $signal->wait;
3523} 3594}
3524 3595
3525$TICK_WATCHER = Event->timer ( 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3526 reentrant => 0,
3527 parked => 1,
3528 prio => 0,
3529 at => $NEXT_TICK || $TICK,
3530 data => WF_AUTOCANCEL,
3531 cb => sub {
3532 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
3533 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3534 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
3535 return; 3600 return;
3536 } 3601 }
3537 3602
3538 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
3539 3604
3540 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
3541 3606
3542 $RUNTIME += $TICK; 3607 $RUNTIME += $TICK;
3543 $NEXT_TICK += $TICK; 3608 $NEXT_TICK += $TICK;
3544 3609
3545 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3546 $NEXT_RUNTIME_WRITE = $NOW + 10; 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
3547 Coro::async_pool { 3612 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver"; 3613 $Coro::current->{desc} = "runtime saver";
3549 write_runtime 3614 write_runtime
3550 or warn "ERROR: unable to write runtime file: $!"; 3615 or warn "ERROR: unable to write runtime file: $!";
3551 };
3552 } 3616 };
3617 }
3553 3618
3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3555 $sig->send; 3620 $sig->send;
3556 } 3621 }
3557 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
3558 $sig->send; 3623 $sig->send;
3559 } 3624 }
3560 3625
3561 $NOW = Event::time;
3562
3563 # if we are delayed by four ticks or more, skip them all
3564 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3565
3566 $TICK_WATCHER->at ($NEXT_TICK);
3567 $TICK_WATCHER->start;
3568
3569 $LOAD = ($NOW - $tick_start) / $TICK; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3571 3628
3572 _post_tick; 3629 _post_tick;
3573 }, 3630};
3574); 3631$TICK_WATCHER->priority (EV::MAXPRI);
3575 3632
3576{ 3633{
3577 BDB::min_parallel 8; 3634 BDB::min_parallel 8;
3578 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
3579 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3580 reentrant => 0,
3581 fd => BDB::poll_fileno,
3582 poll => 'r',
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => \&BDB::poll_cb,
3586 );
3587 3637
3588 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3589 my $status; 3639 my $status;
3590 my $current = $Coro::current; 3640 my $current = $Coro::current;
3591 ( 3641 (
… …
3621 3671
3622 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3623 }; 3673 };
3624 } 3674 }
3625 3675
3626 $BDB_DEADLOCK_WATCHER = Event->timer ( 3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 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 { };
3634 },
3635 ); 3678 };
3636 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 ); 3681 };
3646 $BDB_TRICKLE_WATCHER = Event->timer ( 3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 ); 3684 };
3656} 3685}
3657 3686
3658{ 3687{
3659 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3660 3689
3661 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3662 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3663 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3664 reentrant => 0,
3665 data => WF_AUTOCANCEL,
3666 fd => IO::AIO::poll_fileno,
3667 poll => 'r',
3668 prio => 0,
3669 cb => \&IO::AIO::poll_cb,
3670 );
3671} 3693}
3672 3694
3673my $_log_backtrace; 3695my $_log_backtrace;
3674 3696
3675sub _log_backtrace { 3697sub _log_backtrace {

Diff Legend

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