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.372 by root, Sat Sep 15 13:25:33 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
… …
336 }; 334 };
337 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
338 $guard 336 $guard
339} 337}
340 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
352}
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>:
344This call blocks and returns only when you have at least C<$time> seconds 357This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede. 358of cpu time till the next tick. The slot is only valid till the next cede.
… …
354our @SLOT_QUEUE; 367our @SLOT_QUEUE;
355our $SLOT_QUEUE; 368our $SLOT_QUEUE;
356 369
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 370$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 371$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager");
373
359 my $signal = new Coro::Signal; 374 my $signal = new Coro::Signal;
360 375
361 while () { 376 while () {
362 next_job: 377 next_job:
363 my $avail = cf::till_tick; 378 my $avail = cf::till_tick;
… …
371 } 386 }
372 } 387 }
373 } 388 }
374 389
375 if (@SLOT_QUEUE) { 390 if (@SLOT_QUEUE) {
376 # 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
377 push @cf::WAIT_FOR_TICK, $signal; 392 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 393 $signal->wait;
379 } else { 394 } else {
380 Coro::schedule; 395 Coro::schedule;
381 } 396 }
… …
404 419
405BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
406 421
407=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
408 423
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 424The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 425is always able to handle events or runnable, as Deliantra is only
411partly 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
412acceptable. 427acceptable.
413 428
414If 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
415the given BLOCK in another coroutine while waiting for the result. The 430the given BLOCK in another coroutine while waiting for the result. The
… …
420 435
421sub sync_job(&) { 436sub sync_job(&) {
422 my ($job) = @_; 437 my ($job) = @_;
423 438
424 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 440 my $time = EV::time;
426 441
427 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
429 444
445 LOG llevError, Carp::longmess "sync job";#d#
446
430 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
431 # (but this is cancel-safe) 448 # (but this is cancel-safe)
432 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
433 450
434 my $busy = 1; 451 my $busy = 1;
435 my @res; 452 my @res;
436 453
437 (async { 454 (async {
455 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 456 @res = eval { $job->() };
439 warn $@ if $@; 457 warn $@ if $@;
440 undef $busy; 458 undef $busy;
441 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
442 460
443 while ($busy) { 461 while ($busy) {
444 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
445 } 466 }
467 }
446 468
447 $time = Event::time - $time; 469 $time = EV::time - $time;
448 470
449 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451 473
452 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
… …
482=item fork_call { }, $args 504=item fork_call { }, $args
483 505
484Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
488 510
489=cut 511=cut
490 512
491sub fork_call(&@) { 513sub fork_call(&@) {
492 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
… …
653attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
655 677
656In 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>
657C<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
658Crossfire TRT). 680Deliantra).
659 681
660=over 4 682=over 4
661 683
662=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
663 685
… …
961 983
962=cut 984=cut
963 985
964############################################################################# 986#############################################################################
965# object support 987# object support
966#
967 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#
968sub _can_merge { 1022sub _can_merge {
969 my ($ob1, $ob2) = @_; 1023 my ($ob1, $ob2) = @_;
970 1024
971 local $Storable::canonical = 1; 1025 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1026
975 $fob1 eq $fob2 1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
976} 1029}
977 1030
978sub reattach { 1031sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1033 my ($obj) = @_;
… …
1002cf::attachable->attach ( 1055cf::attachable->attach (
1003 prio => -1000000, 1056 prio => -1000000,
1004 on_instantiate => sub { 1057 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1058 my ($obj, $data) = @_;
1006 1059
1007 $data = from_json $data; 1060 $data = decode_json $data;
1008 1061
1009 for (@$data) { 1062 for (@$data) {
1010 my ($name, $args) = @$_; 1063 my ($name, $args) = @$_;
1011 1064
1012 $obj->attach ($name, %{$args || {} }); 1065 $obj->attach ($name, %{$args || {} });
… …
1025 }, 1078 },
1026); 1079);
1027 1080
1028sub object_freezer_save { 1081sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1082 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1083
1033 sync_job { 1084 sync_job {
1034 if (length $$rdata) { 1085 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1086 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1087 warn sprintf "saving %s (%d,%d)\n",
… …
1043 close $fh; 1094 close $fh;
1044 1095
1045 if (@$objs) { 1096 if (@$objs) {
1046 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) {
1047 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
1051 close $fh; 1102 close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1104 }
… …
1062 } else { 1113 } else {
1063 aio_unlink $filename; 1114 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1115 aio_unlink "$filename.pst";
1065 } 1116 }
1066 }; 1117 };
1067
1068 undef $guard;
1069} 1118}
1070 1119
1071sub object_freezer_as_string { 1120sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1121 my ($rdata, $objs) = @_;
1073 1122
… …
1078 1127
1079sub object_thawer_load { 1128sub object_thawer_load {
1080 my ($filename) = @_; 1129 my ($filename) = @_;
1081 1130
1082 my ($data, $av); 1131 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1132
1086 (aio_load $filename, $data) >= 0 1133 (aio_load $filename, $data) >= 0
1087 or return; 1134 or return;
1088 1135
1089 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1138 or return;
1092 1139
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1140 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs};
1095 } 1142 }
1096 1143
1097 utf8::decode (my $decname = $filename); 1144 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1146 $decname, length $data, scalar @{$av || []};
… …
1514 1561
1515Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1516 1563
1517=cut 1564=cut
1518 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
1519sub expand_cfpod { 1577sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1521 1579
1522 # escape & and < 1580 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1581
1526 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1527 1585
1528 1 while 1586 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1591 ([BCGHITU])
1534 # replace G<male|female> tags 1592 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1593 (?:
1536 $self->gender ? $2 : $1 1594 ([^<>]*) (?{ $group = $^N })
1537 }ge 1595 | < $interior >
1538 # replace H<hint text> 1596 )
1539 || s{H<([^\>]*)>} 1597 >
1598 %gcsx
1540 { 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") {
1541 ("<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>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1619 "")
1544 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1546 1631
1632 for ($xml) {
1547 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1549 1635
1550 # compress some whitespace 1636 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1555 1642
1556 $_ 1643 $xml
1557} 1644}
1645
1646no re 'eval';
1558 1647
1559sub hintmode { 1648sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1650 $_[0]{hintmode}
1562} 1651}
… …
2043 } 2132 }
2044 2133
2045 $MAP_PREFETCH{$path} |= $load; 2134 $MAP_PREFETCH{$path} |= $load;
2046 2135
2047 $MAP_PREFETCHER ||= cf::async { 2136 $MAP_PREFETCHER ||= cf::async {
2137 $Coro::current->{desc} = "map prefetcher";
2138
2048 while (%MAP_PREFETCH) { 2139 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2140 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2141 if (my $map = find $k) {
2051 $map->load if $v; 2142 $map->load if $v;
2052 } 2143 }
… …
2078 return if $self->{deny_save}; 2169 return if $self->{deny_save};
2079 2170
2080 local $self->{last_access} = $self->last_access;#d# 2171 local $self->{last_access} = $self->last_access;#d#
2081 2172
2082 cf::async { 2173 cf::async {
2174 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2175 $_->contr->save for $self->players;
2084 }; 2176 };
2085 2177
2086 if ($uniq) { 2178 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2366=cut
2275 2367
2276sub deref { 2368sub deref {
2277 my ($ref) = @_; 2369 my ($ref) = @_;
2278 2370
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2371 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2372 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2373 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2374 or return;
2286 $pl->ob->uuid eq $uuid 2375 $pl->ob->uuid eq $uuid
2287 or return; 2376 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2548
2460 $self->enter_link; 2549 $self->enter_link;
2461 2550
2462 (async { 2551 (async {
2552 $Coro::current->{desc} = "player::goto $path $x $y";
2553
2463 # *tag paths override both path and x|y 2554 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2555 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2556 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2557 my $ob = $obs[rand @obs];
2467 2558
… …
2547 $rmp->{origin_y} = $exit->y; 2638 $rmp->{origin_y} = $exit->y;
2548 } 2639 }
2549 2640
2550 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2551 2642
2552 my $data = cf::to_json $rmp; 2643 my $data = cf::encode_json $rmp;
2553 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2555 2646
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
… …
2584 # if exit is damned, update players death & WoR home-position 2675 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp) 2676 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED); 2677 if $exit->flag (FLAG_DAMNED);
2587 2678
2588 (async { 2679 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2681
2589 $self->deactivate_recursive; # just to be sure 2682 $self->deactivate_recursive; # just to be sure
2590 unless (eval { 2683 unless (eval {
2591 $self->goto ($slaying, $hp, $sp); 2684 $self->goto ($slaying, $hp, $sp);
2592 2685
2593 1; 2686 1;
… …
2628the 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
2629the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2630 2723
2631=cut 2724=cut
2632 2725
2726# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2727our %CHANNEL = (
2634 "c/identify" => { 2728 "c/identify" => {
2635 id => "identify", 2729 id => "infobox",
2636 title => "Identify", 2730 title => "Identify",
2637 reply => undef, 2731 reply => undef,
2638 tooltip => "Items recently identified", 2732 tooltip => "Items recently identified",
2639 }, 2733 },
2640 "c/examine" => { 2734 "c/examine" => {
2641 id => "examine", 2735 id => "infobox",
2642 title => "Examine", 2736 title => "Examine",
2643 reply => undef, 2737 reply => undef,
2644 tooltip => "Signs and other items you examined", 2738 tooltip => "Signs and other items you examined",
2645 }, 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 },
2646); 2776);
2647 2777
2648sub cf::client::send_msg { 2778sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2780
2651 $msg = $self->pl->expand_cfpod ($msg); 2781 $msg = $self->pl->expand_cfpod ($msg);
2652 2782
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2783 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2784
2655 # check predefined channels, for the benefit of C 2785 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2786 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel};
2657 2788
2789 $self->ext_msg (channel_info => $channel)
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id};
2793
2658 if (ref $channel) { 2794 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2795 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2796 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2797 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2798 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg; 2799 if $self->can_msg;
… …
2880=pod 3016=pod
2881 3017
2882The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2883 3019
2884 cf::object 3020 cf::object
2885 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
2886 insert remove name archname title slaying race decrease_ob_nr 3022 insert remove name archname title slaying race decrease_ob_nr
2887 3023
2888 cf::object::player 3024 cf::object::player
2889 player 3025 player
2890 3026
… …
2897=cut 3033=cut
2898 3034
2899for ( 3035for (
2900 ["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
2901 insert remove inv name archname title slaying race 3037 insert remove inv name archname title slaying race
2902 decrease_ob_nr)], 3038 decrease_ob_nr destroy)],
2903 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2905 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2906) { 3042) {
2907 no strict 'refs'; 3043 no strict 'refs';
… …
3182sub main { 3318sub main {
3183 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
3185 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#
3186 (async { 3322 (async {
3187 Event::one_event; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
3189 }; 3326 };
3190 3327
3191 reload_config; 3328 reload_config;
3192 db_init; 3329 db_init;
3193 load_extensions; 3330 load_extensions;
3194 3331
3195 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3196 Event::loop; 3334 EV::loop;
3197} 3335}
3198 3336
3199############################################################################# 3337#############################################################################
3200# initialisation and cleanup 3338# initialisation and cleanup
3201 3339
3202# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
3203BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 signal => $signal,
3209 prio => 0,
3210 cb => sub {
3211 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
3212 },
3213 ); 3346 };
3214 } 3347 }
3215} 3348}
3216 3349
3217sub write_runtime { 3350sub write_runtime {
3218 my $runtime = "$LOCALDIR/runtime"; 3351 my $runtime = "$LOCALDIR/runtime";
… …
3263 # and maps saved/destroyed asynchronously. 3396 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3397 warn "begin emergency player save\n";
3265 for my $login (keys %cf::PLAYER) { 3398 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3399 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3400 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3402 $pl->save;
3269 } 3403 }
3270 warn "end emergency player save\n"; 3404 warn "end emergency player save\n";
3271 3405
3272 warn "begin emergency map save\n"; 3406 warn "begin emergency map save\n";
… …
3311 warn "syncing database to disk"; 3445 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
3313 3447
3314 # 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
3315 3449
3316 warn "cancelling all WF_AUTOCANCEL watchers";
3317 for (Event::all_watchers) {
3318 $_->cancel if $_->data & WF_AUTOCANCEL;
3319 }
3320
3321 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
3322 for (;;) { 3451 for (;;) {
3323 BDB::flush; 3452 BDB::flush;
3324 IO::AIO::flush; 3453 IO::AIO::flush;
3325 Coro::cede; 3454 Coro::cede_notself;
3326 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
3327 warn "iterate..."; 3456 warn "iterate...";
3328 } 3457 }
3329 3458
3330 ++$RELOAD; 3459 ++$RELOAD;
… …
3419 3548
3420sub reload_perl() { 3549sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
3423 3552
3424 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3425 reentrant => 0,
3426 after => 0,
3427 data => WF_AUTOCANCEL,
3428 cb => sub {
3429 do_reload_perl;
3430 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
3431 }, 3555 do_reload_perl;
3432 ); 3556 };
3433} 3557}
3434 3558
3435register_command "reload" => sub { 3559register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
3437 3561
3438 if ($who->flag (FLAG_WIZ)) { 3562 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3563 $who->message ("reloading server.");
3564 async {
3565 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3566 reload_perl;
3567 };
3441 } 3568 }
3442}; 3569};
3443 3570
3444unshift @INC, $LIBDIR; 3571unshift @INC, $LIBDIR;
3445 3572
… …
3464 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3593 $signal->wait;
3467} 3594}
3468 3595
3469$TICK_WATCHER = Event->timer ( 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3470 reentrant => 0,
3471 parked => 1,
3472 prio => 0,
3473 at => $NEXT_TICK || $TICK,
3474 data => WF_AUTOCANCEL,
3475 cb => sub {
3476 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
3477 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"
3478 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
3479 return; 3600 return;
3480 } 3601 }
3481 3602
3482 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
3483 3604
3484 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
3485 3606
3486 $RUNTIME += $TICK; 3607 $RUNTIME += $TICK;
3487 $NEXT_TICK += $TICK; 3608 $NEXT_TICK += $TICK;
3488 3609
3489 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3490 $NEXT_RUNTIME_WRITE = $NOW + 10; 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
3491 Coro::async_pool { 3612 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver";
3492 write_runtime 3614 write_runtime
3493 or warn "ERROR: unable to write runtime file: $!"; 3615 or warn "ERROR: unable to write runtime file: $!";
3494 };
3495 } 3616 };
3617 }
3496 3618
3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3498 $sig->send; 3620 $sig->send;
3499 } 3621 }
3500 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
3501 $sig->send; 3623 $sig->send;
3502 } 3624 }
3503 3625
3504 $NOW = Event::time;
3505
3506 # if we are delayed by four ticks or more, skip them all
3507 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3508
3509 $TICK_WATCHER->at ($NEXT_TICK);
3510 $TICK_WATCHER->start;
3511
3512 $LOAD = ($NOW - $tick_start) / $TICK; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3514 3628
3515 _post_tick; 3629 _post_tick;
3516 }, 3630};
3517); 3631$TICK_WATCHER->priority (EV::MAXPRI);
3518 3632
3519{ 3633{
3520 BDB::min_parallel 8; 3634 BDB::min_parallel 8;
3521 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
3522 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3523 reentrant => 0,
3524 fd => BDB::poll_fileno,
3525 poll => 'r',
3526 prio => 0,
3527 data => WF_AUTOCANCEL,
3528 cb => \&BDB::poll_cb,
3529 );
3530 3637
3531 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3532 my $status; 3639 my $status;
3533 my $current = $Coro::current; 3640 my $current = $Coro::current;
3534 ( 3641 (
… …
3564 3671
3565 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3566 }; 3673 };
3567 } 3674 }
3568 3675
3569 $BDB_DEADLOCK_WATCHER = Event->timer ( 3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3570 after => 3,
3571 interval => 1,
3572 hard => 1,
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 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 { };
3577 },
3578 ); 3678 };
3579 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3580 after => 11,
3581 interval => 60,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3587 },
3588 ); 3681 };
3589 $BDB_TRICKLE_WATCHER = Event->timer ( 3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3590 after => 5,
3591 interval => 10,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3597 },
3598 ); 3684 };
3599} 3685}
3600 3686
3601{ 3687{
3602 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3603 3689
3604 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3605 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3606 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3607 reentrant => 0,
3608 data => WF_AUTOCANCEL,
3609 fd => IO::AIO::poll_fileno,
3610 poll => 'r',
3611 prio => 6,
3612 cb => \&IO::AIO::poll_cb,
3613 );
3614} 3693}
3615 3694
3616my $_log_backtrace; 3695my $_log_backtrace;
3617 3696
3618sub _log_backtrace { 3697sub _log_backtrace {
… …
3622 3701
3623 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3624 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3625 ++$_log_backtrace; 3704 ++$_log_backtrace;
3626 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3627 my @bt = fork_call { 3708 my @bt = fork_call {
3628 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3629 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3630 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3711 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3631 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

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