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.378 by root, Thu Oct 4 11:36:54 2007 UTC vs.
Revision 1.406 by root, Mon Dec 17 08:27:44 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 1.86;
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
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
75 75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
83 82
84our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 84our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 85our $BDB_CHECKPOINT_WATCHER;
89 88
90our %CFG; 89our %CFG;
91 90
92our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 92our $RUNTIME;
93our $NOW;
94 94
95our (%PLAYER, %PLAYER_LOADING); # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 96our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
98 98
162 162
163The raw value load value from the last tick. 163The raw value load value from the last tick.
164 164
165=item %cf::CFG 165=item %cf::CFG
166 166
167Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 168from wherever your confdir points to.
169 169
170=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
171 171
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
215)) { 215)) {
216 no strict 'refs'; 216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 218}
219 219
220$Event::DIED = sub { 220$EV::DIED = sub {
221 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
222}; 222};
223 223
224############################################################################# 224#############################################################################
225 225
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 249 $d
250 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
251} 251}
252 252
253=item $ref = cf::from_json $json 253=item $ref = cf::decode_json $json
254 254
255Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
256 256
257=item $json = cf::to_json $ref 257=item $json = cf::encode_json $ref
258 258
259Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260 260
261=cut 261=cut
262 262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 264
265sub to_json ($) { $json_coder->encode ($_[0]) } 265sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 266sub decode_json($) { $json_coder->decode ($_[0]) }
267 267
268=item cf::lock_wait $string 268=item cf::lock_wait $string
269 269
270Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
271 271
334 my $guard = Coro::guard { 334 my $guard = Coro::guard {
335 $TICK_WATCHER->start; 335 $TICK_WATCHER->start;
336 }; 336 };
337 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
338 $guard 338 $guard
339}
340
341=item cf::periodic $interval, $cb
342
343Like EV::periodic, but randomly selects a starting point so that the actions
344get spread over timer.
345
346=cut
347
348sub periodic($$) {
349 my ($interval, $cb) = @_;
350
351 my $start = rand List::Util::min 180, $interval;
352
353 EV::periodic $start, $interval, 0, $cb
339} 354}
340 355
341=item cf::get_slot $time[, $priority[, $name]] 356=item cf::get_slot $time[, $priority[, $name]]
342 357
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 358Allocate $time seconds of blocking CPU time at priority C<$priority>:
373 } 388 }
374 } 389 }
375 } 390 }
376 391
377 if (@SLOT_QUEUE) { 392 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 393 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 394 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 395 $signal->wait;
381 } else { 396 } else {
382 Coro::schedule; 397 Coro::schedule;
383 } 398 }
406 421
407BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
408 423
409=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
410 425
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 426The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 427is 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 428partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 429acceptable.
415 430
416If it must be done, put the blocking parts into C<sync_job>. This will run 431If 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 432the given BLOCK in another coroutine while waiting for the result. The
422 437
423sub sync_job(&) { 438sub sync_job(&) {
424 my ($job) = @_; 439 my ($job) = @_;
425 440
426 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 442 my $time = EV::time;
428 443
429 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
431 446
447 LOG llevError, Carp::longmess "sync job";#d#
448
432 # TODO: use suspend/resume instead 449 # TODO: use suspend/resume instead
433 # (but this is cancel-safe) 450 # (but this is cancel-safe)
434 my $freeze_guard = freeze_mainloop; 451 my $freeze_guard = freeze_mainloop;
435 452
436 my $busy = 1; 453 my $busy = 1;
442 warn $@ if $@; 459 warn $@ if $@;
443 undef $busy; 460 undef $busy;
444 })->prio (Coro::PRIO_MAX); 461 })->prio (Coro::PRIO_MAX);
445 462
446 while ($busy) { 463 while ($busy) {
447 Coro::cede or Event::one_event; 464 if (Coro::nready) {
465 Coro::cede_notself;
466 } else {
467 EV::loop EV::LOOP_ONESHOT;
448 } 468 }
469 }
449 470
450 $time = Event::time - $time; 471 $time = EV::time - $time;
451 472
452 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454 475
455 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
485=item fork_call { }, $args 506=item fork_call { }, $args
486 507
487Executes the given code block with the given arguments in a seperate 508Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 509process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 510Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 511never block itself or use any form of event handling.
491 512
492=cut 513=cut
493 514
494sub fork_call(&@) { 515sub fork_call(&@) {
495 my ($cb, @args) = @_; 516 my ($cb, @args) = @_;
656attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
658 679
659In the following description, CLASS can be any of C<global>, C<object> 680In 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 681C<player>, C<client> or C<map> (i.e. the attachable objects in
661Crossfire TRT). 682Deliantra).
662 683
663=over 4 684=over 4
664 685
665=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
666 687
948 } 969 }
949 970
950 0 971 0
951} 972}
952 973
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 974=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 975
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 977
957Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
958 979
964 985
965=cut 986=cut
966 987
967############################################################################# 988#############################################################################
968# object support 989# object support
969#
970 990
991sub _object_equal($$);
992sub _object_equal($$) {
993 my ($a, $b) = @_;
994
995 return 0 unless (ref $a) eq (ref $b);
996
997 if ("HASH" eq ref $a) {
998 my @ka = keys %$a;
999 my @kb = keys %$b;
1000
1001 return 0 if @ka != @kb;
1002
1003 for (0 .. $#ka) {
1004 return 0 unless $ka[$_] eq $kb[$_];
1005 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1006 }
1007
1008 } elsif ("ARRAY" eq ref $a) {
1009
1010 return 0 if @$a != @$b;
1011
1012 for (0 .. $#$a) {
1013 return 0 unless _object_equal $a->[$_], $b->[$_];
1014 }
1015
1016 } elsif ($a ne $b) {
1017 return 0;
1018 }
1019
1020 1
1021}
1022
1023our $SLOW_MERGES;#d#
971sub _can_merge { 1024sub _can_merge {
972 my ($ob1, $ob2) = @_; 1025 my ($ob1, $ob2) = @_;
973 1026
974 local $Storable::canonical = 1; 1027 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1028
978 $fob1 eq $fob2 1029 # we do the slow way here
1030 return _object_equal $ob1, $ob2
979} 1031}
980 1032
981sub reattach { 1033sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1035 my ($obj) = @_;
1005cf::attachable->attach ( 1057cf::attachable->attach (
1006 prio => -1000000, 1058 prio => -1000000,
1007 on_instantiate => sub { 1059 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
1009 1061
1010 $data = from_json $data; 1062 $data = decode_json $data;
1011 1063
1012 for (@$data) { 1064 for (@$data) {
1013 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
1014 1066
1015 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
1044 close $fh; 1096 close $fh;
1045 1097
1046 if (@$objs) { 1098 if (@$objs) {
1047 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1104 close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1106 }
1085 1137
1086 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1140 or return;
1089 1141
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
1091 } 1144 }
1092 1145
1093 utf8::decode (my $decname = $filename); 1146 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1148 $decname, length $data, scalar @{$av || []};
1510 1563
1511Expand crossfire pod fragments into protocol xml. 1564Expand crossfire pod fragments into protocol xml.
1512 1565
1513=cut 1566=cut
1514 1567
1568use re 'eval';
1569
1570my $group;
1571my $interior; $interior = qr{
1572 # match a pod interior sequence sans C<< >>
1573 (?:
1574 \ (.*?)\ (?{ $group = $^N })
1575 | < (??{$interior}) >
1576 )
1577}x;
1578
1515sub expand_cfpod { 1579sub expand_cfpod {
1516 ((my $self), (local $_)) = @_; 1580 my ($self, $pod) = @_;
1517 1581
1518 # escape & and < 1582 my $xml;
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521 1583
1522 # this is buggy, it needs to properly take care of nested <'s 1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1523 1587
1524 1 while 1588 $group =~ s/&/&amp;/g;
1525 # replace B<>, I<>, U<> etc. 1589 $group =~ s/</&lt;/g;
1526 s/B<([^\>]*)>/<b>$1<\/b>/ 1590
1527 || s/I<([^\>]*)>/<i>$1<\/i>/ 1591 $xml .= $group;
1528 || s/U<([^\>]*)>/<u>$1<\/u>/ 1592 } elsif ($pod =~ m%\G
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1593 ([BCGHITU])
1530 # replace G<male|female> tags 1594 <
1531 || s{G<([^>|]*)\|([^>]*)>}{ 1595 (?:
1532 $self->gender ? $2 : $1 1596 ([^<>]*) (?{ $group = $^N })
1533 }ge 1597 | < $interior >
1534 # replace H<hint text> 1598 )
1535 || s{H<([^\>]*)>} 1599 >
1600 %gcsx
1536 { 1601 ) {
1602 my ($code, $data) = ($1, $group);
1603
1604 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612 } elsif ($code eq "T") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614 } elsif ($code eq "G") {
1615 my ($male, $female) = split /\|/, $data;
1616 $data = $self->gender ? $female : $male;
1617 $xml .= expand_cfpod ($self, $data);
1618 } elsif ($code eq "H") {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "") 1621 "")
1540 [$self->{hintmode}] 1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1541 }ge; 1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1542 1633
1634 for ($xml) {
1543 # create single paragraphs (very hackish) 1635 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g; 1636 s/(?<=\S)\n(?=\w)/ /g;
1545 1637
1546 # compress some whitespace 1638 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends 1639 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines 1640 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines 1641 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines 1642 s/\n+$//; # ending lines
1643 }
1551 1644
1552 $_ 1645 $xml
1553} 1646}
1647
1648no re 'eval';
1554 1649
1555sub hintmode { 1650sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1; 1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode} 1652 $_[0]{hintmode}
1558} 1653}
2545 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2546 } 2641 }
2547 2642
2548 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2549 2644
2550 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2551 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2552 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2553 2648
2554 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2555 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
2628the message, with C<log> being the default. If C<$color> is negative, suppress 2723the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 2724the message unless the client supports the msg packet.
2630 2725
2631=cut 2726=cut
2632 2727
2728# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2729our %CHANNEL = (
2634 "c/identify" => { 2730 "c/identify" => {
2635 id => "infobox", 2731 id => "infobox",
2636 title => "Identify", 2732 title => "Identify",
2637 reply => undef, 2733 reply => undef,
2641 id => "infobox", 2737 id => "infobox",
2642 title => "Examine", 2738 title => "Examine",
2643 reply => undef, 2739 reply => undef,
2644 tooltip => "Signs and other items you examined", 2740 tooltip => "Signs and other items you examined",
2645 }, 2741 },
2742 "c/book" => {
2743 id => "infobox",
2744 title => "Book",
2745 reply => undef,
2746 tooltip => "The contents of a note or book",
2747 },
2646 "c/lookat" => { 2748 "c/lookat" => {
2647 id => "infobox", 2749 id => "infobox",
2648 title => "Look", 2750 title => "Look",
2649 reply => undef, 2751 reply => undef,
2650 tooltip => "What you saw there", 2752 tooltip => "What you saw there",
2753 },
2754 "c/who" => {
2755 id => "infobox",
2756 title => "Players",
2757 reply => undef,
2758 tooltip => "Shows players who are currently online",
2759 },
2760 "c/body" => {
2761 id => "infobox",
2762 title => "Body Parts",
2763 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available",
2765 },
2766 "c/uptime" => {
2767 id => "infobox",
2768 title => "Uptime",
2769 reply => undef,
2770 tooltip => "How long the server has been running since last restart",
2771 },
2772 "c/mapinfo" => {
2773 id => "infobox",
2774 title => "Map Info",
2775 reply => undef,
2776 tooltip => "Information related to the maps",
2651 }, 2777 },
2652); 2778);
2653 2779
2654sub cf::client::send_msg { 2780sub cf::client::send_msg {
2655 my ($self, $channel, $msg, $color, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
2892=pod 3018=pod
2893 3019
2894The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2895 3021
2896 cf::object 3022 cf::object
2897 contr pay_amount pay_player map x y force_find force_add 3023 contr pay_amount pay_player map x y force_find force_add destroy
2898 insert remove name archname title slaying race decrease_ob_nr 3024 insert remove name archname title slaying race decrease_ob_nr
2899 3025
2900 cf::object::player 3026 cf::object::player
2901 player 3027 player
2902 3028
2909=cut 3035=cut
2910 3036
2911for ( 3037for (
2912 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2913 insert remove inv name archname title slaying race 3039 insert remove inv name archname title slaying race
2914 decrease_ob_nr)], 3040 decrease_ob_nr destroy)],
2915 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2916 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2917 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2918) { 3044) {
2919 no strict 'refs'; 3045 no strict 'refs';
3024 { 3150 {
3025 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
3026 3152
3027 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
3028 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
3029 cf::face::set_visibility $idx, $info->{visibility}; 3156 cf::face::set_visibility $idx, $info->{visibility};
3030 cf::face::set_magicmap $idx, $info->{magicmap}; 3157 cf::face::set_magicmap $idx, $info->{magicmap};
3031 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3032 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3033 3160
3034 cf::cede_to_tick; 3161 cf::cede_to_tick;
3035 } 3162 }
3036 3163
3037 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
3038 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
3039 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
3040 or next; 3168 or next;
3169
3041 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
3042 cf::face::set_smooth $idx, $smooth; 3171 cf::face::set_smooth $idx, $smooth;
3043 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3044 } else { 3173 } else {
3045 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
3063 { 3192 {
3064 # TODO: for gcfclient pleasure, we should give resources 3193 # TODO: for gcfclient pleasure, we should give resources
3065 # that gcfclient doesn't grok a >10000 face index. 3194 # that gcfclient doesn't grok a >10000 face index.
3066 my $res = $facedata->{resource}; 3195 my $res = $facedata->{resource};
3067 3196
3068 my $soundconf = delete $res->{"res/sound.conf"};
3069
3070 while (my ($name, $info) = each %$res) { 3197 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) {
3071 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3072 my $data; 3200 my $data;
3073 3201
3074 if ($info->{type} & 1) { 3202 if ($info->{type} & 1) {
3075 # prepend meta info 3203 # prepend meta info
3076 3204
3077 my $meta = $enc->encode ({ 3205 my $meta = $enc->encode ({
3078 name => $name, 3206 name => $name,
3079 %{ $info->{meta} || {} }, 3207 %{ $info->{meta} || {} },
3080 }); 3208 });
3081 3209
3082 $data = pack "(w/a*)*", $meta, $info->{data}; 3210 $data = pack "(w/a*)*", $meta, $info->{data};
3211 } else {
3212 $data = $info->{data};
3213 }
3214
3215 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3216 cf::face::set_type $idx, $info->{type};
3083 } else { 3217 } else {
3084 $data = $info->{data}; 3218 $RESOURCE{$name} = $info;
3085 } 3219 }
3086 3220
3087 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3088 cf::face::set_type $idx, $info->{type};
3089
3090 cf::cede_to_tick; 3221 cf::cede_to_tick;
3091 } 3222 }
3092
3093 if ($soundconf) {
3094 $soundconf = $enc->decode (delete $soundconf->{data});
3095
3096 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3097 my $sound = $soundconf->{compat}[$_]
3098 or next;
3099
3100 my $face = cf::face::find "sound/$sound->[1]";
3101 cf::sound::set $sound->[0] => $face;
3102 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3103 }
3104
3105 while (my ($k, $v) = each %{$soundconf->{event}}) {
3106 my $face = cf::face::find "sound/$v";
3107 cf::sound::set $k => $face;
3108 }
3109 }
3110 } 3223 }
3224
3225 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3111 3226
3112 1 3227 1
3113} 3228}
3229
3230cf::global->attach (on_resource_update => sub {
3231 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3232 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3233
3234 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3235 my $sound = $soundconf->{compat}[$_]
3236 or next;
3237
3238 my $face = cf::face::find "sound/$sound->[1]";
3239 cf::sound::set $sound->[0] => $face;
3240 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3241 }
3242
3243 while (my ($k, $v) = each %{$soundconf->{event}}) {
3244 my $face = cf::face::find "sound/$v";
3245 cf::sound::set $k => $face;
3246 }
3247 }
3248});
3114 3249
3115register_exticmd fx_want => sub { 3250register_exticmd fx_want => sub {
3116 my ($ns, $want) = @_; 3251 my ($ns, $want) = @_;
3117 3252
3118 while (my ($k, $v) = each %$want) { 3253 while (my ($k, $v) = each %$want) {
3195 # we must not ever block the main coroutine 3330 # we must not ever block the main coroutine
3196 local $Coro::idle = sub { 3331 local $Coro::idle = sub {
3197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3332 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3198 (async { 3333 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3334 $Coro::current->{desc} = "IDLE BUG HANDLER";
3200 Event::one_event; 3335 EV::loop EV::LOOP_ONESHOT;
3201 })->prio (Coro::PRIO_MAX); 3336 })->prio (Coro::PRIO_MAX);
3202 }; 3337 };
3203 3338
3204 reload_config; 3339 reload_config;
3205 db_init; 3340 db_init;
3206 load_extensions; 3341 load_extensions;
3207 3342
3208 $TICK_WATCHER->start; 3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3209 Event::loop; 3345 EV::loop;
3210} 3346}
3211 3347
3212############################################################################# 3348#############################################################################
3213# initialisation and cleanup 3349# initialisation and cleanup
3214 3350
3215# install some emergency cleanup handlers 3351# install some emergency cleanup handlers
3216BEGIN { 3352BEGIN {
3353 our %SIGWATCHER = ();
3217 for my $signal (qw(INT HUP TERM)) { 3354 for my $signal (qw(INT HUP TERM)) {
3218 Event->signal ( 3355 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3219 reentrant => 0,
3220 data => WF_AUTOCANCEL,
3221 signal => $signal,
3222 prio => 0,
3223 cb => sub {
3224 cf::cleanup "SIG$signal"; 3356 cf::cleanup "SIG$signal";
3225 },
3226 ); 3357 };
3227 } 3358 }
3228} 3359}
3229 3360
3230sub write_runtime { 3361sub write_runtime {
3231 my $runtime = "$LOCALDIR/runtime"; 3362 my $runtime = "$LOCALDIR/runtime";
3276 # and maps saved/destroyed asynchronously. 3407 # and maps saved/destroyed asynchronously.
3277 warn "begin emergency player save\n"; 3408 warn "begin emergency player save\n";
3278 for my $login (keys %cf::PLAYER) { 3409 for my $login (keys %cf::PLAYER) {
3279 my $pl = $cf::PLAYER{$login} or next; 3410 my $pl = $cf::PLAYER{$login} or next;
3280 $pl->valid or next; 3411 $pl->valid or next;
3412 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3281 $pl->save; 3413 $pl->save;
3282 } 3414 }
3283 warn "end emergency player save\n"; 3415 warn "end emergency player save\n";
3284 3416
3285 warn "begin emergency map save\n"; 3417 warn "begin emergency map save\n";
3324 warn "syncing database to disk"; 3456 warn "syncing database to disk";
3325 BDB::db_env_txn_checkpoint $DB_ENV; 3457 BDB::db_env_txn_checkpoint $DB_ENV;
3326 3458
3327 # if anything goes wrong in here, we should simply crash as we already saved 3459 # if anything goes wrong in here, we should simply crash as we already saved
3328 3460
3329 warn "cancelling all WF_AUTOCANCEL watchers";
3330 for (Event::all_watchers) {
3331 $_->cancel if $_->data & WF_AUTOCANCEL;
3332 }
3333
3334 warn "flushing outstanding aio requests"; 3461 warn "flushing outstanding aio requests";
3335 for (;;) { 3462 for (;;) {
3336 BDB::flush; 3463 BDB::flush;
3337 IO::AIO::flush; 3464 IO::AIO::flush;
3338 Coro::cede; 3465 Coro::cede_notself;
3339 last unless IO::AIO::nreqs || BDB::nreqs; 3466 last unless IO::AIO::nreqs || BDB::nreqs;
3340 warn "iterate..."; 3467 warn "iterate...";
3341 } 3468 }
3342 3469
3343 ++$RELOAD; 3470 ++$RELOAD;
3432 3559
3433sub reload_perl() { 3560sub reload_perl() {
3434 # doing reload synchronously and two reloads happen back-to-back, 3561 # doing reload synchronously and two reloads happen back-to-back,
3435 # coro crashes during coro_state_free->destroy here. 3562 # coro crashes during coro_state_free->destroy here.
3436 3563
3437 $RELOAD_WATCHER ||= Event->timer ( 3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3438 reentrant => 0,
3439 after => 0,
3440 data => WF_AUTOCANCEL,
3441 cb => sub {
3442 do_reload_perl;
3443 undef $RELOAD_WATCHER; 3565 undef $RELOAD_WATCHER;
3444 }, 3566 do_reload_perl;
3445 ); 3567 };
3446} 3568}
3447 3569
3448register_command "reload" => sub { 3570register_command "reload" => sub {
3449 my ($who, $arg) = @_; 3571 my ($who, $arg) = @_;
3450 3572
3480 my $signal = new Coro::Signal; 3602 my $signal = new Coro::Signal;
3481 push @WAIT_FOR_TICK_BEGIN, $signal; 3603 push @WAIT_FOR_TICK_BEGIN, $signal;
3482 $signal->wait; 3604 $signal->wait;
3483} 3605}
3484 3606
3485$TICK_WATCHER = Event->timer ( 3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3486 reentrant => 0,
3487 parked => 1,
3488 prio => 0,
3489 at => $NEXT_TICK || $TICK,
3490 data => WF_AUTOCANCEL,
3491 cb => sub {
3492 if ($Coro::current != $Coro::main) { 3608 if ($Coro::current != $Coro::main) {
3493 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3609 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3494 unless ++$bug_warning > 10; 3610 unless ++$bug_warning > 10;
3495 return; 3611 return;
3496 } 3612 }
3497 3613
3498 $NOW = $tick_start = Event::time; 3614 $NOW = $tick_start = EV::now;
3499 3615
3500 cf::server_tick; # one server iteration 3616 cf::server_tick; # one server iteration
3501 3617
3502 $RUNTIME += $TICK; 3618 $RUNTIME += $TICK;
3503 $NEXT_TICK += $TICK; 3619 $NEXT_TICK = $_[0]->at;
3504 3620
3505 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3621 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3506 $NEXT_RUNTIME_WRITE = $NOW + 10; 3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3507 Coro::async_pool { 3623 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver"; 3624 $Coro::current->{desc} = "runtime saver";
3509 write_runtime 3625 write_runtime
3510 or warn "ERROR: unable to write runtime file: $!"; 3626 or warn "ERROR: unable to write runtime file: $!";
3511 };
3512 } 3627 };
3628 }
3513 3629
3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3515 $sig->send; 3631 $sig->send;
3516 } 3632 }
3517 while (my $sig = shift @WAIT_FOR_TICK) { 3633 while (my $sig = shift @WAIT_FOR_TICK) {
3518 $sig->send; 3634 $sig->send;
3519 } 3635 }
3520 3636
3521 $NOW = Event::time;
3522
3523 # if we are delayed by four ticks or more, skip them all
3524 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3525
3526 $TICK_WATCHER->at ($NEXT_TICK);
3527 $TICK_WATCHER->start;
3528
3529 $LOAD = ($NOW - $tick_start) / $TICK; 3637 $LOAD = ($NOW - $tick_start) / $TICK;
3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3531 3639
3532 _post_tick; 3640 _post_tick;
3533 }, 3641};
3534); 3642$TICK_WATCHER->priority (EV::MAXPRI);
3535 3643
3536{ 3644{
3645 # configure BDB
3646
3537 BDB::min_parallel 8; 3647 BDB::min_parallel 8;
3538 BDB::max_poll_time $TICK * 0.1; 3648 BDB::max_poll_reqs $TICK * 0.1;
3539 $BDB_POLL_WATCHER = Event->io ( 3649 $Coro::BDB::WATCHER->priority (1);
3540 reentrant => 0,
3541 fd => BDB::poll_fileno,
3542 poll => 'r',
3543 prio => 0,
3544 data => WF_AUTOCANCEL,
3545 cb => \&BDB::poll_cb,
3546 );
3547
3548 BDB::set_sync_prepare {
3549 my $status;
3550 my $current = $Coro::current;
3551 (
3552 sub {
3553 $status = $!;
3554 $current->ready; undef $current;
3555 },
3556 sub {
3557 Coro::schedule while defined $current;
3558 $! = $status;
3559 },
3560 )
3561 };
3562 3650
3563 unless ($DB_ENV) { 3651 unless ($DB_ENV) {
3564 $DB_ENV = BDB::db_env_create; 3652 $DB_ENV = BDB::db_env_create;
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1); 3654 | BDB::LOG_AUTOREMOVE, 1);
3581 3669
3582 cf::cleanup "db_env_open(db): $@" if $@; 3670 cf::cleanup "db_env_open(db): $@" if $@;
3583 }; 3671 };
3584 } 3672 }
3585 3673
3586 $BDB_DEADLOCK_WATCHER = Event->timer ( 3674 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3587 after => 3,
3588 interval => 1,
3589 hard => 1,
3590 prio => 0,
3591 data => WF_AUTOCANCEL,
3592 cb => sub {
3593 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3675 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3594 },
3595 ); 3676 };
3596 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3677 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3597 after => 11,
3598 interval => 60,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3678 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3604 },
3605 ); 3679 };
3606 $BDB_TRICKLE_WATCHER = Event->timer ( 3680 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3607 after => 5,
3608 interval => 10,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3681 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3614 },
3615 ); 3682 };
3616} 3683}
3617 3684
3618{ 3685{
3686 # configure IO::AIO
3687
3619 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3620
3621 undef $Coro::AIO::WATCHER;
3622 IO::AIO::max_poll_time $TICK * 0.1; 3689 IO::AIO::max_poll_time $TICK * 0.1;
3623 $AIO_POLL_WATCHER = Event->io ( 3690 $Coro::AIO::WATCHER->priority (1);
3624 reentrant => 0,
3625 data => WF_AUTOCANCEL,
3626 fd => IO::AIO::poll_fileno,
3627 poll => 'r',
3628 prio => 0,
3629 cb => \&IO::AIO::poll_cb,
3630 );
3631} 3691}
3632 3692
3633my $_log_backtrace; 3693my $_log_backtrace;
3634 3694
3635sub _log_backtrace { 3695sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines