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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.407 by root, Sun Jan 13 09:53:53 2008 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
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 194
195 LOG llevError, $msg; 195 LOG llevError, $msg;
196 }; 196 };
197} 197}
198
199$Coro::State::DIEHOOK = sub {
200 warn Carp::longmess $_[0];
201 Coro::terminate;
202};
198 203
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 207@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
215)) { 220)) {
216 no strict 'refs'; 221 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 223}
219 224
220$Event::DIED = sub { 225$EV::DIED = sub {
221 warn "error in event callback: @_"; 226 warn "error in event callback: @_";
222}; 227};
223 228
224############################################################################# 229#############################################################################
225 230
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 253 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 254 $d
250 } || "[unable to dump $_[0]: '$@']"; 255 } || "[unable to dump $_[0]: '$@']";
251} 256}
252 257
253=item $ref = cf::from_json $json 258=item $ref = cf::decode_json $json
254 259
255Converts a JSON string into the corresponding perl data structure. 260Converts a JSON string into the corresponding perl data structure.
256 261
257=item $json = cf::to_json $ref 262=item $json = cf::encode_json $ref
258 263
259Converts a perl data structure into its JSON representation. 264Converts a perl data structure into its JSON representation.
260 265
261=cut 266=cut
262 267
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 268our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 269
265sub to_json ($) { $json_coder->encode ($_[0]) } 270sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 271sub decode_json($) { $json_coder->decode ($_[0]) }
267 272
268=item cf::lock_wait $string 273=item cf::lock_wait $string
269 274
270Wait until the given lock is available. See cf::lock_acquire. 275Wait until the given lock is available. See cf::lock_acquire.
271 276
… …
336 }; 341 };
337 $TICK_WATCHER->stop; 342 $TICK_WATCHER->stop;
338 $guard 343 $guard
339} 344}
340 345
346=item cf::periodic $interval, $cb
347
348Like EV::periodic, but randomly selects a starting point so that the actions
349get spread over timer.
350
351=cut
352
353sub periodic($$) {
354 my ($interval, $cb) = @_;
355
356 my $start = rand List::Util::min 180, $interval;
357
358 EV::periodic $start, $interval, 0, $cb
359}
360
341=item cf::get_slot $time[, $priority[, $name]] 361=item cf::get_slot $time[, $priority[, $name]]
342 362
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 363Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds 364This 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. 365of cpu time till the next tick. The slot is only valid till the next cede.
… …
354our @SLOT_QUEUE; 374our @SLOT_QUEUE;
355our $SLOT_QUEUE; 375our $SLOT_QUEUE;
356 376
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 377$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 378$SLOT_QUEUE = Coro::async {
379 $Coro::current->desc ("timeslot manager");
380
359 my $signal = new Coro::Signal; 381 my $signal = new Coro::Signal;
360 382
361 while () { 383 while () {
362 next_job: 384 next_job:
363 my $avail = cf::till_tick; 385 my $avail = cf::till_tick;
… …
371 } 393 }
372 } 394 }
373 } 395 }
374 396
375 if (@SLOT_QUEUE) { 397 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 398 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 399 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 400 $signal->wait;
379 } else { 401 } else {
380 Coro::schedule; 402 Coro::schedule;
381 } 403 }
… …
404 426
405BEGIN { *async = \&Coro::async_pool } 427BEGIN { *async = \&Coro::async_pool }
406 428
407=item cf::sync_job { BLOCK } 429=item cf::sync_job { BLOCK }
408 430
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 431The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 432is 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 433partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 434acceptable.
413 435
414If it must be done, put the blocking parts into C<sync_job>. This will run 436If 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 437the given BLOCK in another coroutine while waiting for the result. The
… …
420 442
421sub sync_job(&) { 443sub sync_job(&) {
422 my ($job) = @_; 444 my ($job) = @_;
423 445
424 if ($Coro::current == $Coro::main) { 446 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 447 my $time = EV::time;
426 448
427 # this is the main coro, too bad, we have to block 449 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 450 # till the operation succeeds, freezing the server :/
429 451
452 LOG llevError, Carp::longmess "sync job";#d#
453
430 # TODO: use suspend/resume instead 454 # TODO: use suspend/resume instead
431 # (but this is cancel-safe) 455 # (but this is cancel-safe)
432 my $freeze_guard = freeze_mainloop; 456 my $freeze_guard = freeze_mainloop;
433 457
434 my $busy = 1; 458 my $busy = 1;
435 my @res; 459 my @res;
436 460
437 (async { 461 (async {
462 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 463 @res = eval { $job->() };
439 warn $@ if $@; 464 warn $@ if $@;
440 undef $busy; 465 undef $busy;
441 })->prio (Coro::PRIO_MAX); 466 })->prio (Coro::PRIO_MAX);
442 467
443 while ($busy) { 468 while ($busy) {
444 Coro::cede or Event::one_event; 469 if (Coro::nready) {
470 Coro::cede_notself;
471 } else {
472 EV::loop EV::LOOP_ONESHOT;
445 } 473 }
474 }
446 475
447 $time = Event::time - $time; 476 $time = EV::time - $time;
448 477
449 LOG llevError | logBacktrace, Carp::longmess "long sync job" 478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451 480
452 $tick_start += $time; # do not account sync jobs to server load 481 $tick_start += $time; # do not account sync jobs to server load
… …
482=item fork_call { }, $args 511=item fork_call { }, $args
483 512
484Executes the given code block with the given arguments in a seperate 513Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 514process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 515Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 516never block itself or use any form of event handling.
488 517
489=cut 518=cut
490 519
491sub fork_call(&@) { 520sub fork_call(&@) {
492 my ($cb, @args) = @_; 521 my ($cb, @args) = @_;
… …
653attach callbacks/event handlers (a collection of which is called an "attachment") 682attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 683to it. All such attachable objects support the following methods.
655 684
656In the following description, CLASS can be any of C<global>, C<object> 685In 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 686C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 687Deliantra).
659 688
660=over 4 689=over 4
661 690
662=item $attachable->attach ($attachment, key => $value...) 691=item $attachable->attach ($attachment, key => $value...)
663 692
… …
945 } 974 }
946 975
947 0 976 0
948} 977}
949 978
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 979=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 980
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 981=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 982
954Generate an object-specific event with the given arguments. 983Generate an object-specific event with the given arguments.
955 984
… …
961 990
962=cut 991=cut
963 992
964############################################################################# 993#############################################################################
965# object support 994# object support
966#
967 995
996sub _object_equal($$);
997sub _object_equal($$) {
998 my ($a, $b) = @_;
999
1000 return 0 unless (ref $a) eq (ref $b);
1001
1002 if ("HASH" eq ref $a) {
1003 my @ka = keys %$a;
1004 my @kb = keys %$b;
1005
1006 return 0 if @ka != @kb;
1007
1008 for (0 .. $#ka) {
1009 return 0 unless $ka[$_] eq $kb[$_];
1010 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1011 }
1012
1013 } elsif ("ARRAY" eq ref $a) {
1014
1015 return 0 if @$a != @$b;
1016
1017 for (0 .. $#$a) {
1018 return 0 unless _object_equal $a->[$_], $b->[$_];
1019 }
1020
1021 } elsif ($a ne $b) {
1022 return 0;
1023 }
1024
1025 1
1026}
1027
1028our $SLOW_MERGES;#d#
968sub _can_merge { 1029sub _can_merge {
969 my ($ob1, $ob2) = @_; 1030 my ($ob1, $ob2) = @_;
970 1031
971 local $Storable::canonical = 1; 1032 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1033
975 $fob1 eq $fob2 1034 # we do the slow way here
1035 return _object_equal $ob1, $ob2
976} 1036}
977 1037
978sub reattach { 1038sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1039 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1040 my ($obj) = @_;
… …
1002cf::attachable->attach ( 1062cf::attachable->attach (
1003 prio => -1000000, 1063 prio => -1000000,
1004 on_instantiate => sub { 1064 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1065 my ($obj, $data) = @_;
1006 1066
1007 $data = from_json $data; 1067 $data = decode_json $data;
1008 1068
1009 for (@$data) { 1069 for (@$data) {
1010 my ($name, $args) = @$_; 1070 my ($name, $args) = @$_;
1011 1071
1012 $obj->attach ($name, %{$args || {} }); 1072 $obj->attach ($name, %{$args || {} });
… …
1041 close $fh; 1101 close $fh;
1042 1102
1043 if (@$objs) { 1103 if (@$objs) {
1044 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1045 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1107 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1108 aio_fsync $fh if $cf::USE_FSYNC;
1049 close $fh; 1109 close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1110 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1111 }
… …
1082 1142
1083 unless (aio_stat "$filename.pst") { 1143 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1144 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1145 or return;
1086 1146
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1147 my $st = eval { Coro::Storable::thaw $av };
1148 $av = $st->{objs};
1088 } 1149 }
1089 1150
1090 utf8::decode (my $decname = $filename); 1151 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1152 warn sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1153 $decname, length $data, scalar @{$av || []};
… …
1507 1568
1508Expand crossfire pod fragments into protocol xml. 1569Expand crossfire pod fragments into protocol xml.
1509 1570
1510=cut 1571=cut
1511 1572
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1512sub expand_cfpod { 1584sub expand_cfpod {
1513 ((my $self), (local $_)) = @_; 1585 my ($self, $pod) = @_;
1514 1586
1515 # escape & and < 1587 my $xml;
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518 1588
1519 # this is buggy, it needs to properly take care of nested <'s 1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1520 1592
1521 1 while 1593 $group =~ s/&/&amp;/g;
1522 # replace B<>, I<>, U<> etc. 1594 $group =~ s/</&lt;/g;
1523 s/B<([^\>]*)>/<b>$1<\/b>/ 1595
1524 || s/I<([^\>]*)>/<i>$1<\/i>/ 1596 $xml .= $group;
1525 || s/U<([^\>]*)>/<u>$1<\/u>/ 1597 } elsif ($pod =~ m%\G
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1598 ([BCGHITU])
1527 # replace G<male|female> tags 1599 <
1528 || s{G<([^>|]*)\|([^>]*)>}{ 1600 (?:
1529 $self->gender ? $2 : $1 1601 ([^<>]*) (?{ $group = $^N })
1530 }ge 1602 | < $interior >
1531 # replace H<hint text> 1603 )
1532 || s{H<([^\>]*)>} 1604 >
1605 %gcsx
1533 { 1606 ) {
1607 my ($code, $data) = ($1, $group);
1608
1609 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617 } elsif ($code eq "T") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619 } elsif ($code eq "G") {
1620 my ($male, $female) = split /\|/, $data;
1621 $data = $self->gender ? $female : $male;
1622 $xml .= expand_cfpod ($self, $data);
1623 } elsif ($code eq "H") {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1624 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "") 1626 "")
1537 [$self->{hintmode}] 1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1538 }ge; 1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1539 1638
1639 for ($xml) {
1540 # create single paragraphs (very hackish) 1640 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g; 1641 s/(?<=\S)\n(?=\w)/ /g;
1542 1642
1543 # compress some whitespace 1643 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends 1644 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines 1645 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines 1646 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines 1647 s/\n+$//; # ending lines
1648 }
1548 1649
1549 $_ 1650 $xml
1550} 1651}
1652
1653no re 'eval';
1551 1654
1552sub hintmode { 1655sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1; 1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode} 1657 $_[0]{hintmode}
1555} 1658}
… …
2036 } 2139 }
2037 2140
2038 $MAP_PREFETCH{$path} |= $load; 2141 $MAP_PREFETCH{$path} |= $load;
2039 2142
2040 $MAP_PREFETCHER ||= cf::async { 2143 $MAP_PREFETCHER ||= cf::async {
2144 $Coro::current->{desc} = "map prefetcher";
2145
2041 while (%MAP_PREFETCH) { 2146 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2147 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2148 if (my $map = find $k) {
2044 $map->load if $v; 2149 $map->load if $v;
2045 } 2150 }
… …
2071 return if $self->{deny_save}; 2176 return if $self->{deny_save};
2072 2177
2073 local $self->{last_access} = $self->last_access;#d# 2178 local $self->{last_access} = $self->last_access;#d#
2074 2179
2075 cf::async { 2180 cf::async {
2181 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2182 $_->contr->save for $self->players;
2077 }; 2183 };
2078 2184
2079 if ($uniq) { 2185 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2267=cut 2373=cut
2268 2374
2269sub deref { 2375sub deref {
2270 my ($ref) = @_; 2376 my ($ref) = @_;
2271 2377
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2378 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2379 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2380 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2381 or return;
2279 $pl->ob->uuid eq $uuid 2382 $pl->ob->uuid eq $uuid
2280 or return; 2383 or return;
… …
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2555
2453 $self->enter_link; 2556 $self->enter_link;
2454 2557
2455 (async { 2558 (async {
2559 $Coro::current->{desc} = "player::goto $path $x $y";
2560
2456 # *tag paths override both path and x|y 2561 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2562 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2563 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2564 my $ob = $obs[rand @obs];
2460 2565
… …
2540 $rmp->{origin_y} = $exit->y; 2645 $rmp->{origin_y} = $exit->y;
2541 } 2646 }
2542 2647
2543 $rmp->{random_seed} ||= $exit->random_seed; 2648 $rmp->{random_seed} ||= $exit->random_seed;
2544 2649
2545 my $data = cf::to_json $rmp; 2650 my $data = cf::encode_json $rmp;
2546 my $md5 = Digest::MD5::md5_hex $data; 2651 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2652 my $meta = "$RANDOMDIR/$md5.meta";
2548 2653
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2655 aio_write $fh, 0, (length $data), $data, 0;
… …
2577 # if exit is damned, update players death & WoR home-position 2682 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp) 2683 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED); 2684 if $exit->flag (FLAG_DAMNED);
2580 2685
2581 (async { 2686 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2688
2582 $self->deactivate_recursive; # just to be sure 2689 $self->deactivate_recursive; # just to be sure
2583 unless (eval { 2690 unless (eval {
2584 $self->goto ($slaying, $hp, $sp); 2691 $self->goto ($slaying, $hp, $sp);
2585 2692
2586 1; 2693 1;
… …
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2728the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2729the message unless the client supports the msg packet.
2623 2730
2624=cut 2731=cut
2625 2732
2733# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2734our %CHANNEL = (
2627 "c/identify" => { 2735 "c/identify" => {
2628 id => "identify", 2736 id => "infobox",
2629 title => "Identify", 2737 title => "Identify",
2630 reply => undef, 2738 reply => undef,
2631 tooltip => "Items recently identified", 2739 tooltip => "Items recently identified",
2632 }, 2740 },
2633 "c/examine" => { 2741 "c/examine" => {
2634 id => "examine", 2742 id => "infobox",
2635 title => "Examine", 2743 title => "Examine",
2636 reply => undef, 2744 reply => undef,
2637 tooltip => "Signs and other items you examined", 2745 tooltip => "Signs and other items you examined",
2638 }, 2746 },
2747 "c/book" => {
2748 id => "infobox",
2749 title => "Book",
2750 reply => undef,
2751 tooltip => "The contents of a note or book",
2752 },
2753 "c/lookat" => {
2754 id => "infobox",
2755 title => "Look",
2756 reply => undef,
2757 tooltip => "What you saw there",
2758 },
2759 "c/who" => {
2760 id => "infobox",
2761 title => "Players",
2762 reply => undef,
2763 tooltip => "Shows players who are currently online",
2764 },
2765 "c/body" => {
2766 id => "infobox",
2767 title => "Body Parts",
2768 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available",
2770 },
2771 "c/uptime" => {
2772 id => "infobox",
2773 title => "Uptime",
2774 reply => undef,
2775 tooltip => "How long the server has been running since last restart",
2776 },
2777 "c/mapinfo" => {
2778 id => "infobox",
2779 title => "Map Info",
2780 reply => undef,
2781 tooltip => "Information related to the maps",
2782 },
2639); 2783);
2640 2784
2641sub cf::client::send_msg { 2785sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2786 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2787
2644 $msg = $self->pl->expand_cfpod ($msg); 2788 $msg = $self->pl->expand_cfpod ($msg);
2645 2789
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2790 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2791
2648 # check predefined channels, for the benefit of C 2792 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2793 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel};
2650 2795
2796 $self->ext_msg (channel_info => $channel)
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id};
2800
2651 if (ref $channel) { 2801 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2802 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2803 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2804 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2805 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2806 if $self->can_msg;
… …
2873=pod 3023=pod
2874 3024
2875The following functions and methods are available within a safe environment: 3025The following functions and methods are available within a safe environment:
2876 3026
2877 cf::object 3027 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3028 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3029 insert remove name archname title slaying race decrease_ob_nr
2880 3030
2881 cf::object::player 3031 cf::object::player
2882 player 3032 player
2883 3033
… …
2890=cut 3040=cut
2891 3041
2892for ( 3042for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3044 insert remove inv name archname title slaying race
2895 decrease_ob_nr)], 3045 decrease_ob_nr destroy)],
2896 ["cf::object::player" => qw(player)], 3046 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3047 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 3048 ["cf::map" => qw(trigger)],
2899) { 3049) {
2900 no strict 'refs'; 3050 no strict 'refs';
… …
3005 { 3155 {
3006 my $faces = $facedata->{faceinfo}; 3156 my $faces = $facedata->{faceinfo};
3007 3157
3008 while (my ($face, $info) = each %$faces) { 3158 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3159 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160
3010 cf::face::set_visibility $idx, $info->{visibility}; 3161 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3162 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3163 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3164 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3014 3165
3015 cf::cede_to_tick; 3166 cf::cede_to_tick;
3016 } 3167 }
3017 3168
3018 while (my ($face, $info) = each %$faces) { 3169 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3170 next unless $info->{smooth};
3171
3020 my $idx = cf::face::find $face 3172 my $idx = cf::face::find $face
3021 or next; 3173 or next;
3174
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3175 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3176 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3178 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3179 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3044 { 3197 {
3045 # TODO: for gcfclient pleasure, we should give resources 3198 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index. 3199 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3200 my $res = $facedata->{resource};
3048 3201
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3202 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3204 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data; 3205 my $data;
3054 3206
3055 if ($info->{type} & 1) { 3207 if ($info->{type} & 1) {
3056 # prepend meta info 3208 # prepend meta info
3057 3209
3058 my $meta = $enc->encode ({ 3210 my $meta = $enc->encode ({
3059 name => $name, 3211 name => $name,
3060 %{ $info->{meta} || {} }, 3212 %{ $info->{meta} || {} },
3061 }); 3213 });
3062 3214
3063 $data = pack "(w/a*)*", $meta, $info->{data}; 3215 $data = pack "(w/a*)*", $meta, $info->{data};
3216 } else {
3217 $data = $info->{data};
3218 }
3219
3220 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3221 cf::face::set_type $idx, $info->{type};
3064 } else { 3222 } else {
3065 $data = $info->{data}; 3223 $RESOURCE{$name} = $info;
3066 } 3224 }
3067 3225
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3226 cf::cede_to_tick;
3072 } 3227 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3228 }
3229
3230 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3231
3093 1 3232 1
3094} 3233}
3234
3235cf::global->attach (on_resource_update => sub {
3236 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3237 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3238
3239 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3240 my $sound = $soundconf->{compat}[$_]
3241 or next;
3242
3243 my $face = cf::face::find "sound/$sound->[1]";
3244 cf::sound::set $sound->[0] => $face;
3245 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3246 }
3247
3248 while (my ($k, $v) = each %{$soundconf->{event}}) {
3249 my $face = cf::face::find "sound/$v";
3250 cf::sound::set $k => $face;
3251 }
3252 }
3253});
3095 3254
3096register_exticmd fx_want => sub { 3255register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_; 3256 my ($ns, $want) = @_;
3098 3257
3099 while (my ($k, $v) = each %$want) { 3258 while (my ($k, $v) = each %$want) {
… …
3175sub main { 3334sub main {
3176 # we must not ever block the main coroutine 3335 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3336 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3338 (async {
3180 Event::one_event; 3339 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3341 })->prio (Coro::PRIO_MAX);
3182 }; 3342 };
3183 3343
3184 reload_config; 3344 reload_config;
3185 db_init; 3345 db_init;
3186 load_extensions; 3346 load_extensions;
3187 3347
3188 $TICK_WATCHER->start; 3348 $TICK_WATCHER->start;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3189 Event::loop; 3350 EV::loop;
3190} 3351}
3191 3352
3192############################################################################# 3353#############################################################################
3193# initialisation and cleanup 3354# initialisation and cleanup
3194 3355
3195# install some emergency cleanup handlers 3356# install some emergency cleanup handlers
3196BEGIN { 3357BEGIN {
3358 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3359 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3360 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3361 cf::cleanup "SIG$signal";
3205 },
3206 ); 3362 };
3207 } 3363 }
3208} 3364}
3209 3365
3210sub write_runtime { 3366sub write_runtime {
3211 my $runtime = "$LOCALDIR/runtime"; 3367 my $runtime = "$LOCALDIR/runtime";
… …
3256 # and maps saved/destroyed asynchronously. 3412 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3413 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3414 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3415 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3416 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3418 $pl->save;
3262 } 3419 }
3263 warn "end emergency player save\n"; 3420 warn "end emergency player save\n";
3264 3421
3265 warn "begin emergency map save\n"; 3422 warn "begin emergency map save\n";
… …
3304 warn "syncing database to disk"; 3461 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3462 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3463
3307 # if anything goes wrong in here, we should simply crash as we already saved 3464 # if anything goes wrong in here, we should simply crash as we already saved
3308 3465
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313
3314 warn "flushing outstanding aio requests"; 3466 warn "flushing outstanding aio requests";
3315 for (;;) { 3467 for (;;) {
3316 BDB::flush; 3468 BDB::flush;
3317 IO::AIO::flush; 3469 IO::AIO::flush;
3318 Coro::cede; 3470 Coro::cede_notself;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3471 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate..."; 3472 warn "iterate...";
3321 } 3473 }
3322 3474
3323 ++$RELOAD; 3475 ++$RELOAD;
… …
3412 3564
3413sub reload_perl() { 3565sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3566 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3567 # coro crashes during coro_state_free->destroy here.
3416 3568
3417 $RELOAD_WATCHER ||= Event->timer ( 3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3418 reentrant => 0,
3419 after => 0,
3420 data => WF_AUTOCANCEL,
3421 cb => sub {
3422 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3570 undef $RELOAD_WATCHER;
3424 }, 3571 do_reload_perl;
3425 ); 3572 };
3426} 3573}
3427 3574
3428register_command "reload" => sub { 3575register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3576 my ($who, $arg) = @_;
3430 3577
3431 if ($who->flag (FLAG_WIZ)) { 3578 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3579 $who->message ("reloading server.");
3580 async {
3581 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3582 reload_perl;
3583 };
3434 } 3584 }
3435}; 3585};
3436 3586
3437unshift @INC, $LIBDIR; 3587unshift @INC, $LIBDIR;
3438 3588
… …
3457 my $signal = new Coro::Signal; 3607 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3608 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3609 $signal->wait;
3460} 3610}
3461 3611
3462$TICK_WATCHER = Event->timer ( 3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3463 reentrant => 0,
3464 parked => 1,
3465 prio => 0,
3466 at => $NEXT_TICK || $TICK,
3467 data => WF_AUTOCANCEL,
3468 cb => sub {
3469 if ($Coro::current != $Coro::main) { 3613 if ($Coro::current != $Coro::main) {
3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3471 unless ++$bug_warning > 10; 3615 unless ++$bug_warning > 10;
3472 return; 3616 return;
3473 } 3617 }
3474 3618
3475 $NOW = $tick_start = Event::time; 3619 $NOW = $tick_start = EV::now;
3476 3620
3477 cf::server_tick; # one server iteration 3621 cf::server_tick; # one server iteration
3478 3622
3479 $RUNTIME += $TICK; 3623 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK; 3624 $NEXT_TICK = $_[0]->at;
3481 3625
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3626 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 3628 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3630 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!"; 3631 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 } 3632 };
3633 }
3489 3634
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 3636 $sig->send;
3492 } 3637 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 3638 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 3639 $sig->send;
3495 } 3640 }
3496 3641
3497 $NOW = Event::time;
3498
3499 # if we are delayed by four ticks or more, skip them all
3500 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3501
3502 $TICK_WATCHER->at ($NEXT_TICK);
3503 $TICK_WATCHER->start;
3504
3505 $LOAD = ($NOW - $tick_start) / $TICK; 3642 $LOAD = ($NOW - $tick_start) / $TICK;
3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 3644
3508 _post_tick; 3645 _post_tick;
3509 }, 3646};
3510); 3647$TICK_WATCHER->priority (EV::MAXPRI);
3511 3648
3512{ 3649{
3650 # configure BDB
3651
3513 BDB::min_parallel 8; 3652 BDB::min_parallel 8;
3514 BDB::max_poll_time $TICK * 0.1; 3653 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 3654 $Coro::BDB::WATCHER->priority (1);
3516 reentrant => 0,
3517 fd => BDB::poll_fileno,
3518 poll => 'r',
3519 prio => 0,
3520 data => WF_AUTOCANCEL,
3521 cb => \&BDB::poll_cb,
3522 );
3523
3524 BDB::set_sync_prepare {
3525 my $status;
3526 my $current = $Coro::current;
3527 (
3528 sub {
3529 $status = $!;
3530 $current->ready; undef $current;
3531 },
3532 sub {
3533 Coro::schedule while defined $current;
3534 $! = $status;
3535 },
3536 )
3537 };
3538 3655
3539 unless ($DB_ENV) { 3656 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 3657 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3542 | BDB::LOG_AUTOREMOVE, 1); 3659 | BDB::LOG_AUTOREMOVE, 1);
… …
3557 3674
3558 cf::cleanup "db_env_open(db): $@" if $@; 3675 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 3676 };
3560 } 3677 }
3561 3678
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 3679 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3680 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 ); 3681 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3682 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3683 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 3684 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 3685 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3686 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 3687 };
3592} 3688}
3593 3689
3594{ 3690{
3691 # configure IO::AIO
3692
3595 IO::AIO::min_parallel 8; 3693 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 3694 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 3695 $Coro::AIO::WATCHER->priority (1);
3600 reentrant => 0,
3601 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno,
3603 poll => 'r',
3604 prio => 6,
3605 cb => \&IO::AIO::poll_cb,
3606 );
3607} 3696}
3608 3697
3609my $_log_backtrace; 3698my $_log_backtrace;
3610 3699
3611sub _log_backtrace { 3700sub _log_backtrace {
… …
3615 3704
3616 # limit the # of concurrent backtraces 3705 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3706 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3707 ++$_log_backtrace;
3619 async { 3708 async {
3709 $Coro::current->{desc} = "abt $msg";
3710
3620 my @bt = fork_call { 3711 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 3712 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3713 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3714 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 3715 or die "addr2line: $!";

Diff Legend

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