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.365 by root, Tue Sep 11 13:27:56 2007 UTC vs.
Revision 1.405 by root, Mon Dec 17 08:03:22 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;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 86our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 87our $DB_ENV;
88 88
89our %CFG; 89our %CFG;
90 90
91our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 92our $RUNTIME;
93our $NOW;
93 94
94our (%PLAYER, %PLAYER_LOADING); # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 96our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
97 98
… …
161 162
162The raw value load value from the last tick. 163The raw value load value from the last tick.
163 164
164=item %cf::CFG 165=item %cf::CFG
165 166
166Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 168from wherever your confdir points to.
168 169
169=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
170 171
171These 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
… …
214)) { 215)) {
215 no strict 'refs'; 216 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 218}
218 219
219$Event::DIED = sub { 220$EV::DIED = sub {
220 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
221}; 222};
222 223
223############################################################################# 224#############################################################################
224 225
… …
247 $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;
248 $d 249 $d
249 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
250} 251}
251 252
252=item $ref = cf::from_json $json 253=item $ref = cf::decode_json $json
253 254
254Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
255 256
256=item $json = cf::to_json $ref 257=item $json = cf::encode_json $ref
257 258
258Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
259 260
260=cut 261=cut
261 262
262our $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
263 264
264sub to_json ($) { $json_coder->encode ($_[0]) } 265sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 266sub decode_json($) { $json_coder->decode ($_[0]) }
266 267
267=item cf::lock_wait $string 268=item cf::lock_wait $string
268 269
269Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
270 271
… …
335 }; 336 };
336 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
337 $guard 338 $guard
338} 339}
339 340
341=item cf::periodic $interval, $cb
342
343Like EV::periodic, but randomly selects a starting point so that the actions
344get spread over timer.
345
346=cut
347
348sub periodic($$) {
349 my ($interval, $cb) = @_;
350
351 my $start = rand List::Util::min 180, $interval;
352
353 EV::periodic $start, $interval, 0, $cb
354}
355
340=item cf::get_slot $time[, $priority[, $name]] 356=item cf::get_slot $time[, $priority[, $name]]
341 357
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 358Allocate $time seconds of blocking CPU time at priority C<$priority>:
343This 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
344of 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.
… …
353our @SLOT_QUEUE; 369our @SLOT_QUEUE;
354our $SLOT_QUEUE; 370our $SLOT_QUEUE;
355 371
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 372$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 373$SLOT_QUEUE = Coro::async {
374 $Coro::current->desc ("timeslot manager");
375
358 my $signal = new Coro::Signal; 376 my $signal = new Coro::Signal;
359 377
360 while () { 378 while () {
361 next_job: 379 next_job:
362 my $avail = cf::till_tick; 380 my $avail = cf::till_tick;
… …
370 } 388 }
371 } 389 }
372 } 390 }
373 391
374 if (@SLOT_QUEUE) { 392 if (@SLOT_QUEUE) {
375 # 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
376 push @cf::WAIT_FOR_TICK, $signal; 394 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 395 $signal->wait;
378 } else { 396 } else {
379 Coro::schedule; 397 Coro::schedule;
380 } 398 }
… …
403 421
404BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
405 423
406=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
407 425
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 426The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 427is 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 428partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 429acceptable.
412 430
413If 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
414the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
… …
419 437
420sub sync_job(&) { 438sub sync_job(&) {
421 my ($job) = @_; 439 my ($job) = @_;
422 440
423 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 442 my $time = EV::time;
425 443
426 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
428 446
447 LOG llevError, Carp::longmess "sync job";#d#
448
429 # TODO: use suspend/resume instead 449 # TODO: use suspend/resume instead
430 # (but this is cancel-safe) 450 # (but this is cancel-safe)
431 my $freeze_guard = freeze_mainloop; 451 my $freeze_guard = freeze_mainloop;
432 452
433 my $busy = 1; 453 my $busy = 1;
434 my @res; 454 my @res;
435 455
436 (async { 456 (async {
457 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 458 @res = eval { $job->() };
438 warn $@ if $@; 459 warn $@ if $@;
439 undef $busy; 460 undef $busy;
440 })->prio (Coro::PRIO_MAX); 461 })->prio (Coro::PRIO_MAX);
441 462
442 while ($busy) { 463 while ($busy) {
443 Coro::cede or Event::one_event; 464 if (Coro::nready) {
465 Coro::cede_notself;
466 } else {
467 EV::loop EV::LOOP_ONESHOT;
444 } 468 }
469 }
445 470
446 $time = Event::time - $time; 471 $time = EV::time - $time;
447 472
448 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450 475
451 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
… …
481=item fork_call { }, $args 506=item fork_call { }, $args
482 507
483Executes the given code block with the given arguments in a seperate 508Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 509process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 510Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 511never block itself or use any form of event handling.
487 512
488=cut 513=cut
489 514
490sub fork_call(&@) { 515sub fork_call(&@) {
491 my ($cb, @args) = @_; 516 my ($cb, @args) = @_;
… …
652attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
654 679
655In 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>
656C<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
657Crossfire TRT). 682Deliantra).
658 683
659=over 4 684=over 4
660 685
661=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
662 687
… …
960 985
961=cut 986=cut
962 987
963############################################################################# 988#############################################################################
964# object support 989# object support
965#
966 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#
967sub _can_merge { 1024sub _can_merge {
968 my ($ob1, $ob2) = @_; 1025 my ($ob1, $ob2) = @_;
969 1026
970 local $Storable::canonical = 1; 1027 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1028
974 $fob1 eq $fob2 1029 # we do the slow way here
1030 return _object_equal $ob1, $ob2
975} 1031}
976 1032
977sub reattach { 1033sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1035 my ($obj) = @_;
… …
1001cf::attachable->attach ( 1057cf::attachable->attach (
1002 prio => -1000000, 1058 prio => -1000000,
1003 on_instantiate => sub { 1059 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
1005 1061
1006 $data = from_json $data; 1062 $data = decode_json $data;
1007 1063
1008 for (@$data) { 1064 for (@$data) {
1009 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
1010 1066
1011 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
… …
1024 }, 1080 },
1025); 1081);
1026 1082
1027sub object_freezer_save { 1083sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1084 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1085
1032 sync_job { 1086 sync_job {
1033 if (length $$rdata) { 1087 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1088 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1089 warn sprintf "saving %s (%d,%d)\n",
… …
1042 close $fh; 1096 close $fh;
1043 1097
1044 if (@$objs) { 1098 if (@$objs) {
1045 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) {
1046 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1104 close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1106 }
… …
1061 } else { 1115 } else {
1062 aio_unlink $filename; 1116 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1117 aio_unlink "$filename.pst";
1064 } 1118 }
1065 }; 1119 };
1066
1067 undef $guard;
1068} 1120}
1069 1121
1070sub object_freezer_as_string { 1122sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1123 my ($rdata, $objs) = @_;
1072 1124
… …
1077 1129
1078sub object_thawer_load { 1130sub object_thawer_load {
1079 my ($filename) = @_; 1131 my ($filename) = @_;
1080 1132
1081 my ($data, $av); 1133 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1134
1085 (aio_load $filename, $data) >= 0 1135 (aio_load $filename, $data) >= 0
1086 or return; 1136 or return;
1087 1137
1088 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1140 or return;
1091 1141
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
1094 } 1144 }
1095 1145
1096 utf8::decode (my $decname = $filename); 1146 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1148 $decname, length $data, scalar @{$av || []};
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1402 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1403
1354 my $f = new_from_file cf::object::thawer path $login 1404 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1405 or return;
1356 1406
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1407 my $pl = cf::player::load_pl $f
1359 or return; 1408 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1409 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1410 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1411 $cf::PLAYER{$login} = $pl
… …
1514 1563
1515Expand crossfire pod fragments into protocol xml. 1564Expand crossfire pod fragments into protocol xml.
1516 1565
1517=cut 1566=cut
1518 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
1519sub expand_cfpod { 1579sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1580 my ($self, $pod) = @_;
1521 1581
1522 # escape & and < 1582 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1583
1526 # this is buggy, it needs to properly take care of nested <'s 1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1527 1587
1528 1 while 1588 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1589 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1590
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1591 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1592 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1593 ([BCGHITU])
1534 # replace G<male|female> tags 1594 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1595 (?:
1536 $self->gender ? $2 : $1 1596 ([^<>]*) (?{ $group = $^N })
1537 }ge 1597 | < $interior >
1538 # replace H<hint text> 1598 )
1539 || s{H<([^\>]*)>} 1599 >
1600 %gcsx
1540 { 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") {
1541 ("<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>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1621 "")
1544 [$self->{hintmode}] 1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1546 1633
1634 for ($xml) {
1547 # create single paragraphs (very hackish) 1635 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1636 s/(?<=\S)\n(?=\w)/ /g;
1549 1637
1550 # compress some whitespace 1638 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1639 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1640 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1641 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1642 s/\n+$//; # ending lines
1643 }
1555 1644
1556 $_ 1645 $xml
1557} 1646}
1647
1648no re 'eval';
1558 1649
1559sub hintmode { 1650sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1652 $_[0]{hintmode}
1562} 1653}
… …
2043 } 2134 }
2044 2135
2045 $MAP_PREFETCH{$path} |= $load; 2136 $MAP_PREFETCH{$path} |= $load;
2046 2137
2047 $MAP_PREFETCHER ||= cf::async { 2138 $MAP_PREFETCHER ||= cf::async {
2139 $Coro::current->{desc} = "map prefetcher";
2140
2048 while (%MAP_PREFETCH) { 2141 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2142 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2143 if (my $map = find $k) {
2051 $map->load if $v; 2144 $map->load if $v;
2052 } 2145 }
… …
2078 return if $self->{deny_save}; 2171 return if $self->{deny_save};
2079 2172
2080 local $self->{last_access} = $self->last_access;#d# 2173 local $self->{last_access} = $self->last_access;#d#
2081 2174
2082 cf::async { 2175 cf::async {
2176 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2177 $_->contr->save for $self->players;
2084 }; 2178 };
2085 2179
2086 if ($uniq) { 2180 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2368=cut
2275 2369
2276sub deref { 2370sub deref {
2277 my ($ref) = @_; 2371 my ($ref) = @_;
2278 2372
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2373 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2374 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2375 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2376 or return;
2286 $pl->ob->uuid eq $uuid 2377 $pl->ob->uuid eq $uuid
2287 or return; 2378 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2550
2460 $self->enter_link; 2551 $self->enter_link;
2461 2552
2462 (async { 2553 (async {
2554 $Coro::current->{desc} = "player::goto $path $x $y";
2555
2463 # *tag paths override both path and x|y 2556 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2557 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2558 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2559 my $ob = $obs[rand @obs];
2560
2561 # see if we actually can go there
2562 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2563 $ob = $obs[rand @obs];
2564 } else {
2565 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2566 }
2567 # else put us there anyways for now #d#
2568
2467 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2569 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2570 } else {
2571 ($path, $x, $y) = (undef, undef, undef);
2468 } 2572 }
2469 } 2573 }
2470 2574
2471 my $map = eval { 2575 my $map = eval {
2472 my $map = cf::map::find $path; 2576 my $map = defined $path ? cf::map::find $path : undef;
2473 2577
2474 if ($map) { 2578 if ($map) {
2475 $map = $map->customise_for ($self); 2579 $map = $map->customise_for ($self);
2476 $map = $check->($map) if $check && $map; 2580 $map = $check->($map) if $check && $map;
2477 } else { 2581 } else {
2478 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2582 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2479 } 2583 }
2480 2584
2481 $map 2585 $map
2482 }; 2586 };
2483 2587
… …
2536 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2537 } 2641 }
2538 2642
2539 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2540 2644
2541 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2542 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2543 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2544 2648
2545 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2546 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
… …
2573 # if exit is damned, update players death & WoR home-position 2677 # if exit is damned, update players death & WoR home-position
2574 $self->contr->savebed ($slaying, $hp, $sp) 2678 $self->contr->savebed ($slaying, $hp, $sp)
2575 if $exit->flag (FLAG_DAMNED); 2679 if $exit->flag (FLAG_DAMNED);
2576 2680
2577 (async { 2681 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2683
2578 $self->deactivate_recursive; # just to be sure 2684 $self->deactivate_recursive; # just to be sure
2579 unless (eval { 2685 unless (eval {
2580 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($slaying, $hp, $sp);
2581 2687
2582 1; 2688 1;
… …
2617the 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
2618the message unless the client supports the msg packet. 2724the message unless the client supports the msg packet.
2619 2725
2620=cut 2726=cut
2621 2727
2728# non-persistent channels (usually the info channel)
2622our %CHANNEL = ( 2729our %CHANNEL = (
2623 "c/identify" => { 2730 "c/identify" => {
2624 id => "identify", 2731 id => "infobox",
2625 title => "Identify", 2732 title => "Identify",
2626 reply => undef, 2733 reply => undef,
2627 tooltip => "Items recently identified", 2734 tooltip => "Items recently identified",
2628 }, 2735 },
2629 "c/examine" => { 2736 "c/examine" => {
2630 id => "examine", 2737 id => "infobox",
2631 title => "Examine", 2738 title => "Examine",
2632 reply => undef, 2739 reply => undef,
2633 tooltip => "Signs and other items you examined", 2740 tooltip => "Signs and other items you examined",
2634 }, 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 },
2635); 2778);
2636 2779
2637sub cf::client::send_msg { 2780sub cf::client::send_msg {
2638 my ($self, $channel, $msg, $color, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
2639 2782
2640 $msg = $self->pl->expand_cfpod ($msg); 2783 $msg = $self->pl->expand_cfpod ($msg);
2641 2784
2642 $color &= cf::NDI_CLIENT_MASK; # just in case... 2785 $color &= cf::NDI_CLIENT_MASK; # just in case...
2643 2786
2644 # check predefined channels, for the benefit of C 2787 # check predefined channels, for the benefit of C
2645 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2788 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel};
2646 2790
2791 $self->ext_msg (channel_info => $channel)
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id};
2795
2647 if (ref $channel) { 2796 } elsif (ref $channel) {
2648 # send meta info to client, if not yet sent 2797 # send meta info to client, if not yet sent
2649 unless (exists $self->{channel}{$channel->{id}}) { 2798 unless (exists $self->{channel}{$channel->{id}}) {
2650 $self->{channel}{$channel->{id}} = $channel; 2799 $self->{channel}{$channel->{id}} = $channel;
2651 $self->ext_msg (channel_info => $channel) 2800 $self->ext_msg (channel_info => $channel)
2652 if $self->can_msg; 2801 if $self->can_msg;
… …
2869=pod 3018=pod
2870 3019
2871The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2872 3021
2873 cf::object 3022 cf::object
2874 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
2875 insert remove name archname title slaying race decrease_ob_nr 3024 insert remove name archname title slaying race decrease_ob_nr
2876 3025
2877 cf::object::player 3026 cf::object::player
2878 player 3027 player
2879 3028
… …
2886=cut 3035=cut
2887 3036
2888for ( 3037for (
2889 ["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
2890 insert remove inv name archname title slaying race 3039 insert remove inv name archname title slaying race
2891 decrease_ob_nr)], 3040 decrease_ob_nr destroy)],
2892 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2893 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2894 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2895) { 3044) {
2896 no strict 'refs'; 3045 no strict 'refs';
… …
3001 { 3150 {
3002 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
3003 3152
3004 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
3005 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
3006 cf::face::set_visibility $idx, $info->{visibility}; 3156 cf::face::set_visibility $idx, $info->{visibility};
3007 cf::face::set_magicmap $idx, $info->{magicmap}; 3157 cf::face::set_magicmap $idx, $info->{magicmap};
3008 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};
3009 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};
3010 3160
3011 cf::cede_to_tick; 3161 cf::cede_to_tick;
3012 } 3162 }
3013 3163
3014 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
3015 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
3016 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
3017 or next; 3168 or next;
3169
3018 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
3019 cf::face::set_smooth $idx, $smooth; 3171 cf::face::set_smooth $idx, $smooth;
3020 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3021 } else { 3173 } else {
3022 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3040 { 3192 {
3041 # TODO: for gcfclient pleasure, we should give resources 3193 # TODO: for gcfclient pleasure, we should give resources
3042 # that gcfclient doesn't grok a >10000 face index. 3194 # that gcfclient doesn't grok a >10000 face index.
3043 my $res = $facedata->{resource}; 3195 my $res = $facedata->{resource};
3044 3196
3045 my $soundconf = delete $res->{"res/sound.conf"};
3046
3047 while (my ($name, $info) = each %$res) { 3197 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) {
3048 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3049 my $data; 3200 my $data;
3050 3201
3051 if ($info->{type} & 1) { 3202 if ($info->{type} & 1) {
3052 # prepend meta info 3203 # prepend meta info
3053 3204
3054 my $meta = $enc->encode ({ 3205 my $meta = $enc->encode ({
3055 name => $name, 3206 name => $name,
3056 %{ $info->{meta} || {} }, 3207 %{ $info->{meta} || {} },
3057 }); 3208 });
3058 3209
3059 $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};
3060 } else { 3217 } else {
3061 $data = $info->{data}; 3218 $RESOURCE{$name} = $info;
3062 } 3219 }
3063 3220
3064 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3065 cf::face::set_type $idx, $info->{type};
3066
3067 cf::cede_to_tick; 3221 cf::cede_to_tick;
3068 } 3222 }
3069 3223
3070 if ($soundconf) { 3224 if (my $soundconf = delete $res->{"res/sound.conf"}) {
3071 $soundconf = $enc->decode (delete $soundconf->{data}); 3225 $soundconf = $enc->decode (delete $soundconf->{data});
3072 3226
3073 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3227 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3074 my $sound = $soundconf->{compat}[$_] 3228 my $sound = $soundconf->{compat}[$_]
3075 or next; 3229 or next;
… …
3171sub main { 3325sub main {
3172 # we must not ever block the main coroutine 3326 # we must not ever block the main coroutine
3173 local $Coro::idle = sub { 3327 local $Coro::idle = sub {
3174 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3328 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3175 (async { 3329 (async {
3176 Event::one_event; 3330 $Coro::current->{desc} = "IDLE BUG HANDLER";
3331 EV::loop EV::LOOP_ONESHOT;
3177 })->prio (Coro::PRIO_MAX); 3332 })->prio (Coro::PRIO_MAX);
3178 }; 3333 };
3179 3334
3180 reload_config; 3335 reload_config;
3181 db_init; 3336 db_init;
3182 load_extensions; 3337 load_extensions;
3183 3338
3184 $TICK_WATCHER->start; 3339 $TICK_WATCHER->start;
3340 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3185 Event::loop; 3341 EV::loop;
3186} 3342}
3187 3343
3188############################################################################# 3344#############################################################################
3189# initialisation and cleanup 3345# initialisation and cleanup
3190 3346
3191# install some emergency cleanup handlers 3347# install some emergency cleanup handlers
3192BEGIN { 3348BEGIN {
3349 our %SIGWATCHER = ();
3193 for my $signal (qw(INT HUP TERM)) { 3350 for my $signal (qw(INT HUP TERM)) {
3194 Event->signal ( 3351 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3195 reentrant => 0,
3196 data => WF_AUTOCANCEL,
3197 signal => $signal,
3198 prio => 0,
3199 cb => sub {
3200 cf::cleanup "SIG$signal"; 3352 cf::cleanup "SIG$signal";
3201 },
3202 ); 3353 };
3203 } 3354 }
3204} 3355}
3205 3356
3206sub write_runtime { 3357sub write_runtime {
3207 my $runtime = "$LOCALDIR/runtime"; 3358 my $runtime = "$LOCALDIR/runtime";
… …
3252 # and maps saved/destroyed asynchronously. 3403 # and maps saved/destroyed asynchronously.
3253 warn "begin emergency player save\n"; 3404 warn "begin emergency player save\n";
3254 for my $login (keys %cf::PLAYER) { 3405 for my $login (keys %cf::PLAYER) {
3255 my $pl = $cf::PLAYER{$login} or next; 3406 my $pl = $cf::PLAYER{$login} or next;
3256 $pl->valid or next; 3407 $pl->valid or next;
3408 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3257 $pl->save; 3409 $pl->save;
3258 } 3410 }
3259 warn "end emergency player save\n"; 3411 warn "end emergency player save\n";
3260 3412
3261 warn "begin emergency map save\n"; 3413 warn "begin emergency map save\n";
… …
3300 warn "syncing database to disk"; 3452 warn "syncing database to disk";
3301 BDB::db_env_txn_checkpoint $DB_ENV; 3453 BDB::db_env_txn_checkpoint $DB_ENV;
3302 3454
3303 # if anything goes wrong in here, we should simply crash as we already saved 3455 # if anything goes wrong in here, we should simply crash as we already saved
3304 3456
3305 warn "cancelling all WF_AUTOCANCEL watchers";
3306 for (Event::all_watchers) {
3307 $_->cancel if $_->data & WF_AUTOCANCEL;
3308 }
3309
3310 warn "flushing outstanding aio requests"; 3457 warn "flushing outstanding aio requests";
3311 for (;;) { 3458 for (;;) {
3312 BDB::flush; 3459 BDB::flush;
3313 IO::AIO::flush; 3460 IO::AIO::flush;
3314 Coro::cede; 3461 Coro::cede_notself;
3315 last unless IO::AIO::nreqs || BDB::nreqs; 3462 last unless IO::AIO::nreqs || BDB::nreqs;
3316 warn "iterate..."; 3463 warn "iterate...";
3317 } 3464 }
3318 3465
3319 ++$RELOAD; 3466 ++$RELOAD;
… …
3408 3555
3409sub reload_perl() { 3556sub reload_perl() {
3410 # doing reload synchronously and two reloads happen back-to-back, 3557 # doing reload synchronously and two reloads happen back-to-back,
3411 # coro crashes during coro_state_free->destroy here. 3558 # coro crashes during coro_state_free->destroy here.
3412 3559
3413 $RELOAD_WATCHER ||= Event->timer ( 3560 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3414 reentrant => 0,
3415 after => 0,
3416 data => WF_AUTOCANCEL,
3417 cb => sub {
3418 do_reload_perl;
3419 undef $RELOAD_WATCHER; 3561 undef $RELOAD_WATCHER;
3420 }, 3562 do_reload_perl;
3421 ); 3563 };
3422} 3564}
3423 3565
3424register_command "reload" => sub { 3566register_command "reload" => sub {
3425 my ($who, $arg) = @_; 3567 my ($who, $arg) = @_;
3426 3568
3427 if ($who->flag (FLAG_WIZ)) { 3569 if ($who->flag (FLAG_WIZ)) {
3428 $who->message ("reloading server."); 3570 $who->message ("reloading server.");
3571 async {
3572 $Coro::current->{desc} = "perl_reload";
3429 async { reload_perl }; 3573 reload_perl;
3574 };
3430 } 3575 }
3431}; 3576};
3432 3577
3433unshift @INC, $LIBDIR; 3578unshift @INC, $LIBDIR;
3434 3579
… …
3453 my $signal = new Coro::Signal; 3598 my $signal = new Coro::Signal;
3454 push @WAIT_FOR_TICK_BEGIN, $signal; 3599 push @WAIT_FOR_TICK_BEGIN, $signal;
3455 $signal->wait; 3600 $signal->wait;
3456} 3601}
3457 3602
3458our $stat_fh; 3603$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3459sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3460
3461$TICK_WATCHER = Event->timer (
3462 reentrant => 0,
3463 parked => 1,
3464 prio => 0,
3465 at => $NEXT_TICK || $TICK,
3466 data => WF_AUTOCANCEL,
3467 cb => sub {
3468 if ($Coro::current != $Coro::main) { 3604 if ($Coro::current != $Coro::main) {
3469 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3470 unless ++$bug_warning > 10; 3606 unless ++$bug_warning > 10;
3471 return; 3607 return;
3472 } 3608 }
3473 3609
3474 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3475
3476 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = EV::now;
3477 3611
3478 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3479 3613
3480 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
3481 $NEXT_TICK += $TICK; 3615 $NEXT_TICK = $_[0]->at;
3482 3616
3483 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3484 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3485 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
3486 write_runtime 3621 write_runtime
3487 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3488 };
3489 } 3623 };
3624 }
3490 3625
3491# my $AFTER = Event::time;
3492# warn $AFTER - $NOW;#d#
3493
3494 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3495 $sig->send; 3627 $sig->send;
3496 } 3628 }
3497 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3498 $sig->send; 3630 $sig->send;
3499 } 3631 }
3500 3632
3501 $NOW = Event::time;
3502
3503 # if we are delayed by four ticks or more, skip them all
3504 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3505
3506 $TICK_WATCHER->at ($NEXT_TICK);
3507 $TICK_WATCHER->start;
3508
3509 $LOAD = ($NOW - $tick_start) / $TICK; 3633 $LOAD = ($NOW - $tick_start) / $TICK;
3510 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3634 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3511 3635
3512 _post_tick; 3636 _post_tick;
3513 3637};
3514 # gather some statistics#d# 3638$TICK_WATCHER->priority (EV::MAXPRI);
3515 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3516 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3517 },
3518);
3519 3639
3520{ 3640{
3641 # configure BDB
3642
3521 BDB::min_parallel 8; 3643 BDB::min_parallel 8;
3522 BDB::max_poll_time $TICK * 0.1; 3644 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 3645 $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 3646
3547 unless ($DB_ENV) { 3647 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 3648 $DB_ENV = BDB::db_env_create;
3649 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3650 | BDB::LOG_AUTOREMOVE, 1);
3651 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3652 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3549 3653
3550 cf::sync_job { 3654 cf::sync_job {
3551 eval { 3655 eval {
3552 BDB::db_env_open 3656 BDB::db_env_open
3553 $DB_ENV, 3657 $DB_ENV,
… …
3555 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3659 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3556 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3660 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3557 0666; 3661 0666;
3558 3662
3559 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3663 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3560
3561 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3562 | BDB::LOG_AUTOREMOVE, 1);
3563 $DB_ENV->set_lk_detect;
3564 }; 3664 };
3565 3665
3566 cf::cleanup "db_env_open(db): $@" if $@; 3666 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 3667 };
3568 } 3668 }
3569 3669
3570 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3670 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 11, 3671 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3572 interval => 60, 3672 };
3573 hard => 1, 3673 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3674 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3578 },
3579 ); 3675 };
3580 $BDB_TRICKLE_WATCHER = Event->timer ( 3676 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3581 after => 5,
3582 interval => 10,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3677 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3588 },
3589 ); 3678 };
3590} 3679}
3591 3680
3592{ 3681{
3682 # configure IO::AIO
3683
3593 IO::AIO::min_parallel 8; 3684 IO::AIO::min_parallel 8;
3594
3595 undef $Coro::AIO::WATCHER;
3596 IO::AIO::max_poll_time $TICK * 0.1; 3685 IO::AIO::max_poll_time $TICK * 0.1;
3597 $AIO_POLL_WATCHER = Event->io ( 3686 $Coro::AIO::WATCHER->priority (1);
3598 reentrant => 0,
3599 data => WF_AUTOCANCEL,
3600 fd => IO::AIO::poll_fileno,
3601 poll => 'r',
3602 prio => 6,
3603 cb => \&IO::AIO::poll_cb,
3604 );
3605} 3687}
3606 3688
3607my $_log_backtrace; 3689my $_log_backtrace;
3608 3690
3609sub _log_backtrace { 3691sub _log_backtrace {
… …
3613 3695
3614 # limit the # of concurrent backtraces 3696 # limit the # of concurrent backtraces
3615 if ($_log_backtrace < 2) { 3697 if ($_log_backtrace < 2) {
3616 ++$_log_backtrace; 3698 ++$_log_backtrace;
3617 async { 3699 async {
3700 $Coro::current->{desc} = "abt $msg";
3701
3618 my @bt = fork_call { 3702 my @bt = fork_call {
3619 @addr = map { sprintf "%x", $_ } @addr; 3703 @addr = map { sprintf "%x", $_ } @addr;
3620 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3704 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3621 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3705 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3622 or die "addr2line: $!"; 3706 or die "addr2line: $!";

Diff Legend

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