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.363 by root, Mon Sep 10 17:24:36 2007 UTC vs.
Revision 1.404 by root, Mon Dec 17 07:27:58 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
… …
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 76our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 79our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
83 81
84our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 84our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 85our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 86our $DB_ENV;
88 87
89our %CFG; 88our %CFG;
90 89
91our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 91our $RUNTIME;
92our $NOW;
93 93
94our (%PLAYER, %PLAYER_LOADING); # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 95our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
97 97
… …
161 161
162The raw value load value from the last tick. 162The raw value load value from the last tick.
163 163
164=item %cf::CFG 164=item %cf::CFG
165 165
166Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 167from wherever your confdir points to.
168 168
169=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
170 170
171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
214)) { 214)) {
215 no strict 'refs'; 215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 217}
218 218
219$Event::DIED = sub { 219$EV::DIED = sub {
220 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
221}; 221};
222 222
223############################################################################# 223#############################################################################
224 224
… …
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 248 $d
249 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
250} 250}
251 251
252=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
253 253
254Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
255 255
256=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
257 257
258Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
259 259
260=cut 260=cut
261 261
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 263
264sub to_json ($) { $json_coder->encode ($_[0]) } 264sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 265sub decode_json($) { $json_coder->decode ($_[0]) }
266 266
267=item cf::lock_wait $string 267=item cf::lock_wait $string
268 268
269Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
270 270
… …
335 }; 335 };
336 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
337 $guard 337 $guard
338} 338}
339 339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
353}
354
340=item cf::get_slot $time[, $priority[, $name]] 355=item cf::get_slot $time[, $priority[, $name]]
341 356
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 357Allocate $time seconds of blocking CPU time at priority C<$priority>:
343This call blocks and returns only when you have at least C<$time> seconds 358This call blocks and returns only when you have at least C<$time> seconds
344of cpu time till the next tick. The slot is only valid till the next cede. 359of cpu time till the next tick. The slot is only valid till the next cede.
… …
353our @SLOT_QUEUE; 368our @SLOT_QUEUE;
354our $SLOT_QUEUE; 369our $SLOT_QUEUE;
355 370
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
358 my $signal = new Coro::Signal; 375 my $signal = new Coro::Signal;
359 376
360 while () { 377 while () {
361 next_job: 378 next_job:
362 my $avail = cf::till_tick; 379 my $avail = cf::till_tick;
… …
370 } 387 }
371 } 388 }
372 } 389 }
373 390
374 if (@SLOT_QUEUE) { 391 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 393 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 394 $signal->wait;
378 } else { 395 } else {
379 Coro::schedule; 396 Coro::schedule;
380 } 397 }
… …
403 420
404BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
405 422
406=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
407 424
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 425The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 426is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 428acceptable.
412 429
413If it must be done, put the blocking parts into C<sync_job>. This will run 430If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
… …
419 436
420sub sync_job(&) { 437sub sync_job(&) {
421 my ($job) = @_; 438 my ($job) = @_;
422 439
423 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 441 my $time = EV::time;
425 442
426 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
428 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
429 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
430 # (but this is cancel-safe) 449 # (but this is cancel-safe)
431 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
432 451
433 my $busy = 1; 452 my $busy = 1;
434 my @res; 453 my @res;
435 454
436 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 457 @res = eval { $job->() };
438 warn $@ if $@; 458 warn $@ if $@;
439 undef $busy; 459 undef $busy;
440 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
441 461
442 while ($busy) { 462 while ($busy) {
443 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
444 } 467 }
468 }
445 469
446 $time = Event::time - $time; 470 $time = EV::time - $time;
447 471
448 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450 474
451 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
… …
481=item fork_call { }, $args 505=item fork_call { }, $args
482 506
483Executes the given code block with the given arguments in a seperate 507Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 508process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 509Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 510never block itself or use any form of event handling.
487 511
488=cut 512=cut
489 513
490sub fork_call(&@) { 514sub fork_call(&@) {
491 my ($cb, @args) = @_; 515 my ($cb, @args) = @_;
… …
652attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
654 678
655In the following description, CLASS can be any of C<global>, C<object> 679In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 680C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 681Deliantra).
658 682
659=over 4 683=over 4
660 684
661=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
662 686
… …
960 984
961=cut 985=cut
962 986
963############################################################################# 987#############################################################################
964# object support 988# object support
965#
966 989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
967sub _can_merge { 1023sub _can_merge {
968 my ($ob1, $ob2) = @_; 1024 my ($ob1, $ob2) = @_;
969 1025
970 local $Storable::canonical = 1; 1026 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1027
974 $fob1 eq $fob2 1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
975} 1030}
976 1031
977sub reattach { 1032sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1034 my ($obj) = @_;
… …
1001cf::attachable->attach ( 1056cf::attachable->attach (
1002 prio => -1000000, 1057 prio => -1000000,
1003 on_instantiate => sub { 1058 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
1005 1060
1006 $data = from_json $data; 1061 $data = decode_json $data;
1007 1062
1008 for (@$data) { 1063 for (@$data) {
1009 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
1010 1065
1011 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
… …
1024 }, 1079 },
1025); 1080);
1026 1081
1027sub object_freezer_save { 1082sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1084
1032 sync_job { 1085 sync_job {
1033 if (length $$rdata) { 1086 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1087 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
… …
1042 close $fh; 1095 close $fh;
1043 1096
1044 if (@$objs) { 1097 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1103 close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1105 }
… …
1061 } else { 1114 } else {
1062 aio_unlink $filename; 1115 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
1064 } 1117 }
1065 }; 1118 };
1066
1067 undef $guard;
1068} 1119}
1069 1120
1070sub object_freezer_as_string { 1121sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
1072 1123
… …
1077 1128
1078sub object_thawer_load { 1129sub object_thawer_load {
1079 my ($filename) = @_; 1130 my ($filename) = @_;
1080 1131
1081 my ($data, $av); 1132 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1133
1085 (aio_load $filename, $data) >= 0 1134 (aio_load $filename, $data) >= 0
1086 or return; 1135 or return;
1087 1136
1088 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1139 or return;
1091 1140
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
1094 } 1143 }
1095 1144
1096 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1402
1354 my $f = new_from_file cf::object::thawer path $login 1403 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1404 or return;
1356 1405
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1406 my $pl = cf::player::load_pl $f
1359 or return; 1407 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1408 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1409 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
… …
1514 1562
1515Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1516 1564
1517=cut 1565=cut
1518 1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1519sub expand_cfpod { 1578sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1521 1580
1522 # escape & and < 1581 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1582
1526 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1527 1586
1528 1 while 1587 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1592 ([BCGHITU])
1534 # replace G<male|female> tags 1593 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1594 (?:
1536 $self->gender ? $2 : $1 1595 ([^<>]*) (?{ $group = $^N })
1537 }ge 1596 | < $interior >
1538 # replace H<hint text> 1597 )
1539 || s{H<([^\>]*)>} 1598 >
1599 %gcsx
1540 { 1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1620 "")
1544 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1546 1632
1633 for ($xml) {
1547 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1549 1636
1550 # compress some whitespace 1637 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1555 1643
1556 $_ 1644 $xml
1557} 1645}
1646
1647no re 'eval';
1558 1648
1559sub hintmode { 1649sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1651 $_[0]{hintmode}
1562} 1652}
… …
2043 } 2133 }
2044 2134
2045 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2046 2136
2047 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
2048 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2142 if (my $map = find $k) {
2051 $map->load if $v; 2143 $map->load if $v;
2052 } 2144 }
… …
2078 return if $self->{deny_save}; 2170 return if $self->{deny_save};
2079 2171
2080 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
2081 2173
2082 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2084 }; 2177 };
2085 2178
2086 if ($uniq) { 2179 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2367=cut
2275 2368
2276sub deref { 2369sub deref {
2277 my ($ref) = @_; 2370 my ($ref) = @_;
2278 2371
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2373 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2375 or return;
2286 $pl->ob->uuid eq $uuid 2376 $pl->ob->uuid eq $uuid
2287 or return; 2377 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2549
2460 $self->enter_link; 2550 $self->enter_link;
2461 2551
2462 (async { 2552 (async {
2553 $Coro::current->{desc} = "player::goto $path $x $y";
2554
2555 # *tag paths override both path and x|y
2556 if ($path =~ /^\*(.*)$/) {
2557 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2558 my $ob = $obs[rand @obs];
2559
2560 # see if we actually can go there
2561 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2562 $ob = $obs[rand @obs];
2563 } else {
2564 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 }
2566 # else put us there anyways for now #d#
2567
2568 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2569 } else {
2570 ($path, $x, $y) = (undef, undef, undef);
2571 }
2572 }
2573
2463 my $map = eval { 2574 my $map = eval {
2464 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2465 2576
2466 if ($map) { 2577 if ($map) {
2467 $map = $map->customise_for ($self); 2578 $map = $map->customise_for ($self);
2468 $map = $check->($map) if $check && $map; 2579 $map = $check->($map) if $check && $map;
2469 } else { 2580 } else {
2470 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2581 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 } 2582 }
2472 2583
2473 $map 2584 $map
2474 }; 2585 };
2475 2586
… …
2528 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2529 } 2640 }
2530 2641
2531 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2532 2643
2533 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2534 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2535 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2536 2647
2537 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2538 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
… …
2565 # if exit is damned, update players death & WoR home-position 2676 # if exit is damned, update players death & WoR home-position
2566 $self->contr->savebed ($slaying, $hp, $sp) 2677 $self->contr->savebed ($slaying, $hp, $sp)
2567 if $exit->flag (FLAG_DAMNED); 2678 if $exit->flag (FLAG_DAMNED);
2568 2679
2569 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2570 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2571 unless (eval { 2684 unless (eval {
2572 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2573 2686
2574 1; 2687 1;
… …
2609the message, with C<log> being the default. If C<$color> is negative, suppress 2722the message, with C<log> being the default. If C<$color> is negative, suppress
2610the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2611 2724
2612=cut 2725=cut
2613 2726
2727# non-persistent channels (usually the info channel)
2614our %CHANNEL = ( 2728our %CHANNEL = (
2615 "c/identify" => { 2729 "c/identify" => {
2616 id => "identify", 2730 id => "infobox",
2617 title => "Identify", 2731 title => "Identify",
2618 reply => undef, 2732 reply => undef,
2619 tooltip => "Items recently identified", 2733 tooltip => "Items recently identified",
2620 }, 2734 },
2621 "c/examine" => { 2735 "c/examine" => {
2622 id => "examine", 2736 id => "infobox",
2623 title => "Examine", 2737 title => "Examine",
2624 reply => undef, 2738 reply => undef,
2625 tooltip => "Signs and other items you examined", 2739 tooltip => "Signs and other items you examined",
2626 }, 2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2747 "c/lookat" => {
2748 id => "infobox",
2749 title => "Look",
2750 reply => undef,
2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2776 },
2627); 2777);
2628 2778
2629sub cf::client::send_msg { 2779sub cf::client::send_msg {
2630 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
2631 2781
2632 $msg = $self->pl->expand_cfpod ($msg); 2782 $msg = $self->pl->expand_cfpod ($msg);
2633 2783
2634 $color &= cf::NDI_CLIENT_MASK; # just in case... 2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2635 2785
2636 # check predefined channels, for the benefit of C 2786 # check predefined channels, for the benefit of C
2637 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2638 2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2639 if (ref $channel) { 2795 } elsif (ref $channel) {
2640 # send meta info to client, if not yet sent 2796 # send meta info to client, if not yet sent
2641 unless (exists $self->{channel}{$channel->{id}}) { 2797 unless (exists $self->{channel}{$channel->{id}}) {
2642 $self->{channel}{$channel->{id}} = $channel; 2798 $self->{channel}{$channel->{id}} = $channel;
2643 $self->ext_msg (channel_info => $channel) 2799 $self->ext_msg (channel_info => $channel)
2644 if $self->can_msg; 2800 if $self->can_msg;
… …
2861=pod 3017=pod
2862 3018
2863The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2864 3020
2865 cf::object 3021 cf::object
2866 contr pay_amount pay_player map x y force_find force_add 3022 contr pay_amount pay_player map x y force_find force_add destroy
2867 insert remove name archname title slaying race decrease_ob_nr 3023 insert remove name archname title slaying race decrease_ob_nr
2868 3024
2869 cf::object::player 3025 cf::object::player
2870 player 3026 player
2871 3027
… …
2878=cut 3034=cut
2879 3035
2880for ( 3036for (
2881 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2882 insert remove inv name archname title slaying race 3038 insert remove inv name archname title slaying race
2883 decrease_ob_nr)], 3039 decrease_ob_nr destroy)],
2884 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2885 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2886 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2887) { 3043) {
2888 no strict 'refs'; 3044 no strict 'refs';
… …
3163sub main { 3319sub main {
3164 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
3165 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
3166 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3167 (async { 3323 (async {
3168 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
3169 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
3170 }; 3327 };
3171 3328
3172 reload_config; 3329 reload_config;
3173 db_init; 3330 db_init;
3174 load_extensions; 3331 load_extensions;
3175 3332
3176 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3177 Event::loop; 3335 EV::loop;
3178} 3336}
3179 3337
3180############################################################################# 3338#############################################################################
3181# initialisation and cleanup 3339# initialisation and cleanup
3182 3340
3183# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
3184BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
3185 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
3186 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3187 reentrant => 0,
3188 data => WF_AUTOCANCEL,
3189 signal => $signal,
3190 prio => 0,
3191 cb => sub {
3192 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
3193 },
3194 ); 3347 };
3195 } 3348 }
3196} 3349}
3197 3350
3198sub write_runtime { 3351sub write_runtime {
3199 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
… …
3244 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
3245 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
3246 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
3247 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
3248 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3249 $pl->save; 3403 $pl->save;
3250 } 3404 }
3251 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
3252 3406
3253 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
… …
3292 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3293 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3294 3448
3295 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
3296 3450
3297 warn "cancelling all WF_AUTOCANCEL watchers";
3298 for (Event::all_watchers) {
3299 $_->cancel if $_->data & WF_AUTOCANCEL;
3300 }
3301
3302 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3303 for (;;) { 3452 for (;;) {
3304 BDB::flush; 3453 BDB::flush;
3305 IO::AIO::flush; 3454 IO::AIO::flush;
3306 Coro::cede; 3455 Coro::cede_notself;
3307 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3308 warn "iterate..."; 3457 warn "iterate...";
3309 } 3458 }
3310 3459
3311 ++$RELOAD; 3460 ++$RELOAD;
… …
3400 3549
3401sub reload_perl() { 3550sub reload_perl() {
3402 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3403 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3404 3553
3405 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3406 reentrant => 0,
3407 after => 0,
3408 data => WF_AUTOCANCEL,
3409 cb => sub {
3410 do_reload_perl;
3411 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3412 }, 3556 do_reload_perl;
3413 ); 3557 };
3414} 3558}
3415 3559
3416register_command "reload" => sub { 3560register_command "reload" => sub {
3417 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3418 3562
3419 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3420 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3421 async { reload_perl }; 3567 reload_perl;
3568 };
3422 } 3569 }
3423}; 3570};
3424 3571
3425unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3426 3573
… …
3445 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3446 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3447 $signal->wait; 3594 $signal->wait;
3448} 3595}
3449 3596
3450 my $min = 1e6;#d# 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3451 my $avg = 10;
3452$TICK_WATCHER = Event->timer (
3453 reentrant => 0,
3454 parked => 1,
3455 prio => 0,
3456 at => $NEXT_TICK || $TICK,
3457 data => WF_AUTOCANCEL,
3458 cb => sub {
3459 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3460 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3461 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3462 return; 3601 return;
3463 } 3602 }
3464 3603
3465 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3466 3605
3467 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3468 3607
3469 0 && sync_job {#d# 3608 $RUNTIME += $TICK;
3470 for(1..10) { 3609 $NEXT_TICK = $_[0]->at;
3471 my $t = Event::time;
3472 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3473 or die;
3474 3610
3475 $map->width (50); 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3476 $map->height (50); 3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3477 $map->alloc; 3613 Coro::async_pool {
3478 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3614 $Coro::current->{desc} = "runtime saver";
3479 my $t = Event::time - $t; 3615 write_runtime
3480 3616 or warn "ERROR: unable to write runtime file: $!";
3481 #next unless $t < 0.0013;#d#
3482 if ($t < $min) {
3483 $min = $t;
3484 }
3485 $avg = $avg * 0.99 + $t * 0.01;
3486 }
3487 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3488 exit 0;
3489 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3490 }; 3617 };
3618 }
3491 3619
3492 $RUNTIME += $TICK;
3493 $NEXT_TICK += $TICK;
3494
3495 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3496 $NEXT_RUNTIME_WRITE = $NOW + 10;
3497 Coro::async_pool {
3498 write_runtime
3499 or warn "ERROR: unable to write runtime file: $!";
3500 };
3501 }
3502
3503# my $AFTER = Event::time;
3504# warn $AFTER - $NOW;#d#
3505
3506 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3507 $sig->send; 3621 $sig->send;
3508 } 3622 }
3509 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3510 $sig->send; 3624 $sig->send;
3511 } 3625 }
3512 3626
3513 $NOW = Event::time;
3514
3515 # if we are delayed by four ticks or more, skip them all
3516 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3517
3518 $TICK_WATCHER->at ($NEXT_TICK);
3519 $TICK_WATCHER->start;
3520
3521 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3522 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3523 3629
3524 _post_tick; 3630 _post_tick;
3525 3631};
3526 3632$TICK_WATCHER->priority (EV::MAXPRI);
3527 },
3528);
3529 3633
3530{ 3634{
3635 # configure BDB
3636
3531 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
3532 BDB::max_poll_time $TICK * 0.1; 3638 BDB::max_poll_reqs $TICK * 0.1;
3533 $BDB_POLL_WATCHER = Event->io ( 3639 $Coro::BDB::WATCHER->priority (1);
3534 reentrant => 0,
3535 fd => BDB::poll_fileno,
3536 poll => 'r',
3537 prio => 0,
3538 data => WF_AUTOCANCEL,
3539 cb => \&BDB::poll_cb,
3540 );
3541
3542 BDB::set_sync_prepare {
3543 my $status;
3544 my $current = $Coro::current;
3545 (
3546 sub {
3547 $status = $!;
3548 $current->ready; undef $current;
3549 },
3550 sub {
3551 Coro::schedule while defined $current;
3552 $! = $status;
3553 },
3554 )
3555 };
3556 3640
3557 unless ($DB_ENV) { 3641 unless ($DB_ENV) {
3558 $DB_ENV = BDB::db_env_create; 3642 $DB_ENV = BDB::db_env_create;
3643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3644 | BDB::LOG_AUTOREMOVE, 1);
3645 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3646 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3559 3647
3560 cf::sync_job { 3648 cf::sync_job {
3561 eval { 3649 eval {
3562 BDB::db_env_open 3650 BDB::db_env_open
3563 $DB_ENV, 3651 $DB_ENV,
… …
3565 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3653 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3566 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3654 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3567 0666; 3655 0666;
3568 3656
3569 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3657 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3570
3571 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3572 | BDB::LOG_AUTOREMOVE, 1);
3573 $DB_ENV->set_lk_detect;
3574 }; 3658 };
3575 3659
3576 cf::cleanup "db_env_open(db): $@" if $@; 3660 cf::cleanup "db_env_open(db): $@" if $@;
3577 }; 3661 };
3578 } 3662 }
3579 3663
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3664 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3581 after => 11, 3665 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3582 interval => 60, 3666 };
3583 hard => 1, 3667 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3668 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 3669 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 3670 $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 { }; 3671 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 3672 };
3600} 3673}
3601 3674
3602{ 3675{
3676 # configure IO::AIO
3677
3603 IO::AIO::min_parallel 8; 3678 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 3679 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 3680 $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} 3681}
3616 3682
3617my $_log_backtrace; 3683my $_log_backtrace;
3618 3684
3619sub _log_backtrace { 3685sub _log_backtrace {
… …
3623 3689
3624 # limit the # of concurrent backtraces 3690 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3691 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3692 ++$_log_backtrace;
3627 async { 3693 async {
3694 $Coro::current->{desc} = "abt $msg";
3695
3628 my @bt = fork_call { 3696 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3697 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3698 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3699 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 3700 or die "addr2line: $!";

Diff Legend

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