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.378 by root, Thu Oct 4 11:36:54 2007 UTC vs.
Revision 1.396 by root, Wed Nov 14 08:09:46 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 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;
… …
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 ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
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.
… …
373 } 386 }
374 } 387 }
375 } 388 }
376 389
377 if (@SLOT_QUEUE) { 390 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 391 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 392 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 393 $signal->wait;
381 } else { 394 } else {
382 Coro::schedule; 395 Coro::schedule;
383 } 396 }
… …
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
445 LOG llevError, Carp::longmess "sync job";#d#
446
432 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
433 # (but this is cancel-safe) 448 # (but this is cancel-safe)
434 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
435 450
436 my $busy = 1; 451 my $busy = 1;
… …
442 warn $@ if $@; 457 warn $@ if $@;
443 undef $busy; 458 undef $busy;
444 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
445 460
446 while ($busy) { 461 while ($busy) {
447 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
448 } 466 }
467 }
449 468
450 $time = Event::time - $time; 469 $time = EV::time - $time;
451 470
452 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454 473
455 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
… …
485=item fork_call { }, $args 504=item fork_call { }, $args
486 505
487Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
491 510
492=cut 511=cut
493 512
494sub fork_call(&@) { 513sub fork_call(&@) {
495 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
… …
656attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
658 677
659In 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>
660C<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
661Crossfire TRT). 680Deliantra).
662 681
663=over 4 682=over 4
664 683
665=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
666 685
… …
964 983
965=cut 984=cut
966 985
967############################################################################# 986#############################################################################
968# object support 987# object support
969#
970 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#
971sub _can_merge { 1022sub _can_merge {
972 my ($ob1, $ob2) = @_; 1023 my ($ob1, $ob2) = @_;
973 1024
974 local $Storable::canonical = 1; 1025 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1026
978 $fob1 eq $fob2 1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
979} 1029}
980 1030
981sub reattach { 1031sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1033 my ($obj) = @_;
… …
1044 close $fh; 1094 close $fh;
1045 1095
1046 if (@$objs) { 1096 if (@$objs) {
1047 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) {
1048 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1102 close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1104 }
… …
1085 1135
1086 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1138 or return;
1089 1139
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1140 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs};
1091 } 1142 }
1092 1143
1093 utf8::decode (my $decname = $filename); 1144 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1146 $decname, length $data, scalar @{$av || []};
… …
1510 1561
1511Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1512 1563
1513=cut 1564=cut
1514 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
1515sub expand_cfpod { 1577sub expand_cfpod {
1516 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1517 1579
1518 # escape & and < 1580 my $xml;
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521 1581
1522 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1523 1585
1524 1 while 1586 $group =~ s/&/&amp;/g;
1525 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1526 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1527 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1528 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1591 ([BCGHITU])
1530 # replace G<male|female> tags 1592 <
1531 || s{G<([^>|]*)\|([^>]*)>}{ 1593 (?:
1532 $self->gender ? $2 : $1 1594 ([^<>]*) (?{ $group = $^N })
1533 }ge 1595 | < $interior >
1534 # replace H<hint text> 1596 )
1535 || s{H<([^\>]*)>} 1597 >
1598 %gcsx
1536 { 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") {
1537 ("<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>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "") 1619 "")
1540 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1541 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1542 1631
1632 for ($xml) {
1543 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1545 1635
1546 # compress some whitespace 1636 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1551 1642
1552 $_ 1643 $xml
1553} 1644}
1645
1646no re 'eval';
1554 1647
1555sub hintmode { 1648sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode} 1650 $_[0]{hintmode}
1558} 1651}
… …
2628the 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
2629the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2630 2723
2631=cut 2724=cut
2632 2725
2726# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2727our %CHANNEL = (
2634 "c/identify" => { 2728 "c/identify" => {
2635 id => "infobox", 2729 id => "infobox",
2636 title => "Identify", 2730 title => "Identify",
2637 reply => undef, 2731 reply => undef,
… …
2641 id => "infobox", 2735 id => "infobox",
2642 title => "Examine", 2736 title => "Examine",
2643 reply => undef, 2737 reply => undef,
2644 tooltip => "Signs and other items you examined", 2738 tooltip => "Signs and other items you examined",
2645 }, 2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2646 "c/lookat" => { 2746 "c/lookat" => {
2647 id => "infobox", 2747 id => "infobox",
2648 title => "Look", 2748 title => "Look",
2649 reply => undef, 2749 reply => undef,
2650 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",
2651 }, 2775 },
2652); 2776);
2653 2777
2654sub cf::client::send_msg { 2778sub cf::client::send_msg {
2655 my ($self, $channel, $msg, $color, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
… …
2892=pod 3016=pod
2893 3017
2894The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2895 3019
2896 cf::object 3020 cf::object
2897 contr pay_amount pay_player map x y force_find force_add 3021 contr pay_amount pay_player map x y force_find force_add destroy
2898 insert remove name archname title slaying race decrease_ob_nr 3022 insert remove name archname title slaying race decrease_ob_nr
2899 3023
2900 cf::object::player 3024 cf::object::player
2901 player 3025 player
2902 3026
… …
2909=cut 3033=cut
2910 3034
2911for ( 3035for (
2912 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2913 insert remove inv name archname title slaying race 3037 insert remove inv name archname title slaying race
2914 decrease_ob_nr)], 3038 decrease_ob_nr destroy)],
2915 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2916 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2917 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2918) { 3042) {
2919 no strict 'refs'; 3043 no strict 'refs';
… …
3195 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
3196 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
3197 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#
3198 (async { 3322 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3200 Event::one_event; 3324 EV::loop EV::LOOP_ONESHOT;
3201 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
3202 }; 3326 };
3203 3327
3204 reload_config; 3328 reload_config;
3205 db_init; 3329 db_init;
3206 load_extensions; 3330 load_extensions;
3207 3331
3208 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3209 Event::loop; 3333 EV::loop;
3210} 3334}
3211 3335
3212############################################################################# 3336#############################################################################
3213# initialisation and cleanup 3337# initialisation and cleanup
3214 3338
3215# install some emergency cleanup handlers 3339# install some emergency cleanup handlers
3216BEGIN { 3340BEGIN {
3341 our %SIGWATCHER = ();
3217 for my $signal (qw(INT HUP TERM)) { 3342 for my $signal (qw(INT HUP TERM)) {
3218 Event->signal ( 3343 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3219 reentrant => 0,
3220 data => WF_AUTOCANCEL,
3221 signal => $signal,
3222 prio => 0,
3223 cb => sub {
3224 cf::cleanup "SIG$signal"; 3344 cf::cleanup "SIG$signal";
3225 },
3226 ); 3345 };
3227 } 3346 }
3228} 3347}
3229 3348
3230sub write_runtime { 3349sub write_runtime {
3231 my $runtime = "$LOCALDIR/runtime"; 3350 my $runtime = "$LOCALDIR/runtime";
… …
3276 # and maps saved/destroyed asynchronously. 3395 # and maps saved/destroyed asynchronously.
3277 warn "begin emergency player save\n"; 3396 warn "begin emergency player save\n";
3278 for my $login (keys %cf::PLAYER) { 3397 for my $login (keys %cf::PLAYER) {
3279 my $pl = $cf::PLAYER{$login} or next; 3398 my $pl = $cf::PLAYER{$login} or next;
3280 $pl->valid or next; 3399 $pl->valid or next;
3400 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3281 $pl->save; 3401 $pl->save;
3282 } 3402 }
3283 warn "end emergency player save\n"; 3403 warn "end emergency player save\n";
3284 3404
3285 warn "begin emergency map save\n"; 3405 warn "begin emergency map save\n";
… …
3324 warn "syncing database to disk"; 3444 warn "syncing database to disk";
3325 BDB::db_env_txn_checkpoint $DB_ENV; 3445 BDB::db_env_txn_checkpoint $DB_ENV;
3326 3446
3327 # if anything goes wrong in here, we should simply crash as we already saved 3447 # if anything goes wrong in here, we should simply crash as we already saved
3328 3448
3329 warn "cancelling all WF_AUTOCANCEL watchers";
3330 for (Event::all_watchers) {
3331 $_->cancel if $_->data & WF_AUTOCANCEL;
3332 }
3333
3334 warn "flushing outstanding aio requests"; 3449 warn "flushing outstanding aio requests";
3335 for (;;) { 3450 for (;;) {
3336 BDB::flush; 3451 BDB::flush;
3337 IO::AIO::flush; 3452 IO::AIO::flush;
3338 Coro::cede; 3453 Coro::cede_notself;
3339 last unless IO::AIO::nreqs || BDB::nreqs; 3454 last unless IO::AIO::nreqs || BDB::nreqs;
3340 warn "iterate..."; 3455 warn "iterate...";
3341 } 3456 }
3342 3457
3343 ++$RELOAD; 3458 ++$RELOAD;
… …
3432 3547
3433sub reload_perl() { 3548sub reload_perl() {
3434 # doing reload synchronously and two reloads happen back-to-back, 3549 # doing reload synchronously and two reloads happen back-to-back,
3435 # coro crashes during coro_state_free->destroy here. 3550 # coro crashes during coro_state_free->destroy here.
3436 3551
3437 $RELOAD_WATCHER ||= Event->timer ( 3552 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3438 reentrant => 0,
3439 after => 0,
3440 data => WF_AUTOCANCEL,
3441 cb => sub {
3442 do_reload_perl;
3443 undef $RELOAD_WATCHER; 3553 undef $RELOAD_WATCHER;
3444 }, 3554 do_reload_perl;
3445 ); 3555 };
3446} 3556}
3447 3557
3448register_command "reload" => sub { 3558register_command "reload" => sub {
3449 my ($who, $arg) = @_; 3559 my ($who, $arg) = @_;
3450 3560
… …
3480 my $signal = new Coro::Signal; 3590 my $signal = new Coro::Signal;
3481 push @WAIT_FOR_TICK_BEGIN, $signal; 3591 push @WAIT_FOR_TICK_BEGIN, $signal;
3482 $signal->wait; 3592 $signal->wait;
3483} 3593}
3484 3594
3485$TICK_WATCHER = Event->timer ( 3595$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3486 reentrant => 0,
3487 parked => 1,
3488 prio => 0,
3489 at => $NEXT_TICK || $TICK,
3490 data => WF_AUTOCANCEL,
3491 cb => sub {
3492 if ($Coro::current != $Coro::main) { 3596 if ($Coro::current != $Coro::main) {
3493 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3597 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3494 unless ++$bug_warning > 10; 3598 unless ++$bug_warning > 10;
3495 return; 3599 return;
3496 } 3600 }
3497 3601
3498 $NOW = $tick_start = Event::time; 3602 $NOW = $tick_start = EV::now;
3499 3603
3500 cf::server_tick; # one server iteration 3604 cf::server_tick; # one server iteration
3501 3605
3502 $RUNTIME += $TICK; 3606 $RUNTIME += $TICK;
3503 $NEXT_TICK += $TICK; 3607 $NEXT_TICK += $TICK;
3504 3608
3505 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3609 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3506 $NEXT_RUNTIME_WRITE = $NOW + 10; 3610 $NEXT_RUNTIME_WRITE = $NOW + 10;
3507 Coro::async_pool { 3611 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver"; 3612 $Coro::current->{desc} = "runtime saver";
3509 write_runtime 3613 write_runtime
3510 or warn "ERROR: unable to write runtime file: $!"; 3614 or warn "ERROR: unable to write runtime file: $!";
3511 };
3512 } 3615 };
3616 }
3513 3617
3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3618 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3515 $sig->send; 3619 $sig->send;
3516 } 3620 }
3517 while (my $sig = shift @WAIT_FOR_TICK) { 3621 while (my $sig = shift @WAIT_FOR_TICK) {
3518 $sig->send; 3622 $sig->send;
3519 } 3623 }
3520 3624
3521 $NOW = Event::time;
3522
3523 # if we are delayed by four ticks or more, skip them all
3524 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3525
3526 $TICK_WATCHER->at ($NEXT_TICK);
3527 $TICK_WATCHER->start;
3528
3529 $LOAD = ($NOW - $tick_start) / $TICK; 3625 $LOAD = ($NOW - $tick_start) / $TICK;
3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3626 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3531 3627
3532 _post_tick; 3628 _post_tick;
3533 }, 3629};
3534); 3630$TICK_WATCHER->priority (EV::MAXPRI);
3535 3631
3536{ 3632{
3537 BDB::min_parallel 8; 3633 BDB::min_parallel 8;
3538 BDB::max_poll_time $TICK * 0.1; 3634 BDB::max_poll_time $TICK * 0.1;
3539 $BDB_POLL_WATCHER = Event->io ( 3635 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3540 reentrant => 0,
3541 fd => BDB::poll_fileno,
3542 poll => 'r',
3543 prio => 0,
3544 data => WF_AUTOCANCEL,
3545 cb => \&BDB::poll_cb,
3546 );
3547 3636
3548 BDB::set_sync_prepare { 3637 BDB::set_sync_prepare {
3549 my $status; 3638 my $status;
3550 my $current = $Coro::current; 3639 my $current = $Coro::current;
3551 ( 3640 (
… …
3581 3670
3582 cf::cleanup "db_env_open(db): $@" if $@; 3671 cf::cleanup "db_env_open(db): $@" if $@;
3583 }; 3672 };
3584 } 3673 }
3585 3674
3586 $BDB_DEADLOCK_WATCHER = Event->timer ( 3675 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3587 after => 3,
3588 interval => 1,
3589 hard => 1,
3590 prio => 0,
3591 data => WF_AUTOCANCEL,
3592 cb => sub {
3593 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3676 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3594 },
3595 ); 3677 };
3596 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3678 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3597 after => 11,
3598 interval => 60,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3679 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3604 },
3605 ); 3680 };
3606 $BDB_TRICKLE_WATCHER = Event->timer ( 3681 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3607 after => 5,
3608 interval => 10,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3682 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3614 },
3615 ); 3683 };
3616} 3684}
3617 3685
3618{ 3686{
3619 IO::AIO::min_parallel 8; 3687 IO::AIO::min_parallel 8;
3620 3688
3621 undef $Coro::AIO::WATCHER; 3689 undef $Coro::AIO::WATCHER;
3622 IO::AIO::max_poll_time $TICK * 0.1; 3690 IO::AIO::max_poll_time $TICK * 0.1;
3623 $AIO_POLL_WATCHER = Event->io ( 3691 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3624 reentrant => 0,
3625 data => WF_AUTOCANCEL,
3626 fd => IO::AIO::poll_fileno,
3627 poll => 'r',
3628 prio => 0,
3629 cb => \&IO::AIO::poll_cb,
3630 );
3631} 3692}
3632 3693
3633my $_log_backtrace; 3694my $_log_backtrace;
3634 3695
3635sub _log_backtrace { 3696sub _log_backtrace {

Diff Legend

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