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.385 by root, Fri Oct 12 19:13:26 2007 UTC vs.
Revision 1.397 by root, Mon Nov 19 15:47:14 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;
… …
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
… …
336 }; 334 };
337 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
338 $guard 336 $guard
339} 337}
340 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
352}
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>:
344This call blocks and returns only when you have at least C<$time> seconds 357This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede. 358of cpu time till the next tick. The slot is only valid till the next cede.
… …
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#
… …
444 warn $@ if $@; 457 warn $@ if $@;
445 undef $busy; 458 undef $busy;
446 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
447 460
448 while ($busy) { 461 while ($busy) {
449 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
450 } 466 }
467 }
451 468
452 $time = Event::time - $time; 469 $time = EV::time - $time;
453 470
454 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456 473
457 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
… …
487=item fork_call { }, $args 504=item fork_call { }, $args
488 505
489Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
493 510
494=cut 511=cut
495 512
496sub fork_call(&@) { 513sub fork_call(&@) {
497 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
… …
658attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
660 677
661In 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>
662C<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
663Crossfire TRT). 680Deliantra).
664 681
665=over 4 682=over 4
666 683
667=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
668 685
… …
966 983
967=cut 984=cut
968 985
969############################################################################# 986#############################################################################
970# object support 987# object support
971#
972 988
989sub _object_equal($$);
990sub _object_equal($$) {
991 my ($a, $b) = @_;
992
993 return 0 unless (ref $a) eq (ref $b);
994
995 if ("HASH" eq ref $a) {
996 my @ka = keys %$a;
997 my @kb = keys %$b;
998
999 return 0 if @ka != @kb;
1000
1001 for (0 .. $#ka) {
1002 return 0 unless $ka[$_] eq $kb[$_];
1003 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1004 }
1005
1006 } elsif ("ARRAY" eq ref $a) {
1007
1008 return 0 if @$a != @$b;
1009
1010 for (0 .. $#$a) {
1011 return 0 unless _object_equal $a->[$_], $b->[$_];
1012 }
1013
1014 } elsif ($a ne $b) {
1015 return 0;
1016 }
1017
1018 1
1019}
1020
1021our $SLOW_MERGES;#d#
973sub _can_merge { 1022sub _can_merge {
974 my ($ob1, $ob2) = @_; 1023 my ($ob1, $ob2) = @_;
975 1024
976 return 1;#d# 1025 ++$SLOW_MERGES;#d#
977 1026
978 #todo#d# kill yourself and do some recursive checking manually without storable 1027 # we do the slow way here
979 sync_job { 1028 return _object_equal $ob1, $ob2
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986} 1029}
987 1030
988sub reattach { 1031sub reattach {
989 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
990 my ($obj) = @_; 1033 my ($obj) = @_;
… …
1051 close $fh; 1094 close $fh;
1052 1095
1053 if (@$objs) { 1096 if (@$objs) {
1054 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) {
1055 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1057 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
1058 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
1059 close $fh; 1102 close $fh;
1060 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
1061 } 1104 }
… …
1092 1135
1093 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1094 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1095 or return; 1138 or return;
1096 1139
1097 my $st = eval { Coro::Storable::thaw $av } 1140 my $st = eval { Coro::Storable::thaw $av };
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs}; 1141 $av = $st->{objs};
1100 } 1142 }
1101 1143
1102 utf8::decode (my $decname = $filename); 1144 utf8::decode (my $decname = $filename);
1103 warn sprintf "loading %s (%d,%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
… …
1519 1561
1520Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1521 1563
1522=cut 1564=cut
1523 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
1524sub expand_cfpod { 1577sub expand_cfpod {
1525 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1526 1579
1527 # escape & and < 1580 my $xml;
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530 1581
1531 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1532 1585
1533 1 while 1586 $group =~ s/&/&amp;/g;
1534 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1535 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1536 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1537 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1591 ([BCGHITU])
1539 # replace G<male|female> tags 1592 <
1540 || s{G<([^>|]*)\|([^>]*)>}{ 1593 (?:
1541 $self->gender ? $2 : $1 1594 ([^<>]*) (?{ $group = $^N })
1542 }ge 1595 | < $interior >
1543 # replace H<hint text> 1596 )
1544 || s{H<([^\>]*)>} 1597 >
1598 %gcsx
1545 { 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") {
1546 ("<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>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "") 1619 "")
1549 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1550 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1551 1631
1632 for ($xml) {
1552 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1554 1635
1555 # compress some whitespace 1636 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1560 1642
1561 $_ 1643 $xml
1562} 1644}
1645
1646no re 'eval';
1563 1647
1564sub hintmode { 1648sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode} 1650 $_[0]{hintmode}
1567} 1651}
… …
2637the 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
2638the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2639 2723
2640=cut 2724=cut
2641 2725
2726# non-persistent channels (usually the info channel)
2642our %CHANNEL = ( 2727our %CHANNEL = (
2643 "c/identify" => { 2728 "c/identify" => {
2644 id => "infobox", 2729 id => "infobox",
2645 title => "Identify", 2730 title => "Identify",
2646 reply => undef, 2731 reply => undef,
… …
2650 id => "infobox", 2735 id => "infobox",
2651 title => "Examine", 2736 title => "Examine",
2652 reply => undef, 2737 reply => undef,
2653 tooltip => "Signs and other items you examined", 2738 tooltip => "Signs and other items you examined",
2654 }, 2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2655 "c/lookat" => { 2746 "c/lookat" => {
2656 id => "infobox", 2747 id => "infobox",
2657 title => "Look", 2748 title => "Look",
2658 reply => undef, 2749 reply => undef,
2659 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",
2660 }, 2775 },
2661); 2776);
2662 2777
2663sub cf::client::send_msg { 2778sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
… …
3204 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
3205 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
3206 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#
3207 (async { 3322 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3209 Event::one_event; 3324 EV::loop EV::LOOP_ONESHOT;
3210 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
3211 }; 3326 };
3212 3327
3213 reload_config; 3328 reload_config;
3214 db_init; 3329 db_init;
3215 load_extensions; 3330 load_extensions;
3216 3331
3217 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3218 Event::loop; 3334 EV::loop;
3219} 3335}
3220 3336
3221############################################################################# 3337#############################################################################
3222# initialisation and cleanup 3338# initialisation and cleanup
3223 3339
3224# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
3225BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
3226 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
3227 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3228 reentrant => 0,
3229 data => WF_AUTOCANCEL,
3230 signal => $signal,
3231 prio => 0,
3232 cb => sub {
3233 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
3234 },
3235 ); 3346 };
3236 } 3347 }
3237} 3348}
3238 3349
3239sub write_runtime { 3350sub write_runtime {
3240 my $runtime = "$LOCALDIR/runtime"; 3351 my $runtime = "$LOCALDIR/runtime";
… …
3334 warn "syncing database to disk"; 3445 warn "syncing database to disk";
3335 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
3336 3447
3337 # 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
3338 3449
3339 warn "cancelling all WF_AUTOCANCEL watchers";
3340 for (Event::all_watchers) {
3341 $_->cancel if $_->data & WF_AUTOCANCEL;
3342 }
3343
3344 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
3345 for (;;) { 3451 for (;;) {
3346 BDB::flush; 3452 BDB::flush;
3347 IO::AIO::flush; 3453 IO::AIO::flush;
3348 Coro::cede; 3454 Coro::cede_notself;
3349 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
3350 warn "iterate..."; 3456 warn "iterate...";
3351 } 3457 }
3352 3458
3353 ++$RELOAD; 3459 ++$RELOAD;
… …
3442 3548
3443sub reload_perl() { 3549sub reload_perl() {
3444 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
3445 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
3446 3552
3447 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3448 reentrant => 0,
3449 after => 0,
3450 data => WF_AUTOCANCEL,
3451 cb => sub {
3452 do_reload_perl;
3453 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
3454 }, 3555 do_reload_perl;
3455 ); 3556 };
3456} 3557}
3457 3558
3458register_command "reload" => sub { 3559register_command "reload" => sub {
3459 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
3460 3561
… …
3490 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
3491 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
3492 $signal->wait; 3593 $signal->wait;
3493} 3594}
3494 3595
3495$TICK_WATCHER = Event->timer ( 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3496 reentrant => 0,
3497 parked => 1,
3498 prio => 0,
3499 at => $NEXT_TICK || $TICK,
3500 data => WF_AUTOCANCEL,
3501 cb => sub {
3502 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
3503 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"
3504 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
3505 return; 3600 return;
3506 } 3601 }
3507 3602
3508 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
3509 3604
3510 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
3511 3606
3512 $RUNTIME += $TICK; 3607 $RUNTIME += $TICK;
3513 $NEXT_TICK += $TICK; 3608 $NEXT_TICK += $TICK;
3514 3609
3515 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3516 $NEXT_RUNTIME_WRITE = $NOW + 10; 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
3517 Coro::async_pool { 3612 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver"; 3613 $Coro::current->{desc} = "runtime saver";
3519 write_runtime 3614 write_runtime
3520 or warn "ERROR: unable to write runtime file: $!"; 3615 or warn "ERROR: unable to write runtime file: $!";
3521 };
3522 } 3616 };
3617 }
3523 3618
3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3525 $sig->send; 3620 $sig->send;
3526 } 3621 }
3527 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
3528 $sig->send; 3623 $sig->send;
3529 } 3624 }
3530 3625
3531 $NOW = Event::time;
3532
3533 # if we are delayed by four ticks or more, skip them all
3534 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3535
3536 $TICK_WATCHER->at ($NEXT_TICK);
3537 $TICK_WATCHER->start;
3538
3539 $LOAD = ($NOW - $tick_start) / $TICK; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3541 3628
3542 _post_tick; 3629 _post_tick;
3543 }, 3630};
3544); 3631$TICK_WATCHER->priority (EV::MAXPRI);
3545 3632
3546{ 3633{
3547 BDB::min_parallel 8; 3634 BDB::min_parallel 8;
3548 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
3549 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3550 reentrant => 0,
3551 fd => BDB::poll_fileno,
3552 poll => 'r',
3553 prio => 0,
3554 data => WF_AUTOCANCEL,
3555 cb => \&BDB::poll_cb,
3556 );
3557 3637
3558 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3559 my $status; 3639 my $status;
3560 my $current = $Coro::current; 3640 my $current = $Coro::current;
3561 ( 3641 (
… …
3591 3671
3592 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3593 }; 3673 };
3594 } 3674 }
3595 3675
3596 $BDB_DEADLOCK_WATCHER = Event->timer ( 3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 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 { };
3604 },
3605 ); 3678 };
3606 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 ); 3681 };
3616 $BDB_TRICKLE_WATCHER = Event->timer ( 3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 ); 3684 };
3626} 3685}
3627 3686
3628{ 3687{
3629 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3630 3689
3631 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3632 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3633 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3634 reentrant => 0,
3635 data => WF_AUTOCANCEL,
3636 fd => IO::AIO::poll_fileno,
3637 poll => 'r',
3638 prio => 0,
3639 cb => \&IO::AIO::poll_cb,
3640 );
3641} 3693}
3642 3694
3643my $_log_backtrace; 3695my $_log_backtrace;
3644 3696
3645sub _log_backtrace { 3697sub _log_backtrace {

Diff Legend

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