ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.385 by root, Fri Oct 12 19:13:26 2007 UTC vs.
Revision 1.404 by root, Mon Dec 17 07:27:58 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 1.86;
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.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, Carp::longmess "sync job";#d# 446 LOG llevError, Carp::longmess "sync job";#d#
… …
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 return 1;#d# 1026 ++$SLOW_MERGES;#d#
977 1027
978 #todo#d# kill yourself and do some recursive checking manually without storable 1028 # we do the slow way here
979 sync_job { 1029 return _object_equal $ob1, $ob2
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986} 1030}
987 1031
988sub reattach { 1032sub reattach {
989 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
990 my ($obj) = @_; 1034 my ($obj) = @_;
… …
1012cf::attachable->attach ( 1056cf::attachable->attach (
1013 prio => -1000000, 1057 prio => -1000000,
1014 on_instantiate => sub { 1058 on_instantiate => sub {
1015 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
1016 1060
1017 $data = from_json $data; 1061 $data = decode_json $data;
1018 1062
1019 for (@$data) { 1063 for (@$data) {
1020 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
1021 1065
1022 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
… …
1051 close $fh; 1095 close $fh;
1052 1096
1053 if (@$objs) { 1097 if (@$objs) {
1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1055 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1057 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
1058 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
1059 close $fh; 1103 close $fh;
1060 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
1061 } 1105 }
… …
1092 1136
1093 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1094 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1095 or return; 1139 or return;
1096 1140
1097 my $st = eval { Coro::Storable::thaw $av } 1141 my $st = eval { Coro::Storable::thaw $av };
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs}; 1142 $av = $st->{objs};
1100 } 1143 }
1101 1144
1102 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1103 warn sprintf "loading %s (%d,%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
… …
1519 1562
1520Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1521 1564
1522=cut 1565=cut
1523 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
1524sub expand_cfpod { 1578sub expand_cfpod {
1525 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1526 1580
1527 # escape & and < 1581 my $xml;
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530 1582
1531 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1532 1586
1533 1 while 1587 $group =~ s/&/&amp;/g;
1534 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1535 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1536 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1537 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1592 ([BCGHITU])
1539 # replace G<male|female> tags 1593 <
1540 || s{G<([^>|]*)\|([^>]*)>}{ 1594 (?:
1541 $self->gender ? $2 : $1 1595 ([^<>]*) (?{ $group = $^N })
1542 }ge 1596 | < $interior >
1543 # replace H<hint text> 1597 )
1544 || s{H<([^\>]*)>} 1598 >
1599 %gcsx
1545 { 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") {
1546 ("<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>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "") 1620 "")
1549 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1550 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1551 1632
1633 for ($xml) {
1552 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1554 1636
1555 # compress some whitespace 1637 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1560 1643
1561 $_ 1644 $xml
1562} 1645}
1646
1647no re 'eval';
1563 1648
1564sub hintmode { 1649sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode} 1651 $_[0]{hintmode}
1567} 1652}
… …
2554 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2555 } 2640 }
2556 2641
2557 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2558 2643
2559 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2560 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2561 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2562 2647
2563 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2564 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
… …
2637the 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
2638the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2639 2724
2640=cut 2725=cut
2641 2726
2727# non-persistent channels (usually the info channel)
2642our %CHANNEL = ( 2728our %CHANNEL = (
2643 "c/identify" => { 2729 "c/identify" => {
2644 id => "infobox", 2730 id => "infobox",
2645 title => "Identify", 2731 title => "Identify",
2646 reply => undef, 2732 reply => undef,
… …
2650 id => "infobox", 2736 id => "infobox",
2651 title => "Examine", 2737 title => "Examine",
2652 reply => undef, 2738 reply => undef,
2653 tooltip => "Signs and other items you examined", 2739 tooltip => "Signs and other items you examined",
2654 }, 2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2655 "c/lookat" => { 2747 "c/lookat" => {
2656 id => "infobox", 2748 id => "infobox",
2657 title => "Look", 2749 title => "Look",
2658 reply => undef, 2750 reply => undef,
2659 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",
2660 }, 2776 },
2661); 2777);
2662 2778
2663sub cf::client::send_msg { 2779sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
… …
3204 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
3205 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
3206 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#
3207 (async { 3323 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3209 Event::one_event; 3325 EV::loop EV::LOOP_ONESHOT;
3210 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
3211 }; 3327 };
3212 3328
3213 reload_config; 3329 reload_config;
3214 db_init; 3330 db_init;
3215 load_extensions; 3331 load_extensions;
3216 3332
3217 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3218 Event::loop; 3335 EV::loop;
3219} 3336}
3220 3337
3221############################################################################# 3338#############################################################################
3222# initialisation and cleanup 3339# initialisation and cleanup
3223 3340
3224# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
3225BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
3226 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
3227 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3228 reentrant => 0,
3229 data => WF_AUTOCANCEL,
3230 signal => $signal,
3231 prio => 0,
3232 cb => sub {
3233 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
3234 },
3235 ); 3347 };
3236 } 3348 }
3237} 3349}
3238 3350
3239sub write_runtime { 3351sub write_runtime {
3240 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
… …
3334 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3335 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3336 3448
3337 # 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
3338 3450
3339 warn "cancelling all WF_AUTOCANCEL watchers";
3340 for (Event::all_watchers) {
3341 $_->cancel if $_->data & WF_AUTOCANCEL;
3342 }
3343
3344 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3345 for (;;) { 3452 for (;;) {
3346 BDB::flush; 3453 BDB::flush;
3347 IO::AIO::flush; 3454 IO::AIO::flush;
3348 Coro::cede; 3455 Coro::cede_notself;
3349 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3350 warn "iterate..."; 3457 warn "iterate...";
3351 } 3458 }
3352 3459
3353 ++$RELOAD; 3460 ++$RELOAD;
… …
3442 3549
3443sub reload_perl() { 3550sub reload_perl() {
3444 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3445 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3446 3553
3447 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3448 reentrant => 0,
3449 after => 0,
3450 data => WF_AUTOCANCEL,
3451 cb => sub {
3452 do_reload_perl;
3453 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3454 }, 3556 do_reload_perl;
3455 ); 3557 };
3456} 3558}
3457 3559
3458register_command "reload" => sub { 3560register_command "reload" => sub {
3459 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3460 3562
… …
3490 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3491 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3492 $signal->wait; 3594 $signal->wait;
3493} 3595}
3494 3596
3495$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3496 reentrant => 0,
3497 parked => 1,
3498 prio => 0,
3499 at => $NEXT_TICK || $TICK,
3500 data => WF_AUTOCANCEL,
3501 cb => sub {
3502 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3503 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"
3504 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3505 return; 3601 return;
3506 } 3602 }
3507 3603
3508 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3509 3605
3510 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3511 3607
3512 $RUNTIME += $TICK; 3608 $RUNTIME += $TICK;
3513 $NEXT_TICK += $TICK; 3609 $NEXT_TICK = $_[0]->at;
3514 3610
3515 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3516 $NEXT_RUNTIME_WRITE = $NOW + 10; 3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3517 Coro::async_pool { 3613 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver"; 3614 $Coro::current->{desc} = "runtime saver";
3519 write_runtime 3615 write_runtime
3520 or warn "ERROR: unable to write runtime file: $!"; 3616 or warn "ERROR: unable to write runtime file: $!";
3521 };
3522 } 3617 };
3618 }
3523 3619
3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3525 $sig->send; 3621 $sig->send;
3526 } 3622 }
3527 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3528 $sig->send; 3624 $sig->send;
3529 } 3625 }
3530 3626
3531 $NOW = Event::time;
3532
3533 # if we are delayed by four ticks or more, skip them all
3534 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3535
3536 $TICK_WATCHER->at ($NEXT_TICK);
3537 $TICK_WATCHER->start;
3538
3539 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3541 3629
3542 _post_tick; 3630 _post_tick;
3543 }, 3631};
3544); 3632$TICK_WATCHER->priority (EV::MAXPRI);
3545 3633
3546{ 3634{
3635 # configure BDB
3636
3547 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
3548 BDB::max_poll_time $TICK * 0.1; 3638 BDB::max_poll_reqs $TICK * 0.1;
3549 $BDB_POLL_WATCHER = Event->io ( 3639 $Coro::BDB::WATCHER->priority (1);
3550 reentrant => 0,
3551 fd => BDB::poll_fileno,
3552 poll => 'r',
3553 prio => 0,
3554 data => WF_AUTOCANCEL,
3555 cb => \&BDB::poll_cb,
3556 );
3557
3558 BDB::set_sync_prepare {
3559 my $status;
3560 my $current = $Coro::current;
3561 (
3562 sub {
3563 $status = $!;
3564 $current->ready; undef $current;
3565 },
3566 sub {
3567 Coro::schedule while defined $current;
3568 $! = $status;
3569 },
3570 )
3571 };
3572 3640
3573 unless ($DB_ENV) { 3641 unless ($DB_ENV) {
3574 $DB_ENV = BDB::db_env_create; 3642 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1); 3644 | BDB::LOG_AUTOREMOVE, 1);
… …
3591 3659
3592 cf::cleanup "db_env_open(db): $@" if $@; 3660 cf::cleanup "db_env_open(db): $@" if $@;
3593 }; 3661 };
3594 } 3662 }
3595 3663
3596 $BDB_DEADLOCK_WATCHER = Event->timer ( 3664 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3665 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 ); 3666 };
3606 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3667 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3668 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 ); 3669 };
3616 $BDB_TRICKLE_WATCHER = Event->timer ( 3670 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3671 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 ); 3672 };
3626} 3673}
3627 3674
3628{ 3675{
3676 # configure IO::AIO
3677
3629 IO::AIO::min_parallel 8; 3678 IO::AIO::min_parallel 8;
3630
3631 undef $Coro::AIO::WATCHER;
3632 IO::AIO::max_poll_time $TICK * 0.1; 3679 IO::AIO::max_poll_time $TICK * 0.1;
3633 $AIO_POLL_WATCHER = Event->io ( 3680 $Coro::AIO::WATCHER->priority (1);
3634 reentrant => 0,
3635 data => WF_AUTOCANCEL,
3636 fd => IO::AIO::poll_fileno,
3637 poll => 'r',
3638 prio => 0,
3639 cb => \&IO::AIO::poll_cb,
3640 );
3641} 3681}
3642 3682
3643my $_log_backtrace; 3683my $_log_backtrace;
3644 3684
3645sub _log_backtrace { 3685sub _log_backtrace {

Diff Legend

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