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.374 by root, Wed Sep 19 22:07:16 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 3.64 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
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 ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
38# 38#
39$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 42
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
47 45
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
162 160
163The raw value load value from the last tick. 161The raw value load value from the last tick.
164 162
165=item %cf::CFG 163=item %cf::CFG
166 164
167Configuration for the server, loaded from C</etc/crossfire/config>, or 165Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 166from wherever your confdir points to.
169 167
170=item cf::wait_for_tick, cf::wait_for_tick_begin 168=item cf::wait_for_tick, cf::wait_for_tick_begin
171 169
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 170These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
215)) { 213)) {
216 no strict 'refs'; 214 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 216}
219 217
220$Event::DIED = sub { 218$EV::DIED = sub {
221 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
222}; 220};
223 221
224############################################################################# 222#############################################################################
225 223
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>:
373 } 386 }
374 } 387 }
375 } 388 }
376 389
377 if (@SLOT_QUEUE) { 390 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 391 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 392 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 393 $signal->wait;
381 } else { 394 } else {
382 Coro::schedule; 395 Coro::schedule;
383 } 396 }
406 419
407BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
408 421
409=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
410 423
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 424The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 425is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 426partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 427acceptable.
415 428
416If it must be done, put the blocking parts into C<sync_job>. This will run 429If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 430the given BLOCK in another coroutine while waiting for the result. The
422 435
423sub sync_job(&) { 436sub sync_job(&) {
424 my ($job) = @_; 437 my ($job) = @_;
425 438
426 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 440 my $time = EV::time;
428 441
429 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
431 444
445 LOG llevError, Carp::longmess "sync job";#d#
446
432 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
433 # (but this is cancel-safe) 448 # (but this is cancel-safe)
434 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
435 450
436 my $busy = 1; 451 my $busy = 1;
442 warn $@ if $@; 457 warn $@ if $@;
443 undef $busy; 458 undef $busy;
444 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
445 460
446 while ($busy) { 461 while ($busy) {
447 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
448 } 466 }
467 }
449 468
450 $time = Event::time - $time; 469 $time = EV::time - $time;
451 470
452 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454 473
455 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
485=item fork_call { }, $args 504=item fork_call { }, $args
486 505
487Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
491 510
492=cut 511=cut
493 512
494sub fork_call(&@) { 513sub fork_call(&@) {
495 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
656attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
658 677
659In the following description, CLASS can be any of C<global>, C<object> 678In the following description, CLASS can be any of C<global>, C<object>
660C<player>, C<client> or C<map> (i.e. the attachable objects in 679C<player>, C<client> or C<map> (i.e. the attachable objects in
661Crossfire TRT). 680Deliantra).
662 681
663=over 4 682=over 4
664 683
665=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
666 685
964 983
965=cut 984=cut
966 985
967############################################################################# 986#############################################################################
968# object support 987# object support
969#
970 988
989sub _object_equal($$);
990sub _object_equal($$) {
991 my ($a, $b) = @_;
992
993 return 0 unless (ref $a) eq (ref $b);
994
995 if ("HASH" eq ref $a) {
996 my @ka = keys %$a;
997 my @kb = keys %$b;
998
999 return 0 if @ka != @kb;
1000
1001 for (0 .. $#ka) {
1002 return 0 unless $ka[$_] eq $kb[$_];
1003 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1004 }
1005
1006 } elsif ("ARRAY" eq ref $a) {
1007
1008 return 0 if @$a != @$b;
1009
1010 for (0 .. $#$a) {
1011 return 0 unless _object_equal $a->[$_], $b->[$_];
1012 }
1013
1014 } elsif ($a ne $b) {
1015 return 0;
1016 }
1017
1018 1
1019}
1020
1021our $SLOW_MERGES;#d#
971sub _can_merge { 1022sub _can_merge {
972 my ($ob1, $ob2) = @_; 1023 my ($ob1, $ob2) = @_;
973 1024
974 local $Storable::canonical = 1; 1025 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1026
978 $fob1 eq $fob2 1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
979} 1029}
980 1030
981sub reattach { 1031sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1033 my ($obj) = @_;
1005cf::attachable->attach ( 1055cf::attachable->attach (
1006 prio => -1000000, 1056 prio => -1000000,
1007 on_instantiate => sub { 1057 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1058 my ($obj, $data) = @_;
1009 1059
1010 $data = from_json $data; 1060 $data = decode_json $data;
1011 1061
1012 for (@$data) { 1062 for (@$data) {
1013 my ($name, $args) = @$_; 1063 my ($name, $args) = @$_;
1014 1064
1015 $obj->attach ($name, %{$args || {} }); 1065 $obj->attach ($name, %{$args || {} });
1044 close $fh; 1094 close $fh;
1045 1095
1046 if (@$objs) { 1096 if (@$objs) {
1047 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1102 close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1104 }
1085 1135
1086 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1138 or return;
1089 1139
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1140 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs};
1091 } 1142 }
1092 1143
1093 utf8::decode (my $decname = $filename); 1144 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1146 $decname, length $data, scalar @{$av || []};
1510 1561
1511Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1512 1563
1513=cut 1564=cut
1514 1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1515sub expand_cfpod { 1577sub expand_cfpod {
1516 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1517 1579
1518 # escape & and < 1580 my $xml;
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521 1581
1522 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1523 1585
1524 1 while 1586 $group =~ s/&/&amp;/g;
1525 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1526 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1527 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1528 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1591 ([BCGHITU])
1530 # replace G<male|female> tags 1592 <
1531 || s{G<([^>|]*)\|([^>]*)>}{ 1593 (?:
1532 $self->gender ? $2 : $1 1594 ([^<>]*) (?{ $group = $^N })
1533 }ge 1595 | < $interior >
1534 # replace H<hint text> 1596 )
1535 || s{H<([^\>]*)>} 1597 >
1598 %gcsx
1536 { 1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "") 1619 "")
1540 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1541 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1542 1631
1632 for ($xml) {
1543 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1545 1635
1546 # compress some whitespace 1636 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1551 1642
1552 $_ 1643 $xml
1553} 1644}
1645
1646no re 'eval';
1554 1647
1555sub hintmode { 1648sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode} 1650 $_[0]{hintmode}
1558} 1651}
2273=cut 2366=cut
2274 2367
2275sub deref { 2368sub deref {
2276 my ($ref) = @_; 2369 my ($ref) = @_;
2277 2370
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2371 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2372 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2373 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2374 or return;
2285 $pl->ob->uuid eq $uuid 2375 $pl->ob->uuid eq $uuid
2286 or return; 2376 or return;
2548 $rmp->{origin_y} = $exit->y; 2638 $rmp->{origin_y} = $exit->y;
2549 } 2639 }
2550 2640
2551 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2552 2642
2553 my $data = cf::to_json $rmp; 2643 my $data = cf::encode_json $rmp;
2554 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2556 2646
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
2631the 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
2632the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2633 2723
2634=cut 2724=cut
2635 2725
2726# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 2727our %CHANNEL = (
2637 "c/identify" => { 2728 "c/identify" => {
2638 id => "identify", 2729 id => "infobox",
2639 title => "Identify", 2730 title => "Identify",
2640 reply => undef, 2731 reply => undef,
2641 tooltip => "Items recently identified", 2732 tooltip => "Items recently identified",
2642 }, 2733 },
2643 "c/examine" => { 2734 "c/examine" => {
2644 id => "examine", 2735 id => "infobox",
2645 title => "Examine", 2736 title => "Examine",
2646 reply => undef, 2737 reply => undef,
2647 tooltip => "Signs and other items you examined", 2738 tooltip => "Signs and other items you examined",
2648 }, 2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2746 "c/lookat" => {
2747 id => "infobox",
2748 title => "Look",
2749 reply => undef,
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",
2775 },
2649); 2776);
2650 2777
2651sub cf::client::send_msg { 2778sub cf::client::send_msg {
2652 my ($self, $channel, $msg, $color, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
2653 2780
2654 $msg = $self->pl->expand_cfpod ($msg); 2781 $msg = $self->pl->expand_cfpod ($msg);
2655 2782
2656 $color &= cf::NDI_CLIENT_MASK; # just in case... 2783 $color &= cf::NDI_CLIENT_MASK; # just in case...
2657 2784
2658 # check predefined channels, for the benefit of C 2785 # check predefined channels, for the benefit of C
2659 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2786 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel};
2660 2788
2789 $self->ext_msg (channel_info => $channel)
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id};
2793
2661 if (ref $channel) { 2794 } elsif (ref $channel) {
2662 # send meta info to client, if not yet sent 2795 # send meta info to client, if not yet sent
2663 unless (exists $self->{channel}{$channel->{id}}) { 2796 unless (exists $self->{channel}{$channel->{id}}) {
2664 $self->{channel}{$channel->{id}} = $channel; 2797 $self->{channel}{$channel->{id}} = $channel;
2665 $self->ext_msg (channel_info => $channel) 2798 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg; 2799 if $self->can_msg;
2883=pod 3016=pod
2884 3017
2885The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2886 3019
2887 cf::object 3020 cf::object
2888 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
2889 insert remove name archname title slaying race decrease_ob_nr 3022 insert remove name archname title slaying race decrease_ob_nr
2890 3023
2891 cf::object::player 3024 cf::object::player
2892 player 3025 player
2893 3026
2900=cut 3033=cut
2901 3034
2902for ( 3035for (
2903 ["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
2904 insert remove inv name archname title slaying race 3037 insert remove inv name archname title slaying race
2905 decrease_ob_nr)], 3038 decrease_ob_nr destroy)],
2906 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2907 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2908 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2909) { 3042) {
2910 no strict 'refs'; 3043 no strict 'refs';
3186 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
3187 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
3188 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#
3189 (async { 3322 (async {
3190 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3191 Event::one_event; 3324 EV::loop EV::LOOP_ONESHOT;
3192 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
3193 }; 3326 };
3194 3327
3195 reload_config; 3328 reload_config;
3196 db_init; 3329 db_init;
3197 load_extensions; 3330 load_extensions;
3198 3331
3199 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3200 Event::loop; 3334 EV::loop;
3201} 3335}
3202 3336
3203############################################################################# 3337#############################################################################
3204# initialisation and cleanup 3338# initialisation and cleanup
3205 3339
3206# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
3207BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
3208 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
3209 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3210 reentrant => 0,
3211 data => WF_AUTOCANCEL,
3212 signal => $signal,
3213 prio => 0,
3214 cb => sub {
3215 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
3216 },
3217 ); 3346 };
3218 } 3347 }
3219} 3348}
3220 3349
3221sub write_runtime { 3350sub write_runtime {
3222 my $runtime = "$LOCALDIR/runtime"; 3351 my $runtime = "$LOCALDIR/runtime";
3267 # and maps saved/destroyed asynchronously. 3396 # and maps saved/destroyed asynchronously.
3268 warn "begin emergency player save\n"; 3397 warn "begin emergency player save\n";
3269 for my $login (keys %cf::PLAYER) { 3398 for my $login (keys %cf::PLAYER) {
3270 my $pl = $cf::PLAYER{$login} or next; 3399 my $pl = $cf::PLAYER{$login} or next;
3271 $pl->valid or next; 3400 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3272 $pl->save; 3402 $pl->save;
3273 } 3403 }
3274 warn "end emergency player save\n"; 3404 warn "end emergency player save\n";
3275 3405
3276 warn "begin emergency map save\n"; 3406 warn "begin emergency map save\n";
3315 warn "syncing database to disk"; 3445 warn "syncing database to disk";
3316 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
3317 3447
3318 # 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
3319 3449
3320 warn "cancelling all WF_AUTOCANCEL watchers";
3321 for (Event::all_watchers) {
3322 $_->cancel if $_->data & WF_AUTOCANCEL;
3323 }
3324
3325 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
3326 for (;;) { 3451 for (;;) {
3327 BDB::flush; 3452 BDB::flush;
3328 IO::AIO::flush; 3453 IO::AIO::flush;
3329 Coro::cede; 3454 Coro::cede_notself;
3330 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
3331 warn "iterate..."; 3456 warn "iterate...";
3332 } 3457 }
3333 3458
3334 ++$RELOAD; 3459 ++$RELOAD;
3423 3548
3424sub reload_perl() { 3549sub reload_perl() {
3425 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
3426 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
3427 3552
3428 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3429 reentrant => 0,
3430 after => 0,
3431 data => WF_AUTOCANCEL,
3432 cb => sub {
3433 do_reload_perl;
3434 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
3435 }, 3555 do_reload_perl;
3436 ); 3556 };
3437} 3557}
3438 3558
3439register_command "reload" => sub { 3559register_command "reload" => sub {
3440 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
3441 3561
3471 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
3472 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
3473 $signal->wait; 3593 $signal->wait;
3474} 3594}
3475 3595
3476$TICK_WATCHER = Event->timer ( 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3477 reentrant => 0,
3478 parked => 1,
3479 prio => 0,
3480 at => $NEXT_TICK || $TICK,
3481 data => WF_AUTOCANCEL,
3482 cb => sub {
3483 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
3484 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"
3485 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
3486 return; 3600 return;
3487 } 3601 }
3488 3602
3489 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
3490 3604
3491 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
3492 3606
3493 $RUNTIME += $TICK; 3607 $RUNTIME += $TICK;
3494 $NEXT_TICK += $TICK; 3608 $NEXT_TICK += $TICK;
3495 3609
3496 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3497 $NEXT_RUNTIME_WRITE = $NOW + 10; 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
3498 Coro::async_pool { 3612 Coro::async_pool {
3499 $Coro::current->{desc} = "runtime saver"; 3613 $Coro::current->{desc} = "runtime saver";
3500 write_runtime 3614 write_runtime
3501 or warn "ERROR: unable to write runtime file: $!"; 3615 or warn "ERROR: unable to write runtime file: $!";
3502 };
3503 } 3616 };
3617 }
3504 3618
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 3620 $sig->send;
3507 } 3621 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 3623 $sig->send;
3510 } 3624 }
3511 3625
3512 $NOW = Event::time;
3513
3514 # if we are delayed by four ticks or more, skip them all
3515 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3516
3517 $TICK_WATCHER->at ($NEXT_TICK);
3518 $TICK_WATCHER->start;
3519
3520 $LOAD = ($NOW - $tick_start) / $TICK; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 3628
3523 _post_tick; 3629 _post_tick;
3524 }, 3630};
3525); 3631$TICK_WATCHER->priority (EV::MAXPRI);
3526 3632
3527{ 3633{
3528 BDB::min_parallel 8; 3634 BDB::min_parallel 8;
3529 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
3530 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3531 reentrant => 0,
3532 fd => BDB::poll_fileno,
3533 poll => 'r',
3534 prio => 0,
3535 data => WF_AUTOCANCEL,
3536 cb => \&BDB::poll_cb,
3537 );
3538 3637
3539 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3540 my $status; 3639 my $status;
3541 my $current = $Coro::current; 3640 my $current = $Coro::current;
3542 ( 3641 (
3572 3671
3573 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3574 }; 3673 };
3575 } 3674 }
3576 3675
3577 $BDB_DEADLOCK_WATCHER = Event->timer ( 3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3578 after => 3,
3579 interval => 1,
3580 hard => 1,
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 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 { };
3585 },
3586 ); 3678 };
3587 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3588 after => 11,
3589 interval => 60,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3595 },
3596 ); 3681 };
3597 $BDB_TRICKLE_WATCHER = Event->timer ( 3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3598 after => 5,
3599 interval => 10,
3600 hard => 1,
3601 prio => 0,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3605 },
3606 ); 3684 };
3607} 3685}
3608 3686
3609{ 3687{
3610 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3611 3689
3612 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3613 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3614 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3615 reentrant => 0,
3616 data => WF_AUTOCANCEL,
3617 fd => IO::AIO::poll_fileno,
3618 poll => 'r',
3619 prio => 6,
3620 cb => \&IO::AIO::poll_cb,
3621 );
3622} 3693}
3623 3694
3624my $_log_backtrace; 3695my $_log_backtrace;
3625 3696
3626sub _log_backtrace { 3697sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines