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.380 by root, Mon Oct 8 13:58:07 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 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 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 | logBacktrace, Carp::longmess "sync job";#d# 445 LOG llevError, Carp::longmess "sync job";#d#
433 446
434 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
435 # (but this is cancel-safe) 448 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
437 450
… …
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 local $Storable::canonical = 1; 1025 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1026
980 $fob1 eq $fob2 1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
981} 1029}
982 1030
983sub reattach { 1031sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1033 my ($obj) = @_;
… …
1007cf::attachable->attach ( 1055cf::attachable->attach (
1008 prio => -1000000, 1056 prio => -1000000,
1009 on_instantiate => sub { 1057 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1058 my ($obj, $data) = @_;
1011 1059
1012 $data = from_json $data; 1060 $data = decode_json $data;
1013 1061
1014 for (@$data) { 1062 for (@$data) {
1015 my ($name, $args) = @$_; 1063 my ($name, $args) = @$_;
1016 1064
1017 $obj->attach ($name, %{$args || {} }); 1065 $obj->attach ($name, %{$args || {} });
… …
1087 1135
1088 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1138 or return;
1091 1139
1092 my $st = eval { Coro::Storable::thaw $av } 1140 my $st = eval { Coro::Storable::thaw $av };
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs}; 1141 $av = $st->{objs};
1095 } 1142 }
1096 1143
1097 utf8::decode (my $decname = $filename); 1144 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
… …
1514 1561
1515Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1516 1563
1517=cut 1564=cut
1518 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
1519sub expand_cfpod { 1577sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1521 1579
1522 # escape & and < 1580 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1581
1526 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1527 1585
1528 1 while 1586 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1591 ([BCGHITU])
1534 # replace G<male|female> tags 1592 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1593 (?:
1536 $self->gender ? $2 : $1 1594 ([^<>]*) (?{ $group = $^N })
1537 }ge 1595 | < $interior >
1538 # replace H<hint text> 1596 )
1539 || s{H<([^\>]*)>} 1597 >
1598 %gcsx
1540 { 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") {
1541 ("<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>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1619 "")
1544 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1546 1631
1632 for ($xml) {
1547 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1549 1635
1550 # compress some whitespace 1636 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1555 1642
1556 $_ 1643 $xml
1557} 1644}
1645
1646no re 'eval';
1558 1647
1559sub hintmode { 1648sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1650 $_[0]{hintmode}
1562} 1651}
… …
2549 $rmp->{origin_y} = $exit->y; 2638 $rmp->{origin_y} = $exit->y;
2550 } 2639 }
2551 2640
2552 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2553 2642
2554 my $data = cf::to_json $rmp; 2643 my $data = cf::encode_json $rmp;
2555 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2556 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2557 2646
2558 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2559 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
… …
2632the 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
2633the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2634 2723
2635=cut 2724=cut
2636 2725
2726# non-persistent channels (usually the info channel)
2637our %CHANNEL = ( 2727our %CHANNEL = (
2638 "c/identify" => { 2728 "c/identify" => {
2639 id => "infobox", 2729 id => "infobox",
2640 title => "Identify", 2730 title => "Identify",
2641 reply => undef, 2731 reply => undef,
… …
2645 id => "infobox", 2735 id => "infobox",
2646 title => "Examine", 2736 title => "Examine",
2647 reply => undef, 2737 reply => undef,
2648 tooltip => "Signs and other items you examined", 2738 tooltip => "Signs and other items you examined",
2649 }, 2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2650 "c/lookat" => { 2746 "c/lookat" => {
2651 id => "infobox", 2747 id => "infobox",
2652 title => "Look", 2748 title => "Look",
2653 reply => undef, 2749 reply => undef,
2654 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",
2655 }, 2775 },
2656); 2776);
2657 2777
2658sub cf::client::send_msg { 2778sub cf::client::send_msg {
2659 my ($self, $channel, $msg, $color, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
… …
2896=pod 3016=pod
2897 3017
2898The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2899 3019
2900 cf::object 3020 cf::object
2901 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
2902 insert remove name archname title slaying race decrease_ob_nr 3022 insert remove name archname title slaying race decrease_ob_nr
2903 3023
2904 cf::object::player 3024 cf::object::player
2905 player 3025 player
2906 3026
… …
2913=cut 3033=cut
2914 3034
2915for ( 3035for (
2916 ["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
2917 insert remove inv name archname title slaying race 3037 insert remove inv name archname title slaying race
2918 decrease_ob_nr)], 3038 decrease_ob_nr destroy)],
2919 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2920 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2921 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2922) { 3042) {
2923 no strict 'refs'; 3043 no strict 'refs';
… …
3199 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
3200 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
3201 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#
3202 (async { 3322 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3204 Event::one_event; 3324 EV::loop EV::LOOP_ONESHOT;
3205 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
3206 }; 3326 };
3207 3327
3208 reload_config; 3328 reload_config;
3209 db_init; 3329 db_init;
3210 load_extensions; 3330 load_extensions;
3211 3331
3212 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3213 Event::loop; 3334 EV::loop;
3214} 3335}
3215 3336
3216############################################################################# 3337#############################################################################
3217# initialisation and cleanup 3338# initialisation and cleanup
3218 3339
3219# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
3220BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
3221 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
3222 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3223 reentrant => 0,
3224 data => WF_AUTOCANCEL,
3225 signal => $signal,
3226 prio => 0,
3227 cb => sub {
3228 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
3229 },
3230 ); 3346 };
3231 } 3347 }
3232} 3348}
3233 3349
3234sub write_runtime { 3350sub write_runtime {
3235 my $runtime = "$LOCALDIR/runtime"; 3351 my $runtime = "$LOCALDIR/runtime";
… …
3280 # and maps saved/destroyed asynchronously. 3396 # and maps saved/destroyed asynchronously.
3281 warn "begin emergency player save\n"; 3397 warn "begin emergency player save\n";
3282 for my $login (keys %cf::PLAYER) { 3398 for my $login (keys %cf::PLAYER) {
3283 my $pl = $cf::PLAYER{$login} or next; 3399 my $pl = $cf::PLAYER{$login} or next;
3284 $pl->valid or next; 3400 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3285 $pl->save; 3402 $pl->save;
3286 } 3403 }
3287 warn "end emergency player save\n"; 3404 warn "end emergency player save\n";
3288 3405
3289 warn "begin emergency map save\n"; 3406 warn "begin emergency map save\n";
… …
3328 warn "syncing database to disk"; 3445 warn "syncing database to disk";
3329 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
3330 3447
3331 # 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
3332 3449
3333 warn "cancelling all WF_AUTOCANCEL watchers";
3334 for (Event::all_watchers) {
3335 $_->cancel if $_->data & WF_AUTOCANCEL;
3336 }
3337
3338 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
3339 for (;;) { 3451 for (;;) {
3340 BDB::flush; 3452 BDB::flush;
3341 IO::AIO::flush; 3453 IO::AIO::flush;
3342 Coro::cede; 3454 Coro::cede_notself;
3343 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
3344 warn "iterate..."; 3456 warn "iterate...";
3345 } 3457 }
3346 3458
3347 ++$RELOAD; 3459 ++$RELOAD;
… …
3436 3548
3437sub reload_perl() { 3549sub reload_perl() {
3438 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
3439 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
3440 3552
3441 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3442 reentrant => 0,
3443 after => 0,
3444 data => WF_AUTOCANCEL,
3445 cb => sub {
3446 do_reload_perl;
3447 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
3448 }, 3555 do_reload_perl;
3449 ); 3556 };
3450} 3557}
3451 3558
3452register_command "reload" => sub { 3559register_command "reload" => sub {
3453 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
3454 3561
… …
3484 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
3485 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
3486 $signal->wait; 3593 $signal->wait;
3487} 3594}
3488 3595
3489$TICK_WATCHER = Event->timer ( 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3490 reentrant => 0,
3491 parked => 1,
3492 prio => 0,
3493 at => $NEXT_TICK || $TICK,
3494 data => WF_AUTOCANCEL,
3495 cb => sub {
3496 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
3497 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"
3498 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
3499 return; 3600 return;
3500 } 3601 }
3501 3602
3502 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
3503 3604
3504 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
3505 3606
3506 $RUNTIME += $TICK; 3607 $RUNTIME += $TICK;
3507 $NEXT_TICK += $TICK; 3608 $NEXT_TICK += $TICK;
3508 3609
3509 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3510 $NEXT_RUNTIME_WRITE = $NOW + 10; 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
3511 Coro::async_pool { 3612 Coro::async_pool {
3512 $Coro::current->{desc} = "runtime saver"; 3613 $Coro::current->{desc} = "runtime saver";
3513 write_runtime 3614 write_runtime
3514 or warn "ERROR: unable to write runtime file: $!"; 3615 or warn "ERROR: unable to write runtime file: $!";
3515 };
3516 } 3616 };
3617 }
3517 3618
3518 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3519 $sig->send; 3620 $sig->send;
3520 } 3621 }
3521 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
3522 $sig->send; 3623 $sig->send;
3523 } 3624 }
3524 3625
3525 $NOW = Event::time;
3526
3527 # if we are delayed by four ticks or more, skip them all
3528 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3529
3530 $TICK_WATCHER->at ($NEXT_TICK);
3531 $TICK_WATCHER->start;
3532
3533 $LOAD = ($NOW - $tick_start) / $TICK; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
3534 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3535 3628
3536 _post_tick; 3629 _post_tick;
3537 }, 3630};
3538); 3631$TICK_WATCHER->priority (EV::MAXPRI);
3539 3632
3540{ 3633{
3541 BDB::min_parallel 8; 3634 BDB::min_parallel 8;
3542 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
3543 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3544 reentrant => 0,
3545 fd => BDB::poll_fileno,
3546 poll => 'r',
3547 prio => 0,
3548 data => WF_AUTOCANCEL,
3549 cb => \&BDB::poll_cb,
3550 );
3551 3637
3552 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3553 my $status; 3639 my $status;
3554 my $current = $Coro::current; 3640 my $current = $Coro::current;
3555 ( 3641 (
… …
3585 3671
3586 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3587 }; 3673 };
3588 } 3674 }
3589 3675
3590 $BDB_DEADLOCK_WATCHER = Event->timer ( 3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3591 after => 3,
3592 interval => 1,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 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 { };
3598 },
3599 ); 3678 };
3600 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3601 after => 11,
3602 interval => 60,
3603 hard => 1,
3604 prio => 0,
3605 data => WF_AUTOCANCEL,
3606 cb => sub {
3607 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3608 },
3609 ); 3681 };
3610 $BDB_TRICKLE_WATCHER = Event->timer ( 3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3611 after => 5,
3612 interval => 10,
3613 hard => 1,
3614 prio => 0,
3615 data => WF_AUTOCANCEL,
3616 cb => sub {
3617 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3618 },
3619 ); 3684 };
3620} 3685}
3621 3686
3622{ 3687{
3623 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3624 3689
3625 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3626 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3627 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3628 reentrant => 0,
3629 data => WF_AUTOCANCEL,
3630 fd => IO::AIO::poll_fileno,
3631 poll => 'r',
3632 prio => 0,
3633 cb => \&IO::AIO::poll_cb,
3634 );
3635} 3693}
3636 3694
3637my $_log_backtrace; 3695my $_log_backtrace;
3638 3696
3639sub _log_backtrace { 3697sub _log_backtrace {

Diff Legend

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