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.371 by root, Thu Sep 13 16:16:01 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
336 }; 336 };
337 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
338 $guard 338 $guard
339} 339}
340 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
354}
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>:
344This call blocks and returns only when you have at least C<$time> seconds 359This 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. 360of cpu time till the next tick. The slot is only valid till the next cede.
354our @SLOT_QUEUE; 369our @SLOT_QUEUE;
355our $SLOT_QUEUE; 370our $SLOT_QUEUE;
356 371
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 372$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 373$SLOT_QUEUE = Coro::async {
374 $Coro::current->desc ("timeslot manager");
375
359 my $signal = new Coro::Signal; 376 my $signal = new Coro::Signal;
360 377
361 while () { 378 while () {
362 next_job: 379 next_job:
363 my $avail = cf::till_tick; 380 my $avail = cf::till_tick;
371 } 388 }
372 } 389 }
373 } 390 }
374 391
375 if (@SLOT_QUEUE) { 392 if (@SLOT_QUEUE) {
376 # 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
377 push @cf::WAIT_FOR_TICK, $signal; 394 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 395 $signal->wait;
379 } else { 396 } else {
380 Coro::schedule; 397 Coro::schedule;
381 } 398 }
404 421
405BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
406 423
407=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
408 425
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 426The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 427is 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 428partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 429acceptable.
413 430
414If 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
415the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
420 437
421sub sync_job(&) { 438sub sync_job(&) {
422 my ($job) = @_; 439 my ($job) = @_;
423 440
424 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 442 my $time = EV::time;
426 443
427 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
429 446
447 LOG llevError, Carp::longmess "sync job";#d#
448
430 # TODO: use suspend/resume instead 449 # TODO: use suspend/resume instead
431 # (but this is cancel-safe) 450 # (but this is cancel-safe)
432 my $freeze_guard = freeze_mainloop; 451 my $freeze_guard = freeze_mainloop;
433 452
434 my $busy = 1; 453 my $busy = 1;
435 my @res; 454 my @res;
436 455
437 (async { 456 (async {
457 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 458 @res = eval { $job->() };
439 warn $@ if $@; 459 warn $@ if $@;
440 undef $busy; 460 undef $busy;
441 })->prio (Coro::PRIO_MAX); 461 })->prio (Coro::PRIO_MAX);
442 462
443 while ($busy) { 463 while ($busy) {
444 Coro::cede or Event::one_event; 464 if (Coro::nready) {
465 Coro::cede_notself;
466 } else {
467 EV::loop EV::LOOP_ONESHOT;
445 } 468 }
469 }
446 470
447 $time = Event::time - $time; 471 $time = EV::time - $time;
448 472
449 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451 475
452 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
482=item fork_call { }, $args 506=item fork_call { }, $args
483 507
484Executes the given code block with the given arguments in a seperate 508Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 509process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 510Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 511never block itself or use any form of event handling.
488 512
489=cut 513=cut
490 514
491sub fork_call(&@) { 515sub fork_call(&@) {
492 my ($cb, @args) = @_; 516 my ($cb, @args) = @_;
653attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
655 679
656In 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>
657C<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
658Crossfire TRT). 682Deliantra).
659 683
660=over 4 684=over 4
661 685
662=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
663 687
945 } 969 }
946 970
947 0 971 0
948} 972}
949 973
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 974=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 975
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 977
954Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
955 979
961 985
962=cut 986=cut
963 987
964############################################################################# 988#############################################################################
965# object support 989# object support
966#
967 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#
968sub _can_merge { 1024sub _can_merge {
969 my ($ob1, $ob2) = @_; 1025 my ($ob1, $ob2) = @_;
970 1026
971 local $Storable::canonical = 1; 1027 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1028
975 $fob1 eq $fob2 1029 # we do the slow way here
1030 return _object_equal $ob1, $ob2
976} 1031}
977 1032
978sub reattach { 1033sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1035 my ($obj) = @_;
1002cf::attachable->attach ( 1057cf::attachable->attach (
1003 prio => -1000000, 1058 prio => -1000000,
1004 on_instantiate => sub { 1059 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
1006 1061
1007 $data = from_json $data; 1062 $data = decode_json $data;
1008 1063
1009 for (@$data) { 1064 for (@$data) {
1010 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
1011 1066
1012 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
1025 }, 1080 },
1026); 1081);
1027 1082
1028sub object_freezer_save { 1083sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1084 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1085
1033 sync_job { 1086 sync_job {
1034 if (length $$rdata) { 1087 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1088 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1089 warn sprintf "saving %s (%d,%d)\n",
1043 close $fh; 1096 close $fh;
1044 1097
1045 if (@$objs) { 1098 if (@$objs) {
1046 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) {
1047 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
1051 close $fh; 1104 close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1106 }
1062 } else { 1115 } else {
1063 aio_unlink $filename; 1116 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1117 aio_unlink "$filename.pst";
1065 } 1118 }
1066 }; 1119 };
1067
1068 undef $guard;
1069} 1120}
1070 1121
1071sub object_freezer_as_string { 1122sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1123 my ($rdata, $objs) = @_;
1073 1124
1078 1129
1079sub object_thawer_load { 1130sub object_thawer_load {
1080 my ($filename) = @_; 1131 my ($filename) = @_;
1081 1132
1082 my ($data, $av); 1133 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1134
1086 (aio_load $filename, $data) >= 0 1135 (aio_load $filename, $data) >= 0
1087 or return; 1136 or return;
1088 1137
1089 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1140 or return;
1092 1141
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
1095 } 1144 }
1096 1145
1097 utf8::decode (my $decname = $filename); 1146 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1148 $decname, length $data, scalar @{$av || []};
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1402 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1403
1355 my $f = new_from_file cf::object::thawer path $login 1404 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1405 or return;
1357 1406
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1407 my $pl = cf::player::load_pl $f
1360 or return; 1408 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1409 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1410 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1411 $cf::PLAYER{$login} = $pl
1515 1563
1516Expand crossfire pod fragments into protocol xml. 1564Expand crossfire pod fragments into protocol xml.
1517 1565
1518=cut 1566=cut
1519 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
1520sub expand_cfpod { 1579sub expand_cfpod {
1521 ((my $self), (local $_)) = @_; 1580 my ($self, $pod) = @_;
1522 1581
1523 # escape & and < 1582 my $xml;
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526 1583
1527 # this is buggy, it needs to properly take care of nested <'s 1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1528 1587
1529 1 while 1588 $group =~ s/&/&amp;/g;
1530 # replace B<>, I<>, U<> etc. 1589 $group =~ s/</&lt;/g;
1531 s/B<([^\>]*)>/<b>$1<\/b>/ 1590
1532 || s/I<([^\>]*)>/<i>$1<\/i>/ 1591 $xml .= $group;
1533 || s/U<([^\>]*)>/<u>$1<\/u>/ 1592 } elsif ($pod =~ m%\G
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1593 ([BCGHITU])
1535 # replace G<male|female> tags 1594 <
1536 || s{G<([^>|]*)\|([^>]*)>}{ 1595 (?:
1537 $self->gender ? $2 : $1 1596 ([^<>]*) (?{ $group = $^N })
1538 }ge 1597 | < $interior >
1539 # replace H<hint text> 1598 )
1540 || s{H<([^\>]*)>} 1599 >
1600 %gcsx
1541 { 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") {
1542 ("<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>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "") 1621 "")
1545 [$self->{hintmode}] 1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1546 }ge; 1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1547 1633
1634 for ($xml) {
1548 # create single paragraphs (very hackish) 1635 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g; 1636 s/(?<=\S)\n(?=\w)/ /g;
1550 1637
1551 # compress some whitespace 1638 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends 1639 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines 1640 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines 1641 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines 1642 s/\n+$//; # ending lines
1643 }
1556 1644
1557 $_ 1645 $xml
1558} 1646}
1647
1648no re 'eval';
1559 1649
1560sub hintmode { 1650sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1; 1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode} 1652 $_[0]{hintmode}
1563} 1653}
2044 } 2134 }
2045 2135
2046 $MAP_PREFETCH{$path} |= $load; 2136 $MAP_PREFETCH{$path} |= $load;
2047 2137
2048 $MAP_PREFETCHER ||= cf::async { 2138 $MAP_PREFETCHER ||= cf::async {
2139 $Coro::current->{desc} = "map prefetcher";
2140
2049 while (%MAP_PREFETCH) { 2141 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2142 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2143 if (my $map = find $k) {
2052 $map->load if $v; 2144 $map->load if $v;
2053 } 2145 }
2079 return if $self->{deny_save}; 2171 return if $self->{deny_save};
2080 2172
2081 local $self->{last_access} = $self->last_access;#d# 2173 local $self->{last_access} = $self->last_access;#d#
2082 2174
2083 cf::async { 2175 cf::async {
2176 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2177 $_->contr->save for $self->players;
2085 }; 2178 };
2086 2179
2087 if ($uniq) { 2180 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2275=cut 2368=cut
2276 2369
2277sub deref { 2370sub deref {
2278 my ($ref) = @_; 2371 my ($ref) = @_;
2279 2372
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2373 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2374 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2375 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2376 or return;
2287 $pl->ob->uuid eq $uuid 2377 $pl->ob->uuid eq $uuid
2288 or return; 2378 or return;
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2550
2461 $self->enter_link; 2551 $self->enter_link;
2462 2552
2463 (async { 2553 (async {
2554 $Coro::current->{desc} = "player::goto $path $x $y";
2555
2464 # *tag paths override both path and x|y 2556 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2557 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2558 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2559 my $ob = $obs[rand @obs];
2468 2560
2548 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2549 } 2641 }
2550 2642
2551 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2552 2644
2553 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2554 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2556 2648
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
2585 # if exit is damned, update players death & WoR home-position 2677 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp) 2678 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED); 2679 if $exit->flag (FLAG_DAMNED);
2588 2680
2589 (async { 2681 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2683
2590 $self->deactivate_recursive; # just to be sure 2684 $self->deactivate_recursive; # just to be sure
2591 unless (eval { 2685 unless (eval {
2592 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($slaying, $hp, $sp);
2593 2687
2594 1; 2688 1;
2629the 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
2630the message unless the client supports the msg packet. 2724the message unless the client supports the msg packet.
2631 2725
2632=cut 2726=cut
2633 2727
2728# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2729our %CHANNEL = (
2635 "c/identify" => { 2730 "c/identify" => {
2636 id => "identify", 2731 id => "infobox",
2637 title => "Identify", 2732 title => "Identify",
2638 reply => undef, 2733 reply => undef,
2639 tooltip => "Items recently identified", 2734 tooltip => "Items recently identified",
2640 }, 2735 },
2641 "c/examine" => { 2736 "c/examine" => {
2642 id => "examine", 2737 id => "infobox",
2643 title => "Examine", 2738 title => "Examine",
2644 reply => undef, 2739 reply => undef,
2645 tooltip => "Signs and other items you examined", 2740 tooltip => "Signs and other items you examined",
2646 }, 2741 },
2742 "c/book" => {
2743 id => "infobox",
2744 title => "Book",
2745 reply => undef,
2746 tooltip => "The contents of a note or book",
2747 },
2748 "c/lookat" => {
2749 id => "infobox",
2750 title => "Look",
2751 reply => undef,
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",
2777 },
2647); 2778);
2648 2779
2649sub cf::client::send_msg { 2780sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
2651 2782
2652 $msg = $self->pl->expand_cfpod ($msg); 2783 $msg = $self->pl->expand_cfpod ($msg);
2653 2784
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 2785 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 2786
2656 # check predefined channels, for the benefit of C 2787 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2788 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel};
2658 2790
2791 $self->ext_msg (channel_info => $channel)
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id};
2795
2659 if (ref $channel) { 2796 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 2797 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 2798 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 2799 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 2800 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg; 2801 if $self->can_msg;
2881=pod 3018=pod
2882 3019
2883The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2884 3021
2885 cf::object 3022 cf::object
2886 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
2887 insert remove name archname title slaying race decrease_ob_nr 3024 insert remove name archname title slaying race decrease_ob_nr
2888 3025
2889 cf::object::player 3026 cf::object::player
2890 player 3027 player
2891 3028
2898=cut 3035=cut
2899 3036
2900for ( 3037for (
2901 ["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
2902 insert remove inv name archname title slaying race 3039 insert remove inv name archname title slaying race
2903 decrease_ob_nr)], 3040 decrease_ob_nr destroy)],
2904 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2906 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2907) { 3044) {
2908 no strict 'refs'; 3045 no strict 'refs';
3013 { 3150 {
3014 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
3015 3152
3016 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
3017 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
3018 cf::face::set_visibility $idx, $info->{visibility}; 3156 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap}; 3157 cf::face::set_magicmap $idx, $info->{magicmap};
3020 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};
3021 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};
3022 3160
3023 cf::cede_to_tick; 3161 cf::cede_to_tick;
3024 } 3162 }
3025 3163
3026 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
3027 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
3028 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
3029 or next; 3168 or next;
3169
3030 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth; 3171 cf::face::set_smooth $idx, $smooth;
3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3033 } else { 3173 } else {
3034 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
3052 { 3192 {
3053 # TODO: for gcfclient pleasure, we should give resources 3193 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index. 3194 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource}; 3195 my $res = $facedata->{resource};
3056 3196
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) { 3197 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data; 3200 my $data;
3062 3201
3063 if ($info->{type} & 1) { 3202 if ($info->{type} & 1) {
3064 # prepend meta info 3203 # prepend meta info
3065 3204
3066 my $meta = $enc->encode ({ 3205 my $meta = $enc->encode ({
3067 name => $name, 3206 name => $name,
3068 %{ $info->{meta} || {} }, 3207 %{ $info->{meta} || {} },
3069 }); 3208 });
3070 3209
3071 $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};
3072 } else { 3217 } else {
3073 $data = $info->{data}; 3218 $RESOURCE{$name} = $info;
3074 } 3219 }
3075 3220
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick; 3221 cf::cede_to_tick;
3080 } 3222 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 } 3223 }
3224
3225 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3100 3226
3101 1 3227 1
3102} 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});
3103 3249
3104register_exticmd fx_want => sub { 3250register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_; 3251 my ($ns, $want) = @_;
3106 3252
3107 while (my ($k, $v) = each %$want) { 3253 while (my ($k, $v) = each %$want) {
3183sub main { 3329sub main {
3184 # we must not ever block the main coroutine 3330 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3331 local $Coro::idle = sub {
3186 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#
3187 (async { 3333 (async {
3188 Event::one_event; 3334 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3336 })->prio (Coro::PRIO_MAX);
3190 }; 3337 };
3191 3338
3192 reload_config; 3339 reload_config;
3193 db_init; 3340 db_init;
3194 load_extensions; 3341 load_extensions;
3195 3342
3196 $TICK_WATCHER->start; 3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3197 Event::loop; 3345 EV::loop;
3198} 3346}
3199 3347
3200############################################################################# 3348#############################################################################
3201# initialisation and cleanup 3349# initialisation and cleanup
3202 3350
3203# install some emergency cleanup handlers 3351# install some emergency cleanup handlers
3204BEGIN { 3352BEGIN {
3353 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3354 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3355 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 signal => $signal,
3210 prio => 0,
3211 cb => sub {
3212 cf::cleanup "SIG$signal"; 3356 cf::cleanup "SIG$signal";
3213 },
3214 ); 3357 };
3215 } 3358 }
3216} 3359}
3217 3360
3218sub write_runtime { 3361sub write_runtime {
3219 my $runtime = "$LOCALDIR/runtime"; 3362 my $runtime = "$LOCALDIR/runtime";
3264 # and maps saved/destroyed asynchronously. 3407 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3408 warn "begin emergency player save\n";
3266 for my $login (keys %cf::PLAYER) { 3409 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3410 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3411 $pl->valid or next;
3412 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3413 $pl->save;
3270 } 3414 }
3271 warn "end emergency player save\n"; 3415 warn "end emergency player save\n";
3272 3416
3273 warn "begin emergency map save\n"; 3417 warn "begin emergency map save\n";
3312 warn "syncing database to disk"; 3456 warn "syncing database to disk";
3313 BDB::db_env_txn_checkpoint $DB_ENV; 3457 BDB::db_env_txn_checkpoint $DB_ENV;
3314 3458
3315 # 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
3316 3460
3317 warn "cancelling all WF_AUTOCANCEL watchers";
3318 for (Event::all_watchers) {
3319 $_->cancel if $_->data & WF_AUTOCANCEL;
3320 }
3321
3322 warn "flushing outstanding aio requests"; 3461 warn "flushing outstanding aio requests";
3323 for (;;) { 3462 for (;;) {
3324 BDB::flush; 3463 BDB::flush;
3325 IO::AIO::flush; 3464 IO::AIO::flush;
3326 Coro::cede; 3465 Coro::cede_notself;
3327 last unless IO::AIO::nreqs || BDB::nreqs; 3466 last unless IO::AIO::nreqs || BDB::nreqs;
3328 warn "iterate..."; 3467 warn "iterate...";
3329 } 3468 }
3330 3469
3331 ++$RELOAD; 3470 ++$RELOAD;
3420 3559
3421sub reload_perl() { 3560sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 3561 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 3562 # coro crashes during coro_state_free->destroy here.
3424 3563
3425 $RELOAD_WATCHER ||= Event->timer ( 3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3426 reentrant => 0,
3427 after => 0,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 do_reload_perl;
3431 undef $RELOAD_WATCHER; 3565 undef $RELOAD_WATCHER;
3432 }, 3566 do_reload_perl;
3433 ); 3567 };
3434} 3568}
3435 3569
3436register_command "reload" => sub { 3570register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3571 my ($who, $arg) = @_;
3438 3572
3439 if ($who->flag (FLAG_WIZ)) { 3573 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3574 $who->message ("reloading server.");
3575 async {
3576 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3577 reload_perl;
3578 };
3442 } 3579 }
3443}; 3580};
3444 3581
3445unshift @INC, $LIBDIR; 3582unshift @INC, $LIBDIR;
3446 3583
3465 my $signal = new Coro::Signal; 3602 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 3603 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 3604 $signal->wait;
3468} 3605}
3469 3606
3470$TICK_WATCHER = Event->timer ( 3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3471 reentrant => 0,
3472 parked => 1,
3473 prio => 0,
3474 at => $NEXT_TICK || $TICK,
3475 data => WF_AUTOCANCEL,
3476 cb => sub {
3477 if ($Coro::current != $Coro::main) { 3608 if ($Coro::current != $Coro::main) {
3478 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"
3479 unless ++$bug_warning > 10; 3610 unless ++$bug_warning > 10;
3480 return; 3611 return;
3481 } 3612 }
3482 3613
3483 $NOW = $tick_start = Event::time; 3614 $NOW = $tick_start = EV::now;
3484 3615
3485 cf::server_tick; # one server iteration 3616 cf::server_tick; # one server iteration
3486 3617
3487 $RUNTIME += $TICK; 3618 $RUNTIME += $TICK;
3488 $NEXT_TICK += $TICK; 3619 $NEXT_TICK = $_[0]->at;
3489 3620
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3621 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3623 Coro::async_pool {
3624 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3625 write_runtime
3494 or warn "ERROR: unable to write runtime file: $!"; 3626 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3627 };
3628 }
3497 3629
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3631 $sig->send;
3500 } 3632 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3633 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3634 $sig->send;
3503 } 3635 }
3504 3636
3505 $NOW = Event::time;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK; 3637 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3639
3516 _post_tick; 3640 _post_tick;
3517 }, 3641};
3518); 3642$TICK_WATCHER->priority (EV::MAXPRI);
3519 3643
3520{ 3644{
3645 # configure BDB
3646
3521 BDB::min_parallel 8; 3647 BDB::min_parallel 8;
3522 BDB::max_poll_time $TICK * 0.1; 3648 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 3649 $Coro::BDB::WATCHER->priority (1);
3524 reentrant => 0,
3525 fd => BDB::poll_fileno,
3526 poll => 'r',
3527 prio => 0,
3528 data => WF_AUTOCANCEL,
3529 cb => \&BDB::poll_cb,
3530 );
3531
3532 BDB::set_sync_prepare {
3533 my $status;
3534 my $current = $Coro::current;
3535 (
3536 sub {
3537 $status = $!;
3538 $current->ready; undef $current;
3539 },
3540 sub {
3541 Coro::schedule while defined $current;
3542 $! = $status;
3543 },
3544 )
3545 };
3546 3650
3547 unless ($DB_ENV) { 3651 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 3652 $DB_ENV = BDB::db_env_create;
3549 $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
3550 | BDB::LOG_AUTOREMOVE, 1); 3654 | BDB::LOG_AUTOREMOVE, 1);
3565 3669
3566 cf::cleanup "db_env_open(db): $@" if $@; 3670 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 3671 };
3568 } 3672 }
3569 3673
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 3674 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 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 { };
3578 },
3579 ); 3676 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3677 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3678 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 3679 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 3680 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3681 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 3682 };
3600} 3683}
3601 3684
3602{ 3685{
3686 # configure IO::AIO
3687
3603 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 3689 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 3690 $Coro::AIO::WATCHER->priority (1);
3608 reentrant => 0,
3609 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno,
3611 poll => 'r',
3612 prio => 6,
3613 cb => \&IO::AIO::poll_cb,
3614 );
3615} 3691}
3616 3692
3617my $_log_backtrace; 3693my $_log_backtrace;
3618 3694
3619sub _log_backtrace { 3695sub _log_backtrace {
3623 3699
3624 # limit the # of concurrent backtraces 3700 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3701 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3702 ++$_log_backtrace;
3627 async { 3703 async {
3704 $Coro::current->{desc} = "abt $msg";
3705
3628 my @bt = fork_call { 3706 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3707 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3708 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3709 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 3710 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines