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.386 by root, Mon Oct 15 17:50:27 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#
… …
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
… …
1038cf::attachable->attach ( 1055cf::attachable->attach (
1039 prio => -1000000, 1056 prio => -1000000,
1040 on_instantiate => sub { 1057 on_instantiate => sub {
1041 my ($obj, $data) = @_; 1058 my ($obj, $data) = @_;
1042 1059
1043 $data = from_json $data; 1060 $data = decode_json $data;
1044 1061
1045 for (@$data) { 1062 for (@$data) {
1046 my ($name, $args) = @$_; 1063 my ($name, $args) = @$_;
1047 1064
1048 $obj->attach ($name, %{$args || {} }); 1065 $obj->attach ($name, %{$args || {} });
… …
1077 close $fh; 1094 close $fh;
1078 1095
1079 if (@$objs) { 1096 if (@$objs) {
1080 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) {
1081 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1083 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
1084 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
1085 close $fh; 1102 close $fh;
1086 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
1087 } 1104 }
… …
1118 1135
1119 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1120 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1121 or return; 1138 or return;
1122 1139
1123 my $st = eval { Coro::Storable::thaw $av } 1140 my $st = eval { Coro::Storable::thaw $av };
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs}; 1141 $av = $st->{objs};
1126 } 1142 }
1127 1143
1128 utf8::decode (my $decname = $filename); 1144 utf8::decode (my $decname = $filename);
1129 warn sprintf "loading %s (%d,%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
… …
1545 1561
1546Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1547 1563
1548=cut 1564=cut
1549 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
1550sub expand_cfpod { 1577sub expand_cfpod {
1551 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1552 1579
1553 # escape & and < 1580 my $xml;
1554 s/&/&amp;/g;
1555 s/(?<![BIUGHT])</&lt;/g;
1556 1581
1557 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1558 1585
1559 1 while 1586 $group =~ s/&/&amp;/g;
1560 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1561 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1562 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1563 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1591 ([BCGHITU])
1565 # replace G<male|female> tags 1592 <
1566 || s{G<([^>|]*)\|([^>]*)>}{ 1593 (?:
1567 $self->gender ? $2 : $1 1594 ([^<>]*) (?{ $group = $^N })
1568 }ge 1595 | < $interior >
1569 # replace H<hint text> 1596 )
1570 || s{H<([^\>]*)>} 1597 >
1598 %gcsx
1571 { 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") {
1572 ("<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>",
1573 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1574 "") 1619 "")
1575 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1576 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1577 1631
1632 for ($xml) {
1578 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1579 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1580 1635
1581 # compress some whitespace 1636 # compress some whitespace
1582 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1583 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1584 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1585 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1586 1642
1587 $_ 1643 $xml
1588} 1644}
1645
1646no re 'eval';
1589 1647
1590sub hintmode { 1648sub hintmode {
1591 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1592 $_[0]{hintmode} 1650 $_[0]{hintmode}
1593} 1651}
… …
2580 $rmp->{origin_y} = $exit->y; 2638 $rmp->{origin_y} = $exit->y;
2581 } 2639 }
2582 2640
2583 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2584 2642
2585 my $data = cf::to_json $rmp; 2643 my $data = cf::encode_json $rmp;
2586 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2587 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2588 2646
2589 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2590 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
… …
2663the 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
2664the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2665 2723
2666=cut 2724=cut
2667 2725
2726# non-persistent channels (usually the info channel)
2668our %CHANNEL = ( 2727our %CHANNEL = (
2669 "c/identify" => { 2728 "c/identify" => {
2670 id => "infobox", 2729 id => "infobox",
2671 title => "Identify", 2730 title => "Identify",
2672 reply => undef, 2731 reply => undef,
… …
2676 id => "infobox", 2735 id => "infobox",
2677 title => "Examine", 2736 title => "Examine",
2678 reply => undef, 2737 reply => undef,
2679 tooltip => "Signs and other items you examined", 2738 tooltip => "Signs and other items you examined",
2680 }, 2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2681 "c/lookat" => { 2746 "c/lookat" => {
2682 id => "infobox", 2747 id => "infobox",
2683 title => "Look", 2748 title => "Look",
2684 reply => undef, 2749 reply => undef,
2685 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",
2686 }, 2775 },
2687); 2776);
2688 2777
2689sub cf::client::send_msg { 2778sub cf::client::send_msg {
2690 my ($self, $channel, $msg, $color, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
… …
3230 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
3231 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
3232 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#
3233 (async { 3322 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3235 Event::one_event; 3324 EV::loop EV::LOOP_ONESHOT;
3236 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
3237 }; 3326 };
3238 3327
3239 reload_config; 3328 reload_config;
3240 db_init; 3329 db_init;
3241 load_extensions; 3330 load_extensions;
3242 3331
3243 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3244 Event::loop; 3334 EV::loop;
3245} 3335}
3246 3336
3247############################################################################# 3337#############################################################################
3248# initialisation and cleanup 3338# initialisation and cleanup
3249 3339
3250# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
3251BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
3252 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
3253 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3254 reentrant => 0,
3255 data => WF_AUTOCANCEL,
3256 signal => $signal,
3257 prio => 0,
3258 cb => sub {
3259 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
3260 },
3261 ); 3346 };
3262 } 3347 }
3263} 3348}
3264 3349
3265sub write_runtime { 3350sub write_runtime {
3266 my $runtime = "$LOCALDIR/runtime"; 3351 my $runtime = "$LOCALDIR/runtime";
… …
3360 warn "syncing database to disk"; 3445 warn "syncing database to disk";
3361 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
3362 3447
3363 # 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
3364 3449
3365 warn "cancelling all WF_AUTOCANCEL watchers";
3366 for (Event::all_watchers) {
3367 $_->cancel if $_->data & WF_AUTOCANCEL;
3368 }
3369
3370 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
3371 for (;;) { 3451 for (;;) {
3372 BDB::flush; 3452 BDB::flush;
3373 IO::AIO::flush; 3453 IO::AIO::flush;
3374 Coro::cede; 3454 Coro::cede_notself;
3375 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
3376 warn "iterate..."; 3456 warn "iterate...";
3377 } 3457 }
3378 3458
3379 ++$RELOAD; 3459 ++$RELOAD;
… …
3468 3548
3469sub reload_perl() { 3549sub reload_perl() {
3470 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
3471 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
3472 3552
3473 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3474 reentrant => 0,
3475 after => 0,
3476 data => WF_AUTOCANCEL,
3477 cb => sub {
3478 do_reload_perl;
3479 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
3480 }, 3555 do_reload_perl;
3481 ); 3556 };
3482} 3557}
3483 3558
3484register_command "reload" => sub { 3559register_command "reload" => sub {
3485 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
3486 3561
… …
3516 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
3518 $signal->wait; 3593 $signal->wait;
3519} 3594}
3520 3595
3521$TICK_WATCHER = Event->timer ( 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3522 reentrant => 0,
3523 parked => 1,
3524 prio => 0,
3525 at => $NEXT_TICK || $TICK,
3526 data => WF_AUTOCANCEL,
3527 cb => sub {
3528 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
3529 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"
3530 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
3531 return; 3600 return;
3532 } 3601 }
3533 3602
3534 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
3535 3604
3536 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
3537 3606
3538 $RUNTIME += $TICK; 3607 $RUNTIME += $TICK;
3539 $NEXT_TICK += $TICK; 3608 $NEXT_TICK += $TICK;
3540 3609
3541 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3542 $NEXT_RUNTIME_WRITE = $NOW + 10; 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
3543 Coro::async_pool { 3612 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver"; 3613 $Coro::current->{desc} = "runtime saver";
3545 write_runtime 3614 write_runtime
3546 or warn "ERROR: unable to write runtime file: $!"; 3615 or warn "ERROR: unable to write runtime file: $!";
3547 };
3548 } 3616 };
3617 }
3549 3618
3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3551 $sig->send; 3620 $sig->send;
3552 } 3621 }
3553 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
3554 $sig->send; 3623 $sig->send;
3555 } 3624 }
3556 3625
3557 $NOW = Event::time;
3558
3559 # if we are delayed by four ticks or more, skip them all
3560 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3561
3562 $TICK_WATCHER->at ($NEXT_TICK);
3563 $TICK_WATCHER->start;
3564
3565 $LOAD = ($NOW - $tick_start) / $TICK; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3567 3628
3568 _post_tick; 3629 _post_tick;
3569 }, 3630};
3570); 3631$TICK_WATCHER->priority (EV::MAXPRI);
3571 3632
3572{ 3633{
3573 BDB::min_parallel 8; 3634 BDB::min_parallel 8;
3574 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
3575 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3576 reentrant => 0,
3577 fd => BDB::poll_fileno,
3578 poll => 'r',
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => \&BDB::poll_cb,
3582 );
3583 3637
3584 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3585 my $status; 3639 my $status;
3586 my $current = $Coro::current; 3640 my $current = $Coro::current;
3587 ( 3641 (
… …
3617 3671
3618 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3619 }; 3673 };
3620 } 3674 }
3621 3675
3622 $BDB_DEADLOCK_WATCHER = Event->timer ( 3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 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 { };
3630 },
3631 ); 3678 };
3632 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 ); 3681 };
3642 $BDB_TRICKLE_WATCHER = Event->timer ( 3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 ); 3684 };
3652} 3685}
3653 3686
3654{ 3687{
3655 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3656 3689
3657 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3658 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3659 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3660 reentrant => 0,
3661 data => WF_AUTOCANCEL,
3662 fd => IO::AIO::poll_fileno,
3663 poll => 'r',
3664 prio => 0,
3665 cb => \&IO::AIO::poll_cb,
3666 );
3667} 3693}
3668 3694
3669my $_log_backtrace; 3695my $_log_backtrace;
3670 3696
3671sub _log_backtrace { 3697sub _log_backtrace {

Diff Legend

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