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.358 by root, Fri Sep 7 18:10:52 2007 UTC vs.
Revision 1.397 by root, Mon Nov 19 15:47:14 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
… …
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
38# 38#
39$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 42
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
47 45
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
… …
80our $NEXT_TICK; 78our $NEXT_TICK;
81our $NOW; 79our $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;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 86our $DB_ENV;
86 87
87our %CFG; 88our %CFG;
88 89
89our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
… …
159 160
160The raw value load value from the last tick. 161The raw value load value from the last tick.
161 162
162=item %cf::CFG 163=item %cf::CFG
163 164
164Configuration for the server, loaded from C</etc/crossfire/config>, or 165Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 166from wherever your confdir points to.
166 167
167=item cf::wait_for_tick, cf::wait_for_tick_begin 168=item cf::wait_for_tick, cf::wait_for_tick_begin
168 169
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 170These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
187 $msg .= "\n" 188 $msg .= "\n"
188 unless $msg =~ /\n$/; 189 unless $msg =~ /\n$/;
189 190
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 192
192 utf8::encode $msg;
193 LOG llevError, $msg; 193 LOG llevError, $msg;
194 }; 194 };
195} 195}
196 196
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
213)) { 213)) {
214 no strict 'refs'; 214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 216}
217 217
218$Event::DIED = sub { 218$EV::DIED = sub {
219 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
220}; 220};
221 221
222############################################################################# 222#############################################################################
223 223
… …
334 }; 334 };
335 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
336 $guard 336 $guard
337} 337}
338 338
339=item cf::periodic $interval, $cb
340
341Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer.
343
344=cut
345
346sub periodic($$) {
347 my ($interval, $cb) = @_;
348
349 my $start = rand List::Util::min 180, $interval;
350
351 EV::periodic $start, $interval, 0, $cb
352}
353
339=item cf::get_slot $time[, $priority[, $name]] 354=item cf::get_slot $time[, $priority[, $name]]
340 355
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 356Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds 357This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede. 358of cpu time till the next tick. The slot is only valid till the next cede.
… …
352our @SLOT_QUEUE; 367our @SLOT_QUEUE;
353our $SLOT_QUEUE; 368our $SLOT_QUEUE;
354 369
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 370$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 371$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager");
373
357 my $signal = new Coro::Signal; 374 my $signal = new Coro::Signal;
358 375
359 while () { 376 while () {
360 next_job: 377 next_job:
361 my $avail = cf::till_tick; 378 my $avail = cf::till_tick;
… …
369 } 386 }
370 } 387 }
371 } 388 }
372 389
373 if (@SLOT_QUEUE) { 390 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 391 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 392 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 393 $signal->wait;
377 } else { 394 } else {
378 Coro::schedule; 395 Coro::schedule;
379 } 396 }
… …
402 419
403BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
404 421
405=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
406 423
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 424The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 425is always able to handle events or runnable, as Deliantra is only
409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 426partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 427acceptable.
411 428
412If it must be done, put the blocking parts into C<sync_job>. This will run 429If it must be done, put the blocking parts into C<sync_job>. This will run
413the given BLOCK in another coroutine while waiting for the result. The 430the given BLOCK in another coroutine while waiting for the result. The
… …
418 435
419sub sync_job(&) { 436sub sync_job(&) {
420 my ($job) = @_; 437 my ($job) = @_;
421 438
422 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 440 my $time = EV::time;
424 441
425 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
427 444
445 LOG llevError, Carp::longmess "sync job";#d#
446
428 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
429 # (but this is cancel-safe) 448 # (but this is cancel-safe)
430 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
431 450
432 my $busy = 1; 451 my $busy = 1;
433 my @res; 452 my @res;
434 453
435 (async { 454 (async {
455 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 456 @res = eval { $job->() };
437 warn $@ if $@; 457 warn $@ if $@;
438 undef $busy; 458 undef $busy;
439 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
440 460
441 while ($busy) { 461 while ($busy) {
442 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
443 } 466 }
467 }
444 468
445 $time = Event::time - $time; 469 $time = EV::time - $time;
446 470
447 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449 473
450 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
… …
480=item fork_call { }, $args 504=item fork_call { }, $args
481 505
482Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
486 510
487=cut 511=cut
488 512
489sub fork_call(&@) { 513sub fork_call(&@) {
490 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
… …
508=item cf::db_put $family => $key => $value 532=item cf::db_put $family => $key => $value
509 533
510Stores the given C<$value> in the family. It can currently store binary 534Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 535data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 536
537=item $db = cf::db_table "name"
538
539Create and/or open a new database table. The string must not be "db" and must be unique
540within each server.
541
513=cut 542=cut
543
544sub db_table($) {
545 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV;
547
548 eval {
549 $db->set_flags (BDB::CHKSUM);
550
551 utf8::encode $name;
552 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
553 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
554 cf::cleanup "db_open(db): $!" if $!;
555 };
556 cf::cleanup "db_open(db): $@" if $@;
557
558 $db
559}
514 560
515our $DB; 561our $DB;
516 562
517sub db_init { 563sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 564 cf::sync_job {
522 eval { 565 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 566 };
532} 567}
533 568
534sub db_get($$) { 569sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 570 my $key = "$_[0]/$_[1]";
536 571
… …
640attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
642 677
643In the following description, CLASS can be any of C<global>, C<object> 678In the following description, CLASS can be any of C<global>, C<object>
644C<player>, C<client> or C<map> (i.e. the attachable objects in 679C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 680Deliantra).
646 681
647=over 4 682=over 4
648 683
649=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
650 685
… …
948 983
949=cut 984=cut
950 985
951############################################################################# 986#############################################################################
952# object support 987# object support
953#
954 988
989sub _object_equal($$);
990sub _object_equal($$) {
991 my ($a, $b) = @_;
992
993 return 0 unless (ref $a) eq (ref $b);
994
995 if ("HASH" eq ref $a) {
996 my @ka = keys %$a;
997 my @kb = keys %$b;
998
999 return 0 if @ka != @kb;
1000
1001 for (0 .. $#ka) {
1002 return 0 unless $ka[$_] eq $kb[$_];
1003 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1004 }
1005
1006 } elsif ("ARRAY" eq ref $a) {
1007
1008 return 0 if @$a != @$b;
1009
1010 for (0 .. $#$a) {
1011 return 0 unless _object_equal $a->[$_], $b->[$_];
1012 }
1013
1014 } elsif ($a ne $b) {
1015 return 0;
1016 }
1017
1018 1
1019}
1020
1021our $SLOW_MERGES;#d#
955sub _can_merge { 1022sub _can_merge {
956 my ($ob1, $ob2) = @_; 1023 my ($ob1, $ob2) = @_;
957 1024
958 local $Storable::canonical = 1; 1025 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1026
962 $fob1 eq $fob2 1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
963} 1029}
964 1030
965sub reattach { 1031sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1033 my ($obj) = @_;
… …
1013); 1079);
1014 1080
1015sub object_freezer_save { 1081sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1082 my ($filename, $rdata, $objs) = @_;
1017 1083
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1084 sync_job {
1021 if (length $$rdata) { 1085 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1087 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1088 $decname, length $$rdata, scalar @$objs;
1024 1089
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1091 chmod SAVE_MODE, $fh;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1093 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1094 close $fh;
1030 1095
1031 if (@$objs) { 1096 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1102 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1104 }
… …
1048 } else { 1113 } else {
1049 aio_unlink $filename; 1114 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1115 aio_unlink "$filename.pst";
1051 } 1116 }
1052 }; 1117 };
1053
1054 undef $guard;
1055} 1118}
1056 1119
1057sub object_freezer_as_string { 1120sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1121 my ($rdata, $objs) = @_;
1059 1122
… …
1064 1127
1065sub object_thawer_load { 1128sub object_thawer_load {
1066 my ($filename) = @_; 1129 my ($filename) = @_;
1067 1130
1068 my ($data, $av); 1131 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1132
1072 (aio_load $filename, $data) >= 0 1133 (aio_load $filename, $data) >= 0
1073 or return; 1134 or return;
1074 1135
1075 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1138 or return;
1078 1139
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1140 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs};
1081 } 1142 }
1082 1143
1144 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1146 $decname, length $data, scalar @{$av || []};
1085 1147
1086 ($data, $av) 1148 ($data, $av)
1087} 1149}
1088 1150
1089=head2 COMMAND CALLBACKS 1151=head2 COMMAND CALLBACKS
… …
1277 1339
1278=head3 cf::player 1340=head3 cf::player
1279 1341
1280=over 4 1342=over 4
1281 1343
1344=item cf::player::num_playing
1345
1346Returns the official number of playing players, as per the Crossfire metaserver rules.
1347
1348=cut
1349
1350sub num_playing {
1351 scalar grep
1352 $_->ob->map
1353 && !$_->hidden
1354 && !$_->ob->flag (cf::FLAG_WIZ),
1355 cf::player::list
1356}
1357
1282=item cf::player::find $login 1358=item cf::player::find $login
1283 1359
1284Returns the given player object, loading it if necessary (might block). 1360Returns the given player object, loading it if necessary (might block).
1285 1361
1286=cut 1362=cut
… …
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1400 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1401
1326 my $f = new_from_file cf::object::thawer path $login 1402 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1403 or return;
1328 1404
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1405 my $pl = cf::player::load_pl $f
1331 or return; 1406 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1407 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1408 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1409 $cf::PLAYER{$login} = $pl
… …
1486 1561
1487Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1488 1563
1489=cut 1564=cut
1490 1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1491sub expand_cfpod { 1577sub expand_cfpod {
1492 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1493 1579
1494 # escape & and < 1580 my $xml;
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497 1581
1498 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1499 1585
1500 1 while 1586 $group =~ s/&/&amp;/g;
1501 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1502 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1503 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1504 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1591 ([BCGHITU])
1506 # replace G<male|female> tags 1592 <
1507 || s{G<([^>|]*)\|([^>]*)>}{ 1593 (?:
1508 $self->gender ? $2 : $1 1594 ([^<>]*) (?{ $group = $^N })
1509 }ge 1595 | < $interior >
1510 # replace H<hint text> 1596 )
1511 || s{H<([^\>]*)>} 1597 >
1598 %gcsx
1512 { 1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "") 1619 "")
1516 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1517 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1518 1631
1632 for ($xml) {
1519 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1521 1635
1522 # compress some whitespace 1636 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1527 1642
1528 $_ 1643 $xml
1529} 1644}
1645
1646no re 'eval';
1530 1647
1531sub hintmode { 1648sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode} 1650 $_[0]{hintmode}
1534} 1651}
… …
1891 2008
1892 { 2009 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 2010 my $guard = cf::lock_acquire "map_data:$path";
1894 2011
1895 return unless $self->valid; 2012 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2013 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2014
1898 $self->in_memory (cf::MAP_LOADING); 2015 $self->in_memory (cf::MAP_LOADING);
1899 2016
1900 $self->alloc; 2017 $self->alloc;
1901 2018
… …
2015 } 2132 }
2016 2133
2017 $MAP_PREFETCH{$path} |= $load; 2134 $MAP_PREFETCH{$path} |= $load;
2018 2135
2019 $MAP_PREFETCHER ||= cf::async { 2136 $MAP_PREFETCHER ||= cf::async {
2137 $Coro::current->{desc} = "map prefetcher";
2138
2020 while (%MAP_PREFETCH) { 2139 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2140 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2141 if (my $map = find $k) {
2023 $map->load if $v; 2142 $map->load if $v;
2024 } 2143 }
… …
2050 return if $self->{deny_save}; 2169 return if $self->{deny_save};
2051 2170
2052 local $self->{last_access} = $self->last_access;#d# 2171 local $self->{last_access} = $self->last_access;#d#
2053 2172
2054 cf::async { 2173 cf::async {
2174 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2175 $_->contr->save for $self->players;
2056 }; 2176 };
2057 2177
2058 if ($uniq) { 2178 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2073 2193
2074 return if $self->players; 2194 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY; 2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
2076 return if $self->{deny_save}; 2196 return if $self->{deny_save};
2077 2197
2198 $self->in_memory (cf::MAP_SWAPPED);
2199
2078 $self->deactivate; 2200 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2202 $self->clear;
2080 $self->in_memory (cf::MAP_SWAPPED);
2081} 2203}
2082 2204
2083sub reset_at { 2205sub reset_at {
2084 my ($self) = @_; 2206 my ($self) = @_;
2085 2207
… …
2118 } 2240 }
2119 2241
2120 delete $cf::MAP{$self->path}; 2242 delete $cf::MAP{$self->path};
2121 2243
2122 $self->deactivate; 2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2123 $self->clear; 2246 $self->clear;
2124
2125 $_->clear_links_to ($self) for values %cf::MAP;
2126 2247
2127 $self->unlink_save; 2248 $self->unlink_save;
2128 $self->destroy; 2249 $self->destroy;
2129} 2250}
2130 2251
… …
2245=cut 2366=cut
2246 2367
2247sub deref { 2368sub deref {
2248 my ($ref) = @_; 2369 my ($ref) = @_;
2249 2370
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2371 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2); 2372 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2373 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return; 2374 or return;
2257 $pl->ob->uuid eq $uuid 2375 $pl->ob->uuid eq $uuid
2258 or return; 2376 or return;
… …
2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2430 2548
2431 $self->enter_link; 2549 $self->enter_link;
2432 2550
2433 (async { 2551 (async {
2552 $Coro::current->{desc} = "player::goto $path $x $y";
2553
2554 # *tag paths override both path and x|y
2555 if ($path =~ /^\*(.*)$/) {
2556 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2557 my $ob = $obs[rand @obs];
2558
2559 # see if we actually can go there
2560 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2561 $ob = $obs[rand @obs];
2562 } else {
2563 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2564 }
2565 # else put us there anyways for now #d#
2566
2567 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2568 } else {
2569 ($path, $x, $y) = (undef, undef, undef);
2570 }
2571 }
2572
2434 my $map = eval { 2573 my $map = eval {
2435 my $map = cf::map::find $path; 2574 my $map = defined $path ? cf::map::find $path : undef;
2436 2575
2437 if ($map) { 2576 if ($map) {
2438 $map = $map->customise_for ($self); 2577 $map = $map->customise_for ($self);
2439 $map = $check->($map) if $check && $map; 2578 $map = $check->($map) if $check && $map;
2440 } else { 2579 } else {
2441 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2442 } 2581 }
2443 2582
2444 $map 2583 $map
2445 }; 2584 };
2446 2585
… …
2536 # if exit is damned, update players death & WoR home-position 2675 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp) 2676 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED); 2677 if $exit->flag (FLAG_DAMNED);
2539 2678
2540 (async { 2679 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2681
2541 $self->deactivate_recursive; # just to be sure 2682 $self->deactivate_recursive; # just to be sure
2542 unless (eval { 2683 unless (eval {
2543 $self->goto ($slaying, $hp, $sp); 2684 $self->goto ($slaying, $hp, $sp);
2544 2685
2545 1; 2686 1;
… …
2580the message, with C<log> being the default. If C<$color> is negative, suppress 2721the message, with C<log> being the default. If C<$color> is negative, suppress
2581the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2582 2723
2583=cut 2724=cut
2584 2725
2726# non-persistent channels (usually the info channel)
2585our %CHANNEL = ( 2727our %CHANNEL = (
2586 "c/identify" => { 2728 "c/identify" => {
2587 id => "identify", 2729 id => "infobox",
2588 title => "Identify", 2730 title => "Identify",
2589 reply => undef, 2731 reply => undef,
2590 tooltip => "Items recently identified", 2732 tooltip => "Items recently identified",
2591 }, 2733 },
2592 "c/examine" => { 2734 "c/examine" => {
2593 id => "examine", 2735 id => "infobox",
2594 title => "Examine", 2736 title => "Examine",
2595 reply => undef, 2737 reply => undef,
2596 tooltip => "Signs and other items you examined", 2738 tooltip => "Signs and other items you examined",
2597 }, 2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2746 "c/lookat" => {
2747 id => "infobox",
2748 title => "Look",
2749 reply => undef,
2750 tooltip => "What you saw there",
2751 },
2752 "c/who" => {
2753 id => "infobox",
2754 title => "Players",
2755 reply => undef,
2756 tooltip => "Shows players who are currently online",
2757 },
2758 "c/body" => {
2759 id => "infobox",
2760 title => "Body Parts",
2761 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available",
2763 },
2764 "c/uptime" => {
2765 id => "infobox",
2766 title => "Uptime",
2767 reply => undef,
2768 tooltip => "How long the server has been running since last restart",
2769 },
2770 "c/mapinfo" => {
2771 id => "infobox",
2772 title => "Map Info",
2773 reply => undef,
2774 tooltip => "Information related to the maps",
2775 },
2598); 2776);
2599 2777
2600sub cf::client::send_msg { 2778sub cf::client::send_msg {
2601 my ($self, $channel, $msg, $color, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
2602 2780
2603 $msg = $self->pl->expand_cfpod ($msg); 2781 $msg = $self->pl->expand_cfpod ($msg);
2604 2782
2605 $color &= cf::NDI_CLIENT_MASK; # just in case... 2783 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606 2784
2607 # check predefined channels, for the benefit of C 2785 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2786 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel};
2609 2788
2789 $self->ext_msg (channel_info => $channel)
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id};
2793
2610 if (ref $channel) { 2794 } elsif (ref $channel) {
2611 # send meta info to client, if not yet sent 2795 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) { 2796 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel; 2797 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel) 2798 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg; 2799 if $self->can_msg;
… …
2832=pod 3016=pod
2833 3017
2834The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2835 3019
2836 cf::object 3020 cf::object
2837 contr pay_amount pay_player map x y force_find force_add 3021 contr pay_amount pay_player map x y force_find force_add destroy
2838 insert remove name archname title slaying race decrease_ob_nr 3022 insert remove name archname title slaying race decrease_ob_nr
2839 3023
2840 cf::object::player 3024 cf::object::player
2841 player 3025 player
2842 3026
… …
2849=cut 3033=cut
2850 3034
2851for ( 3035for (
2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race 3037 insert remove inv name archname title slaying race
2854 decrease_ob_nr)], 3038 decrease_ob_nr destroy)],
2855 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2856 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2857 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2858) { 3042) {
2859 no strict 'refs'; 3043 no strict 'refs';
… …
3134sub main { 3318sub main {
3135 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
3136 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
3137 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3138 (async { 3322 (async {
3139 Event::one_event; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT;
3140 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
3141 }; 3326 };
3142 3327
3143 reload_config; 3328 reload_config;
3144 db_init; 3329 db_init;
3145 load_extensions; 3330 load_extensions;
3146 3331
3147 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3148 Event::loop; 3334 EV::loop;
3149} 3335}
3150 3336
3151############################################################################# 3337#############################################################################
3152# initialisation and cleanup 3338# initialisation and cleanup
3153 3339
3154# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
3155BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
3156 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
3157 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3158 reentrant => 0,
3159 data => WF_AUTOCANCEL,
3160 signal => $signal,
3161 prio => 0,
3162 cb => sub {
3163 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
3164 },
3165 ); 3346 };
3166 } 3347 }
3167} 3348}
3168 3349
3169sub write_runtime { 3350sub write_runtime {
3170 my $runtime = "$LOCALDIR/runtime"; 3351 my $runtime = "$LOCALDIR/runtime";
… …
3215 # and maps saved/destroyed asynchronously. 3396 # and maps saved/destroyed asynchronously.
3216 warn "begin emergency player save\n"; 3397 warn "begin emergency player save\n";
3217 for my $login (keys %cf::PLAYER) { 3398 for my $login (keys %cf::PLAYER) {
3218 my $pl = $cf::PLAYER{$login} or next; 3399 my $pl = $cf::PLAYER{$login} or next;
3219 $pl->valid or next; 3400 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3220 $pl->save; 3402 $pl->save;
3221 } 3403 }
3222 warn "end emergency player save\n"; 3404 warn "end emergency player save\n";
3223 3405
3224 warn "begin emergency map save\n"; 3406 warn "begin emergency map save\n";
… …
3263 warn "syncing database to disk"; 3445 warn "syncing database to disk";
3264 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
3265 3447
3266 # if anything goes wrong in here, we should simply crash as we already saved 3448 # if anything goes wrong in here, we should simply crash as we already saved
3267 3449
3268 warn "cancelling all WF_AUTOCANCEL watchers";
3269 for (Event::all_watchers) {
3270 $_->cancel if $_->data & WF_AUTOCANCEL;
3271 }
3272
3273 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
3274 for (;;) { 3451 for (;;) {
3275 BDB::flush; 3452 BDB::flush;
3276 IO::AIO::flush; 3453 IO::AIO::flush;
3277 Coro::cede; 3454 Coro::cede_notself;
3278 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
3279 warn "iterate..."; 3456 warn "iterate...";
3280 } 3457 }
3281 3458
3282 ++$RELOAD; 3459 ++$RELOAD;
… …
3371 3548
3372sub reload_perl() { 3549sub reload_perl() {
3373 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
3374 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
3375 3552
3376 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3377 reentrant => 0,
3378 after => 0,
3379 data => WF_AUTOCANCEL,
3380 cb => sub {
3381 do_reload_perl;
3382 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
3383 }, 3555 do_reload_perl;
3384 ); 3556 };
3385} 3557}
3386 3558
3387register_command "reload" => sub { 3559register_command "reload" => sub {
3388 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
3389 3561
3390 if ($who->flag (FLAG_WIZ)) { 3562 if ($who->flag (FLAG_WIZ)) {
3391 $who->message ("reloading server."); 3563 $who->message ("reloading server.");
3564 async {
3565 $Coro::current->{desc} = "perl_reload";
3392 async { reload_perl }; 3566 reload_perl;
3567 };
3393 } 3568 }
3394}; 3569};
3395 3570
3396unshift @INC, $LIBDIR; 3571unshift @INC, $LIBDIR;
3397 3572
… …
3416 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
3417 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
3418 $signal->wait; 3593 $signal->wait;
3419} 3594}
3420 3595
3421 my $min = 1e6;#d# 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3422 my $avg = 10;
3423$TICK_WATCHER = Event->timer (
3424 reentrant => 0,
3425 parked => 1,
3426 prio => 0,
3427 at => $NEXT_TICK || $TICK,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
3431 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3432 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
3433 return; 3600 return;
3434 } 3601 }
3435 3602
3436 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
3437 3604
3438 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
3439 3606
3440 0 && sync_job {#d# 3607 $RUNTIME += $TICK;
3441 for(1..10) { 3608 $NEXT_TICK += $TICK;
3442 my $t = Event::time;
3443 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3444 or die;
3445 3609
3446 $map->width (50); 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3447 $map->height (50); 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
3448 $map->alloc; 3612 Coro::async_pool {
3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3613 $Coro::current->{desc} = "runtime saver";
3450 my $t = Event::time - $t; 3614 write_runtime
3451 3615 or warn "ERROR: unable to write runtime file: $!";
3452 #next unless $t < 0.0013;#d#
3453 if ($t < $min) {
3454 $min = $t;
3455 }
3456 $avg = $avg * 0.99 + $t * 0.01;
3457 }
3458 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3459 exit 0;
3460 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3461 }; 3616 };
3617 }
3462 3618
3463 $RUNTIME += $TICK;
3464 $NEXT_TICK += $TICK;
3465
3466 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3467 $NEXT_RUNTIME_WRITE = $NOW + 10;
3468 Coro::async_pool {
3469 write_runtime
3470 or warn "ERROR: unable to write runtime file: $!";
3471 };
3472 }
3473
3474# my $AFTER = Event::time;
3475# warn $AFTER - $NOW;#d#
3476
3477 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3478 $sig->send; 3620 $sig->send;
3479 } 3621 }
3480 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
3481 $sig->send; 3623 $sig->send;
3482 } 3624 }
3483 3625
3484 $NOW = Event::time;
3485
3486 # if we are delayed by four ticks or more, skip them all
3487 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3488
3489 $TICK_WATCHER->at ($NEXT_TICK);
3490 $TICK_WATCHER->start;
3491
3492 $LOAD = ($NOW - $tick_start) / $TICK; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
3493 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3494 3628
3495 _post_tick; 3629 _post_tick;
3496 3630};
3497 3631$TICK_WATCHER->priority (EV::MAXPRI);
3498 },
3499);
3500 3632
3501{ 3633{
3634 BDB::min_parallel 8;
3502 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
3503 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3504 reentrant => 0,
3505 fd => BDB::poll_fileno,
3506 poll => 'r',
3507 prio => 0,
3508 data => WF_AUTOCANCEL,
3509 cb => \&BDB::poll_cb,
3510 );
3511 BDB::min_parallel 8;
3512 3637
3513 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3514 my $status; 3639 my $status;
3515 my $current = $Coro::current; 3640 my $current = $Coro::current;
3516 ( 3641 (
… …
3525 ) 3650 )
3526 }; 3651 };
3527 3652
3528 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3529 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3656 | BDB::LOG_AUTOREMOVE, 1);
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3530 3659
3531 cf::sync_job { 3660 cf::sync_job {
3532 eval { 3661 eval {
3533 BDB::db_env_open 3662 BDB::db_env_open
3534 $DB_ENV, 3663 $DB_ENV,
… …
3536 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3665 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3537 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3538 0666; 3667 0666;
3539 3668
3540 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3541
3542 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3543 $DB_ENV->set_lk_detect;
3544 }; 3670 };
3545 3671
3546 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3547 }; 3673 };
3548 } 3674 }
3675
3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3678 };
3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3681 };
3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 };
3549} 3685}
3550 3686
3551{ 3687{
3552 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3553 3689
3554 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3555 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3556 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3557 reentrant => 0,
3558 data => WF_AUTOCANCEL,
3559 fd => IO::AIO::poll_fileno,
3560 poll => 'r',
3561 prio => 6,
3562 cb => \&IO::AIO::poll_cb,
3563 );
3564} 3693}
3565 3694
3566my $_log_backtrace; 3695my $_log_backtrace;
3567 3696
3568sub _log_backtrace { 3697sub _log_backtrace {
… …
3572 3701
3573 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3574 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3575 ++$_log_backtrace; 3704 ++$_log_backtrace;
3576 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3577 my @bt = fork_call { 3708 my @bt = fork_call {
3578 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3579 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3580 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3711 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3581 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

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