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.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.401 by root, Mon Dec 17 06:45:53 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.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 ();
32use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
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>:
373 } 387 }
374 } 388 }
375 } 389 }
376 390
377 if (@SLOT_QUEUE) { 391 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 393 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 394 $signal->wait;
381 } else { 395 } else {
382 Coro::schedule; 396 Coro::schedule;
383 } 397 }
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 || {} });
1046 close $fh; 1095 close $fh;
1047 1096
1048 if (@$objs) { 1097 if (@$objs) {
1049 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) {
1050 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
1051 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
1053 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
1054 close $fh; 1103 close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1105 }
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 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
1093 } 1143 }
1094 1144
1095 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1096 warn sprintf "loading %s (%d,%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
1097 $decname, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
1512 1562
1513Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1514 1564
1515=cut 1565=cut
1516 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
1517sub expand_cfpod { 1578sub expand_cfpod {
1518 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1519 1580
1520 # escape & and < 1581 my $xml;
1521 s/&/&amp;/g;
1522 s/(?<![BIUGHT])</&lt;/g;
1523 1582
1524 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1525 1586
1526 1 while 1587 $group =~ s/&/&amp;/g;
1527 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1528 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1529 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1530 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1592 ([BCGHITU])
1532 # replace G<male|female> tags 1593 <
1533 || s{G<([^>|]*)\|([^>]*)>}{ 1594 (?:
1534 $self->gender ? $2 : $1 1595 ([^<>]*) (?{ $group = $^N })
1535 }ge 1596 | < $interior >
1536 # replace H<hint text> 1597 )
1537 || s{H<([^\>]*)>} 1598 >
1599 %gcsx
1538 { 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") {
1539 ("<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>",
1540 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1541 "") 1620 "")
1542 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1543 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1544 1632
1633 for ($xml) {
1545 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1546 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1547 1636
1548 # compress some whitespace 1637 # compress some whitespace
1549 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1550 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1551 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1552 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1553 1643
1554 $_ 1644 $xml
1555} 1645}
1646
1647no re 'eval';
1556 1648
1557sub hintmode { 1649sub hintmode {
1558 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1559 $_[0]{hintmode} 1651 $_[0]{hintmode}
1560} 1652}
2547 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2548 } 2640 }
2549 2641
2550 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2551 2643
2552 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2553 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2555 2647
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
2630the 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
2631the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2632 2724
2633=cut 2725=cut
2634 2726
2727# non-persistent channels (usually the info channel)
2635our %CHANNEL = ( 2728our %CHANNEL = (
2636 "c/identify" => { 2729 "c/identify" => {
2637 id => "infobox", 2730 id => "infobox",
2638 title => "Identify", 2731 title => "Identify",
2639 reply => undef, 2732 reply => undef,
2643 id => "infobox", 2736 id => "infobox",
2644 title => "Examine", 2737 title => "Examine",
2645 reply => undef, 2738 reply => undef,
2646 tooltip => "Signs and other items you examined", 2739 tooltip => "Signs and other items you examined",
2647 }, 2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2648 "c/lookat" => { 2747 "c/lookat" => {
2649 id => "infobox", 2748 id => "infobox",
2650 title => "Look", 2749 title => "Look",
2651 reply => undef, 2750 reply => undef,
2652 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",
2653 }, 2776 },
2654); 2777);
2655 2778
2656sub cf::client::send_msg { 2779sub cf::client::send_msg {
2657 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
2894=pod 3017=pod
2895 3018
2896The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2897 3020
2898 cf::object 3021 cf::object
2899 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
2900 insert remove name archname title slaying race decrease_ob_nr 3023 insert remove name archname title slaying race decrease_ob_nr
2901 3024
2902 cf::object::player 3025 cf::object::player
2903 player 3026 player
2904 3027
2911=cut 3034=cut
2912 3035
2913for ( 3036for (
2914 ["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
2915 insert remove inv name archname title slaying race 3038 insert remove inv name archname title slaying race
2916 decrease_ob_nr)], 3039 decrease_ob_nr destroy)],
2917 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2918 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2919 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2920) { 3043) {
2921 no strict 'refs'; 3044 no strict 'refs';
3197 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
3198 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
3199 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#
3200 (async { 3323 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3202 Event::one_event; 3325 EV::loop EV::LOOP_ONESHOT;
3203 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
3204 }; 3327 };
3205 3328
3206 reload_config; 3329 reload_config;
3207 db_init; 3330 db_init;
3208 load_extensions; 3331 load_extensions;
3209 3332
3210 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3211 Event::loop; 3335 EV::loop;
3212} 3336}
3213 3337
3214############################################################################# 3338#############################################################################
3215# initialisation and cleanup 3339# initialisation and cleanup
3216 3340
3217# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
3218BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
3219 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
3220 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3221 reentrant => 0,
3222 data => WF_AUTOCANCEL,
3223 signal => $signal,
3224 prio => 0,
3225 cb => sub {
3226 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
3227 },
3228 ); 3347 };
3229 } 3348 }
3230} 3349}
3231 3350
3232sub write_runtime { 3351sub write_runtime {
3233 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
3278 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
3279 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
3280 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
3281 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
3282 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3283 $pl->save; 3403 $pl->save;
3284 } 3404 }
3285 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
3286 3406
3287 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
3326 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3327 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3328 3448
3329 # 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
3330 3450
3331 warn "cancelling all WF_AUTOCANCEL watchers";
3332 for (Event::all_watchers) {
3333 $_->cancel if $_->data & WF_AUTOCANCEL;
3334 }
3335
3336 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3337 for (;;) { 3452 for (;;) {
3338 BDB::flush; 3453 BDB::flush;
3339 IO::AIO::flush; 3454 IO::AIO::flush;
3340 Coro::cede; 3455 Coro::cede_notself;
3341 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3342 warn "iterate..."; 3457 warn "iterate...";
3343 } 3458 }
3344 3459
3345 ++$RELOAD; 3460 ++$RELOAD;
3434 3549
3435sub reload_perl() { 3550sub reload_perl() {
3436 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3437 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3438 3553
3439 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3440 reentrant => 0,
3441 after => 0,
3442 data => WF_AUTOCANCEL,
3443 cb => sub {
3444 do_reload_perl;
3445 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3446 }, 3556 do_reload_perl;
3447 ); 3557 };
3448} 3558}
3449 3559
3450register_command "reload" => sub { 3560register_command "reload" => sub {
3451 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3452 3562
3482 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3483 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3484 $signal->wait; 3594 $signal->wait;
3485} 3595}
3486 3596
3487$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3488 reentrant => 0,
3489 parked => 1,
3490 prio => 0,
3491 at => $NEXT_TICK || $TICK,
3492 data => WF_AUTOCANCEL,
3493 cb => sub {
3494 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3495 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"
3496 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3497 return; 3601 return;
3498 } 3602 }
3499 3603
3500 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3501 3605
3502 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3503 3607
3504 $RUNTIME += $TICK; 3608 $RUNTIME += $TICK;
3505 $NEXT_TICK += $TICK; 3609 $NEXT_TICK += $TICK;
3506 3610
3507 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3508 $NEXT_RUNTIME_WRITE = $NOW + 10; 3612 $NEXT_RUNTIME_WRITE = $NOW + 10;
3509 Coro::async_pool { 3613 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver"; 3614 $Coro::current->{desc} = "runtime saver";
3511 write_runtime 3615 write_runtime
3512 or warn "ERROR: unable to write runtime file: $!"; 3616 or warn "ERROR: unable to write runtime file: $!";
3513 };
3514 } 3617 };
3618 }
3515 3619
3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3517 $sig->send; 3621 $sig->send;
3518 } 3622 }
3519 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3520 $sig->send; 3624 $sig->send;
3521 } 3625 }
3522 3626
3523 $NOW = Event::time;
3524
3525 # if we are delayed by four ticks or more, skip them all
3526 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3527
3528 $TICK_WATCHER->at ($NEXT_TICK);
3529 $TICK_WATCHER->start;
3530
3531 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3533 3629
3534 _post_tick; 3630 _post_tick;
3535 }, 3631};
3536); 3632$TICK_WATCHER->priority (EV::MAXPRI);
3537 3633
3538{ 3634{
3635 # configure BDB
3636
3539 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
3540 BDB::max_poll_time $TICK * 0.1; 3638 BDB::max_poll_reqs $TICK * 0.1;
3541 $BDB_POLL_WATCHER = Event->io (
3542 reentrant => 0,
3543 fd => BDB::poll_fileno,
3544 poll => 'r',
3545 prio => 0,
3546 data => WF_AUTOCANCEL,
3547 cb => \&BDB::poll_cb,
3548 );
3549
3550 BDB::set_sync_prepare {
3551 my $status;
3552 my $current = $Coro::current;
3553 (
3554 sub {
3555 $status = $!;
3556 $current->ready; undef $current;
3557 },
3558 sub {
3559 Coro::schedule while defined $current;
3560 $! = $status;
3561 },
3562 )
3563 };
3564 3639
3565 unless ($DB_ENV) { 3640 unless ($DB_ENV) {
3566 $DB_ENV = BDB::db_env_create; 3641 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3568 | BDB::LOG_AUTOREMOVE, 1); 3643 | BDB::LOG_AUTOREMOVE, 1);
3583 3658
3584 cf::cleanup "db_env_open(db): $@" if $@; 3659 cf::cleanup "db_env_open(db): $@" if $@;
3585 }; 3660 };
3586 } 3661 }
3587 3662
3588 $BDB_DEADLOCK_WATCHER = Event->timer ( 3663 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3664 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 ); 3665 };
3598 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3666 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3599 after => 11,
3600 interval => 60,
3601 hard => 1,
3602 prio => 0,
3603 data => WF_AUTOCANCEL,
3604 cb => sub {
3605 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3667 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 ); 3668 };
3608 $BDB_TRICKLE_WATCHER = Event->timer ( 3669 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3609 after => 5,
3610 interval => 10,
3611 hard => 1,
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => sub {
3615 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3670 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 ); 3671 };
3618} 3672}
3619 3673
3620{ 3674{
3675 # configure IO::AIO
3676
3621 IO::AIO::min_parallel 8; 3677 IO::AIO::min_parallel 8;
3622
3623 undef $Coro::AIO::WATCHER;
3624 IO::AIO::max_poll_time $TICK * 0.1; 3678 IO::AIO::max_poll_time $TICK * 0.1;
3625 $AIO_POLL_WATCHER = Event->io (
3626 reentrant => 0,
3627 data => WF_AUTOCANCEL,
3628 fd => IO::AIO::poll_fileno,
3629 poll => 'r',
3630 prio => 0,
3631 cb => \&IO::AIO::poll_cb,
3632 );
3633} 3679}
3634 3680
3635my $_log_backtrace; 3681my $_log_backtrace;
3636 3682
3637sub _log_backtrace { 3683sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines