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.382 by root, Thu Oct 11 00:34:31 2007 UTC vs.
Revision 1.400 by root, Mon Dec 17 06:36: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.32 ();
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::BDB;
23use Coro::Storable; 24use Coro::Storable;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML::Syck ();
… …
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::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 42Compress::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 43
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
47 46
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
… …
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 76our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 79our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
83 81
84our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 83our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 84our $BDB_CHECKPOINT_WATCHER;
… …
89 87
90our %CFG; 88our %CFG;
91 89
92our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 91our $RUNTIME;
92our $NOW;
94 93
95our (%PLAYER, %PLAYER_LOADING); # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 95our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
98 97
… …
162 161
163The raw value load value from the last tick. 162The raw value load value from the last tick.
164 163
165=item %cf::CFG 164=item %cf::CFG
166 165
167Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 167from wherever your confdir points to.
169 168
170=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
171 170
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
215)) { 214)) {
216 no strict 'refs'; 215 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 217}
219 218
220$Event::DIED = sub { 219$EV::DIED = sub {
221 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
222}; 221};
223 222
224############################################################################# 223#############################################################################
225 224
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 248 $d
250 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
251} 250}
252 251
253=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
254 253
255Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
256 255
257=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
258 257
259Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
260 259
261=cut 260=cut
262 261
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 263
265sub to_json ($) { $json_coder->encode ($_[0]) } 264sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 265sub decode_json($) { $json_coder->decode ($_[0]) }
267 266
268=item cf::lock_wait $string 267=item cf::lock_wait $string
269 268
270Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
271 270
… …
334 my $guard = Coro::guard { 333 my $guard = Coro::guard {
335 $TICK_WATCHER->start; 334 $TICK_WATCHER->start;
336 }; 335 };
337 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
338 $guard 337 $guard
338}
339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
339} 353}
340 354
341=item cf::get_slot $time[, $priority[, $name]] 355=item cf::get_slot $time[, $priority[, $name]]
342 356
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 357Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
406 420
407BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
408 422
409=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
410 424
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 425The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 426is 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 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 428acceptable.
415 429
416If it must be done, put the blocking parts into C<sync_job>. This will run 430If 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 431the given BLOCK in another coroutine while waiting for the result. The
… …
422 436
423sub sync_job(&) { 437sub sync_job(&) {
424 my ($job) = @_; 438 my ($job) = @_;
425 439
426 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 441 my $time = EV::time;
428 442
429 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
431 445
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 446 LOG llevError, Carp::longmess "sync job";#d#
433 447
434 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
435 # (but this is cancel-safe) 449 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
437 451
… …
444 warn $@ if $@; 458 warn $@ if $@;
445 undef $busy; 459 undef $busy;
446 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
447 461
448 while ($busy) { 462 while ($busy) {
449 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
450 } 467 }
468 }
451 469
452 $time = Event::time - $time; 470 $time = EV::time - $time;
453 471
454 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456 474
457 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
… …
487=item fork_call { }, $args 505=item fork_call { }, $args
488 506
489Executes the given code block with the given arguments in a seperate 507Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 508process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 509Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 510never block itself or use any form of event handling.
493 511
494=cut 512=cut
495 513
496sub fork_call(&@) { 514sub fork_call(&@) {
497 my ($cb, @args) = @_; 515 my ($cb, @args) = @_;
… …
658attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
660 678
661In the following description, CLASS can be any of C<global>, C<object> 679In 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 680C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 681Deliantra).
664 682
665=over 4 683=over 4
666 684
667=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
668 686
… …
966 984
967=cut 985=cut
968 986
969############################################################################# 987#############################################################################
970# object support 988# object support
971#
972 989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
973sub _can_merge { 1023sub _can_merge {
974 my ($ob1, $ob2) = @_; 1024 my ($ob1, $ob2) = @_;
975 1025
976 local $Storable::canonical = 1; 1026 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1027
980 $fob1 eq $fob2 1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
981} 1030}
982 1031
983sub reattach { 1032sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1034 my ($obj) = @_;
… …
1007cf::attachable->attach ( 1056cf::attachable->attach (
1008 prio => -1000000, 1057 prio => -1000000,
1009 on_instantiate => sub { 1058 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
1011 1060
1012 $data = from_json $data; 1061 $data = decode_json $data;
1013 1062
1014 for (@$data) { 1063 for (@$data) {
1015 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
1016 1065
1017 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
… …
1087 1136
1088 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1139 or return;
1091 1140
1092 my $st = eval { Coro::Storable::thaw $av } 1141 my $st = eval { Coro::Storable::thaw $av };
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs}; 1142 $av = $st->{objs};
1095 } 1143 }
1096 1144
1097 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
… …
1514 1562
1515Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1516 1564
1517=cut 1565=cut
1518 1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1519sub expand_cfpod { 1578sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1521 1580
1522 # escape & and < 1581 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1582
1526 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1527 1586
1528 1 while 1587 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1592 ([BCGHITU])
1534 # replace G<male|female> tags 1593 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1594 (?:
1536 $self->gender ? $2 : $1 1595 ([^<>]*) (?{ $group = $^N })
1537 }ge 1596 | < $interior >
1538 # replace H<hint text> 1597 )
1539 || s{H<([^\>]*)>} 1598 >
1599 %gcsx
1540 { 1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1620 "")
1544 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1546 1632
1633 for ($xml) {
1547 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1549 1636
1550 # compress some whitespace 1637 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1555 1643
1556 $_ 1644 $xml
1557} 1645}
1646
1647no re 'eval';
1558 1648
1559sub hintmode { 1649sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1651 $_[0]{hintmode}
1562} 1652}
… …
2549 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2550 } 2640 }
2551 2641
2552 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2553 2643
2554 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2555 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2556 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2557 2647
2558 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2559 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
… …
2632the message, with C<log> being the default. If C<$color> is negative, suppress 2722the message, with C<log> being the default. If C<$color> is negative, suppress
2633the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2634 2724
2635=cut 2725=cut
2636 2726
2727# non-persistent channels (usually the info channel)
2637our %CHANNEL = ( 2728our %CHANNEL = (
2638 "c/identify" => { 2729 "c/identify" => {
2639 id => "infobox", 2730 id => "infobox",
2640 title => "Identify", 2731 title => "Identify",
2641 reply => undef, 2732 reply => undef,
… …
2645 id => "infobox", 2736 id => "infobox",
2646 title => "Examine", 2737 title => "Examine",
2647 reply => undef, 2738 reply => undef,
2648 tooltip => "Signs and other items you examined", 2739 tooltip => "Signs and other items you examined",
2649 }, 2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2650 "c/lookat" => { 2747 "c/lookat" => {
2651 id => "infobox", 2748 id => "infobox",
2652 title => "Look", 2749 title => "Look",
2653 reply => undef, 2750 reply => undef,
2654 tooltip => "What you saw there", 2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2655 }, 2776 },
2656); 2777);
2657 2778
2658sub cf::client::send_msg { 2779sub cf::client::send_msg {
2659 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
… …
2896=pod 3017=pod
2897 3018
2898The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2899 3020
2900 cf::object 3021 cf::object
2901 contr pay_amount pay_player map x y force_find force_add 3022 contr pay_amount pay_player map x y force_find force_add destroy
2902 insert remove name archname title slaying race decrease_ob_nr 3023 insert remove name archname title slaying race decrease_ob_nr
2903 3024
2904 cf::object::player 3025 cf::object::player
2905 player 3026 player
2906 3027
… …
2913=cut 3034=cut
2914 3035
2915for ( 3036for (
2916 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2917 insert remove inv name archname title slaying race 3038 insert remove inv name archname title slaying race
2918 decrease_ob_nr)], 3039 decrease_ob_nr destroy)],
2919 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2920 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2921 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2922) { 3043) {
2923 no strict 'refs'; 3044 no strict 'refs';
… …
3199 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
3200 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3202 (async { 3323 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3204 Event::one_event; 3325 EV::loop EV::LOOP_ONESHOT;
3205 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
3206 }; 3327 };
3207 3328
3208 reload_config; 3329 reload_config;
3209 db_init; 3330 db_init;
3210 load_extensions; 3331 load_extensions;
3211 3332
3212 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3213 Event::loop; 3335 EV::loop;
3214} 3336}
3215 3337
3216############################################################################# 3338#############################################################################
3217# initialisation and cleanup 3339# initialisation and cleanup
3218 3340
3219# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
3220BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
3221 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
3222 Event->signal ( 3345 $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"; 3346 cf::cleanup "SIG$signal";
3229 },
3230 ); 3347 };
3231 } 3348 }
3232} 3349}
3233 3350
3234sub write_runtime { 3351sub write_runtime {
3235 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
… …
3329 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3330 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3331 3448
3332 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
3333 3450
3334 warn "cancelling all WF_AUTOCANCEL watchers";
3335 for (Event::all_watchers) {
3336 $_->cancel if $_->data & WF_AUTOCANCEL;
3337 }
3338
3339 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3340 for (;;) { 3452 for (;;) {
3341 BDB::flush; 3453 BDB::flush;
3342 IO::AIO::flush; 3454 IO::AIO::flush;
3343 Coro::cede; 3455 Coro::cede_notself;
3344 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3345 warn "iterate..."; 3457 warn "iterate...";
3346 } 3458 }
3347 3459
3348 ++$RELOAD; 3460 ++$RELOAD;
… …
3437 3549
3438sub reload_perl() { 3550sub reload_perl() {
3439 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3440 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3441 3553
3442 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3443 reentrant => 0,
3444 after => 0,
3445 data => WF_AUTOCANCEL,
3446 cb => sub {
3447 do_reload_perl;
3448 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3449 }, 3556 do_reload_perl;
3450 ); 3557 };
3451} 3558}
3452 3559
3453register_command "reload" => sub { 3560register_command "reload" => sub {
3454 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3455 3562
… …
3485 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3486 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3487 $signal->wait; 3594 $signal->wait;
3488} 3595}
3489 3596
3490$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3491 reentrant => 0,
3492 parked => 1,
3493 prio => 0,
3494 at => $NEXT_TICK || $TICK,
3495 data => WF_AUTOCANCEL,
3496 cb => sub {
3497 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3498 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3499 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3500 return; 3601 return;
3501 } 3602 }
3502 3603
3503 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3504 3605
3505 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3506 3607
3507 $RUNTIME += $TICK; 3608 $RUNTIME += $TICK;
3508 $NEXT_TICK += $TICK; 3609 $NEXT_TICK += $TICK;
3509 3610
3510 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3511 $NEXT_RUNTIME_WRITE = $NOW + 10; 3612 $NEXT_RUNTIME_WRITE = $NOW + 10;
3512 Coro::async_pool { 3613 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver"; 3614 $Coro::current->{desc} = "runtime saver";
3514 write_runtime 3615 write_runtime
3515 or warn "ERROR: unable to write runtime file: $!"; 3616 or warn "ERROR: unable to write runtime file: $!";
3516 };
3517 } 3617 };
3618 }
3518 3619
3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3520 $sig->send; 3621 $sig->send;
3521 } 3622 }
3522 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3523 $sig->send; 3624 $sig->send;
3524 } 3625 }
3525 3626
3526 $NOW = Event::time;
3527
3528 # if we are delayed by four ticks or more, skip them all
3529 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3530
3531 $TICK_WATCHER->at ($NEXT_TICK);
3532 $TICK_WATCHER->start;
3533
3534 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3536 3629
3537 _post_tick; 3630 _post_tick;
3538 }, 3631};
3539); 3632$TICK_WATCHER->priority (EV::MAXPRI);
3540 3633
3541{ 3634{
3542 BDB::min_parallel 8; 3635 BDB::min_parallel 8;
3543 BDB::max_poll_time $TICK * 0.1; 3636 BDB::max_poll_reqs $TICK * 0.1;
3544 $BDB_POLL_WATCHER = Event->io (
3545 reentrant => 0,
3546 fd => BDB::poll_fileno,
3547 poll => 'r',
3548 prio => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => \&BDB::poll_cb,
3551 );
3552
3553 BDB::set_sync_prepare {
3554 my $status;
3555 my $current = $Coro::current;
3556 (
3557 sub {
3558 $status = $!;
3559 $current->ready; undef $current;
3560 },
3561 sub {
3562 Coro::schedule while defined $current;
3563 $! = $status;
3564 },
3565 )
3566 };
3567 3637
3568 unless ($DB_ENV) { 3638 unless ($DB_ENV) {
3569 $DB_ENV = BDB::db_env_create; 3639 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3640 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3571 | BDB::LOG_AUTOREMOVE, 1); 3641 | BDB::LOG_AUTOREMOVE, 1);
… …
3586 3656
3587 cf::cleanup "db_env_open(db): $@" if $@; 3657 cf::cleanup "db_env_open(db): $@" if $@;
3588 }; 3658 };
3589 } 3659 }
3590 3660
3591 $BDB_DEADLOCK_WATCHER = Event->timer ( 3661 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3662 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 ); 3663 };
3601 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3664 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3665 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 ); 3666 };
3611 $BDB_TRICKLE_WATCHER = Event->timer ( 3667 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3668 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 ); 3669 };
3621} 3670}
3622 3671
3623{ 3672{
3624 IO::AIO::min_parallel 8; 3673 IO::AIO::min_parallel 8;
3625 3674
3626 undef $Coro::AIO::WATCHER; 3675 undef $Coro::AIO::WATCHER;
3627 IO::AIO::max_poll_time $TICK * 0.1; 3676 IO::AIO::max_poll_time $TICK * 0.1;
3628 $AIO_POLL_WATCHER = Event->io ( 3677 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3629 reentrant => 0,
3630 data => WF_AUTOCANCEL,
3631 fd => IO::AIO::poll_fileno,
3632 poll => 'r',
3633 prio => 0,
3634 cb => \&IO::AIO::poll_cb,
3635 );
3636} 3678}
3637 3679
3638my $_log_backtrace; 3680my $_log_backtrace;
3639 3681
3640sub _log_backtrace { 3682sub _log_backtrace {

Diff Legend

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