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.362 by root, Mon Sep 10 12:44:06 2007 UTC vs.
Revision 1.403 by root, Mon Dec 17 07:09:18 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.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML::Syck ();
32use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 43
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
47 46
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 76our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 79our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
83 81
84our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
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;
90our $RUNTIME; 91our $RUNTIME;
92our $NOW;
91 93
92our (%PLAYER, %PLAYER_LOADING); # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 95our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
95 97
159 161
160The raw value load value from the last tick. 162The raw value load value from the last tick.
161 163
162=item %cf::CFG 164=item %cf::CFG
163 165
164Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 167from wherever your confdir points to.
166 168
167=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
168 170
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
212)) { 214)) {
213 no strict 'refs'; 215 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 217}
216 218
217$Event::DIED = sub { 219$EV::DIED = sub {
218 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
219}; 221};
220 222
221############################################################################# 223#############################################################################
222 224
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 248 $d
247 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
248} 250}
249 251
250=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
251 253
252Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
253 255
254=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
255 257
256Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
257 259
258=cut 260=cut
259 261
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 263
262sub to_json ($) { $json_coder->encode ($_[0]) } 264sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 265sub decode_json($) { $json_coder->decode ($_[0]) }
264 266
265=item cf::lock_wait $string 267=item cf::lock_wait $string
266 268
267Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
268 270
333 }; 335 };
334 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
335 $guard 337 $guard
336} 338}
337 339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
353}
354
338=item cf::get_slot $time[, $priority[, $name]] 355=item cf::get_slot $time[, $priority[, $name]]
339 356
340Allocate $time seconds of blocking CPU time at priority C<$priority>: 357Allocate $time seconds of blocking CPU time at priority C<$priority>:
341This call blocks and returns only when you have at least C<$time> seconds 358This call blocks and returns only when you have at least C<$time> seconds
342of cpu time till the next tick. The slot is only valid till the next cede. 359of cpu time till the next tick. The slot is only valid till the next cede.
351our @SLOT_QUEUE; 368our @SLOT_QUEUE;
352our $SLOT_QUEUE; 369our $SLOT_QUEUE;
353 370
354$SLOT_QUEUE->cancel if $SLOT_QUEUE; 371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
355$SLOT_QUEUE = Coro::async { 372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
356 my $signal = new Coro::Signal; 375 my $signal = new Coro::Signal;
357 376
358 while () { 377 while () {
359 next_job: 378 next_job:
360 my $avail = cf::till_tick; 379 my $avail = cf::till_tick;
368 } 387 }
369 } 388 }
370 } 389 }
371 390
372 if (@SLOT_QUEUE) { 391 if (@SLOT_QUEUE) {
373 # we do not use wait_For_tick() as it returns immediately when tick is inactive 392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
374 push @cf::WAIT_FOR_TICK, $signal; 393 push @cf::WAIT_FOR_TICK, $signal;
375 $signal->wait; 394 $signal->wait;
376 } else { 395 } else {
377 Coro::schedule; 396 Coro::schedule;
378 } 397 }
401 420
402BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
403 422
404=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
405 424
406The design of Crossfire TRT requires that the main coroutine ($Coro::main) 425The design of Deliantra requires that the main coroutine ($Coro::main)
407is always able to handle events or runnable, as Crossfire TRT is only 426is always able to handle events or runnable, as Deliantra is only
408partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
409acceptable. 428acceptable.
410 429
411If it must be done, put the blocking parts into C<sync_job>. This will run 430If it must be done, put the blocking parts into C<sync_job>. This will run
412the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
417 436
418sub sync_job(&) { 437sub sync_job(&) {
419 my ($job) = @_; 438 my ($job) = @_;
420 439
421 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
422 my $time = Event::time; 441 my $time = EV::time;
423 442
424 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
425 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
426 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
427 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
428 # (but this is cancel-safe) 449 # (but this is cancel-safe)
429 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
430 451
431 my $busy = 1; 452 my $busy = 1;
432 my @res; 453 my @res;
433 454
434 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
435 @res = eval { $job->() }; 457 @res = eval { $job->() };
436 warn $@ if $@; 458 warn $@ if $@;
437 undef $busy; 459 undef $busy;
438 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
439 461
440 while ($busy) { 462 while ($busy) {
441 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
442 } 467 }
468 }
443 469
444 $time = Event::time - $time; 470 $time = EV::time - $time;
445 471
446 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
447 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
448 474
449 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
479=item fork_call { }, $args 505=item fork_call { }, $args
480 506
481Executes the given code block with the given arguments in a seperate 507Executes the given code block with the given arguments in a seperate
482process, returning the results. Everything must be serialisable with 508process, returning the results. Everything must be serialisable with
483Coro::Storable. May, of course, block. Note that the executed sub may 509Coro::Storable. May, of course, block. Note that the executed sub may
484never block itself or use any form of Event handling. 510never block itself or use any form of event handling.
485 511
486=cut 512=cut
487 513
488sub fork_call(&@) { 514sub fork_call(&@) {
489 my ($cb, @args) = @_; 515 my ($cb, @args) = @_;
507=item cf::db_put $family => $key => $value 533=item cf::db_put $family => $key => $value
508 534
509Stores the given C<$value> in the family. It can currently store binary 535Stores the given C<$value> in the family. It can currently store binary
510data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 536data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
511 537
538=item $db = cf::db_table "name"
539
540Create and/or open a new database table. The string must not be "db" and must be unique
541within each server.
542
512=cut 543=cut
544
545sub db_table($) {
546 my ($name) = @_;
547 my $db = BDB::db_create $DB_ENV;
548
549 eval {
550 $db->set_flags (BDB::CHKSUM);
551
552 utf8::encode $name;
553 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
554 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
555 cf::cleanup "db_open(db): $!" if $!;
556 };
557 cf::cleanup "db_open(db): $@" if $@;
558
559 $db
560}
513 561
514our $DB; 562our $DB;
515 563
516sub db_init { 564sub db_init {
517 unless ($DB) {
518 $DB = BDB::db_create $DB_ENV;
519
520 cf::sync_job { 565 cf::sync_job {
521 eval { 566 $DB ||= db_table "db";
522 $DB->set_flags (BDB::CHKSUM);
523
524 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
525 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
526 cf::cleanup "db_open(db): $!" if $!;
527 };
528 cf::cleanup "db_open(db): $@" if $@;
529 };
530 } 567 };
531} 568}
532 569
533sub db_get($$) { 570sub db_get($$) {
534 my $key = "$_[0]/$_[1]"; 571 my $key = "$_[0]/$_[1]";
535 572
639attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
640to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
641 678
642In the following description, CLASS can be any of C<global>, C<object> 679In the following description, CLASS can be any of C<global>, C<object>
643C<player>, C<client> or C<map> (i.e. the attachable objects in 680C<player>, C<client> or C<map> (i.e. the attachable objects in
644Crossfire TRT). 681Deliantra).
645 682
646=over 4 683=over 4
647 684
648=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
649 686
947 984
948=cut 985=cut
949 986
950############################################################################# 987#############################################################################
951# object support 988# object support
952#
953 989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
954sub _can_merge { 1023sub _can_merge {
955 my ($ob1, $ob2) = @_; 1024 my ($ob1, $ob2) = @_;
956 1025
957 local $Storable::canonical = 1; 1026 ++$SLOW_MERGES;#d#
958 my $fob1 = Storable::freeze $ob1;
959 my $fob2 = Storable::freeze $ob2;
960 1027
961 $fob1 eq $fob2 1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
962} 1030}
963 1031
964sub reattach { 1032sub reattach {
965 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
966 my ($obj) = @_; 1034 my ($obj) = @_;
988cf::attachable->attach ( 1056cf::attachable->attach (
989 prio => -1000000, 1057 prio => -1000000,
990 on_instantiate => sub { 1058 on_instantiate => sub {
991 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
992 1060
993 $data = from_json $data; 1061 $data = decode_json $data;
994 1062
995 for (@$data) { 1063 for (@$data) {
996 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
997 1065
998 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
1011 }, 1079 },
1012); 1080);
1013 1081
1014sub object_freezer_save { 1082sub object_freezer_save {
1015 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
1016
1017 my $guard = cf::lock_acquire "io";
1018 1084
1019 sync_job { 1085 sync_job {
1020 if (length $$rdata) { 1086 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename); 1087 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
1029 close $fh; 1095 close $fh;
1030 1096
1031 if (@$objs) { 1097 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1103 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1105 }
1048 } else { 1114 } else {
1049 aio_unlink $filename; 1115 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
1051 } 1117 }
1052 }; 1118 };
1053
1054 undef $guard;
1055} 1119}
1056 1120
1057sub object_freezer_as_string { 1121sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
1059 1123
1064 1128
1065sub object_thawer_load { 1129sub object_thawer_load {
1066 my ($filename) = @_; 1130 my ($filename) = @_;
1067 1131
1068 my ($data, $av); 1132 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1133
1072 (aio_load $filename, $data) >= 0 1134 (aio_load $filename, $data) >= 0
1073 or return; 1135 or return;
1074 1136
1075 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1139 or return;
1078 1140
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
1081 } 1143 }
1082 1144
1083 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1084 warn sprintf "loading %s (%d,%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
1085 $decname, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
1339 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1340 1402
1341 my $f = new_from_file cf::object::thawer path $login 1403 my $f = new_from_file cf::object::thawer path $login
1342 or return; 1404 or return;
1343 1405
1344 $f->next;
1345 my $pl = cf::player::load_pl $f 1406 my $pl = cf::player::load_pl $f
1346 or return; 1407 or return;
1347 local $cf::PLAYER_LOADING{$login} = $pl; 1408 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs; 1409 $f->resolve_delayed_derefs;
1349 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1501 1562
1502Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1503 1564
1504=cut 1565=cut
1505 1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1506sub expand_cfpod { 1578sub expand_cfpod {
1507 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1508 1580
1509 # escape & and < 1581 my $xml;
1510 s/&/&amp;/g;
1511 s/(?<![BIUGHT])</&lt;/g;
1512 1582
1513 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1514 1586
1515 1 while 1587 $group =~ s/&/&amp;/g;
1516 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1517 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1518 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1519 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1592 ([BCGHITU])
1521 # replace G<male|female> tags 1593 <
1522 || s{G<([^>|]*)\|([^>]*)>}{ 1594 (?:
1523 $self->gender ? $2 : $1 1595 ([^<>]*) (?{ $group = $^N })
1524 }ge 1596 | < $interior >
1525 # replace H<hint text> 1597 )
1526 || s{H<([^\>]*)>} 1598 >
1599 %gcsx
1527 { 1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1528 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1529 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1530 "") 1620 "")
1531 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1532 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1533 1632
1633 for ($xml) {
1534 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1535 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1536 1636
1537 # compress some whitespace 1637 # compress some whitespace
1538 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1539 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1540 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1541 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1542 1643
1543 $_ 1644 $xml
1544} 1645}
1646
1647no re 'eval';
1545 1648
1546sub hintmode { 1649sub hintmode {
1547 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1548 $_[0]{hintmode} 1651 $_[0]{hintmode}
1549} 1652}
2030 } 2133 }
2031 2134
2032 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2033 2136
2034 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
2035 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
2036 while (my ($k, $v) = each %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
2037 if (my $map = find $k) { 2142 if (my $map = find $k) {
2038 $map->load if $v; 2143 $map->load if $v;
2039 } 2144 }
2065 return if $self->{deny_save}; 2170 return if $self->{deny_save};
2066 2171
2067 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
2068 2173
2069 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
2070 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2071 }; 2177 };
2072 2178
2073 if ($uniq) { 2179 if ($uniq) {
2074 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2261=cut 2367=cut
2262 2368
2263sub deref { 2369sub deref {
2264 my ($ref) = @_; 2370 my ($ref) = @_;
2265 2371
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2); 2373 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return; 2375 or return;
2273 $pl->ob->uuid eq $uuid 2376 $pl->ob->uuid eq $uuid
2274 or return; 2377 or return;
2445 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2446 2549
2447 $self->enter_link; 2550 $self->enter_link;
2448 2551
2449 (async { 2552 (async {
2553 $Coro::current->{desc} = "player::goto $path $x $y";
2554
2555 # *tag paths override both path and x|y
2556 if ($path =~ /^\*(.*)$/) {
2557 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2558 my $ob = $obs[rand @obs];
2559
2560 # see if we actually can go there
2561 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2562 $ob = $obs[rand @obs];
2563 } else {
2564 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 }
2566 # else put us there anyways for now #d#
2567
2568 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2569 } else {
2570 ($path, $x, $y) = (undef, undef, undef);
2571 }
2572 }
2573
2450 my $map = eval { 2574 my $map = eval {
2451 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2452 2576
2453 if ($map) { 2577 if ($map) {
2454 $map = $map->customise_for ($self); 2578 $map = $map->customise_for ($self);
2455 $map = $check->($map) if $check && $map; 2579 $map = $check->($map) if $check && $map;
2456 } else { 2580 } else {
2457 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2581 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2458 } 2582 }
2459 2583
2460 $map 2584 $map
2461 }; 2585 };
2462 2586
2515 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2516 } 2640 }
2517 2641
2518 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2519 2643
2520 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2521 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2522 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2523 2647
2524 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2525 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
2552 # if exit is damned, update players death & WoR home-position 2676 # if exit is damned, update players death & WoR home-position
2553 $self->contr->savebed ($slaying, $hp, $sp) 2677 $self->contr->savebed ($slaying, $hp, $sp)
2554 if $exit->flag (FLAG_DAMNED); 2678 if $exit->flag (FLAG_DAMNED);
2555 2679
2556 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2557 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2558 unless (eval { 2684 unless (eval {
2559 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2560 2686
2561 1; 2687 1;
2596the message, with C<log> being the default. If C<$color> is negative, suppress 2722the message, with C<log> being the default. If C<$color> is negative, suppress
2597the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2598 2724
2599=cut 2725=cut
2600 2726
2727# non-persistent channels (usually the info channel)
2601our %CHANNEL = ( 2728our %CHANNEL = (
2602 "c/identify" => { 2729 "c/identify" => {
2603 id => "identify", 2730 id => "infobox",
2604 title => "Identify", 2731 title => "Identify",
2605 reply => undef, 2732 reply => undef,
2606 tooltip => "Items recently identified", 2733 tooltip => "Items recently identified",
2607 }, 2734 },
2608 "c/examine" => { 2735 "c/examine" => {
2609 id => "examine", 2736 id => "infobox",
2610 title => "Examine", 2737 title => "Examine",
2611 reply => undef, 2738 reply => undef,
2612 tooltip => "Signs and other items you examined", 2739 tooltip => "Signs and other items you examined",
2613 }, 2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2747 "c/lookat" => {
2748 id => "infobox",
2749 title => "Look",
2750 reply => undef,
2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2776 },
2614); 2777);
2615 2778
2616sub cf::client::send_msg { 2779sub cf::client::send_msg {
2617 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
2618 2781
2619 $msg = $self->pl->expand_cfpod ($msg); 2782 $msg = $self->pl->expand_cfpod ($msg);
2620 2783
2621 $color &= cf::NDI_CLIENT_MASK; # just in case... 2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622 2785
2623 # check predefined channels, for the benefit of C 2786 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2625 2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2626 if (ref $channel) { 2795 } elsif (ref $channel) {
2627 # send meta info to client, if not yet sent 2796 # send meta info to client, if not yet sent
2628 unless (exists $self->{channel}{$channel->{id}}) { 2797 unless (exists $self->{channel}{$channel->{id}}) {
2629 $self->{channel}{$channel->{id}} = $channel; 2798 $self->{channel}{$channel->{id}} = $channel;
2630 $self->ext_msg (channel_info => $channel) 2799 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg; 2800 if $self->can_msg;
2848=pod 3017=pod
2849 3018
2850The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2851 3020
2852 cf::object 3021 cf::object
2853 contr pay_amount pay_player map x y force_find force_add 3022 contr pay_amount pay_player map x y force_find force_add destroy
2854 insert remove name archname title slaying race decrease_ob_nr 3023 insert remove name archname title slaying race decrease_ob_nr
2855 3024
2856 cf::object::player 3025 cf::object::player
2857 player 3026 player
2858 3027
2865=cut 3034=cut
2866 3035
2867for ( 3036for (
2868 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2869 insert remove inv name archname title slaying race 3038 insert remove inv name archname title slaying race
2870 decrease_ob_nr)], 3039 decrease_ob_nr destroy)],
2871 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2872 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2873 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2874) { 3043) {
2875 no strict 'refs'; 3044 no strict 'refs';
3150sub main { 3319sub main {
3151 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
3152 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
3153 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3154 (async { 3323 (async {
3155 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
3156 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
3157 }; 3327 };
3158 3328
3159 reload_config; 3329 reload_config;
3160 db_init; 3330 db_init;
3161 load_extensions; 3331 load_extensions;
3162 3332
3163 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3164 Event::loop; 3335 EV::loop;
3165} 3336}
3166 3337
3167############################################################################# 3338#############################################################################
3168# initialisation and cleanup 3339# initialisation and cleanup
3169 3340
3170# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
3171BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
3172 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
3173 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3174 reentrant => 0,
3175 data => WF_AUTOCANCEL,
3176 signal => $signal,
3177 prio => 0,
3178 cb => sub {
3179 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
3180 },
3181 ); 3347 };
3182 } 3348 }
3183} 3349}
3184 3350
3185sub write_runtime { 3351sub write_runtime {
3186 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
3231 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
3232 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
3233 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
3234 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
3235 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3236 $pl->save; 3403 $pl->save;
3237 } 3404 }
3238 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
3239 3406
3240 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
3279 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3280 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3281 3448
3282 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
3283 3450
3284 warn "cancelling all WF_AUTOCANCEL watchers";
3285 for (Event::all_watchers) {
3286 $_->cancel if $_->data & WF_AUTOCANCEL;
3287 }
3288
3289 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3290 for (;;) { 3452 for (;;) {
3291 BDB::flush; 3453 BDB::flush;
3292 IO::AIO::flush; 3454 IO::AIO::flush;
3293 Coro::cede; 3455 Coro::cede_notself;
3294 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3295 warn "iterate..."; 3457 warn "iterate...";
3296 } 3458 }
3297 3459
3298 ++$RELOAD; 3460 ++$RELOAD;
3387 3549
3388sub reload_perl() { 3550sub reload_perl() {
3389 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3390 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3391 3553
3392 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3393 reentrant => 0,
3394 after => 0,
3395 data => WF_AUTOCANCEL,
3396 cb => sub {
3397 do_reload_perl;
3398 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3399 }, 3556 do_reload_perl;
3400 ); 3557 };
3401} 3558}
3402 3559
3403register_command "reload" => sub { 3560register_command "reload" => sub {
3404 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3405 3562
3406 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3407 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3408 async { reload_perl }; 3567 reload_perl;
3568 };
3409 } 3569 }
3410}; 3570};
3411 3571
3412unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3413 3573
3432 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3433 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3434 $signal->wait; 3594 $signal->wait;
3435} 3595}
3436 3596
3437 my $min = 1e6;#d# 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3438 my $avg = 10;
3439$TICK_WATCHER = Event->timer (
3440 reentrant => 0,
3441 parked => 1,
3442 prio => 0,
3443 at => $NEXT_TICK || $TICK,
3444 data => WF_AUTOCANCEL,
3445 cb => sub {
3446 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3447 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3448 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3449 return; 3601 return;
3450 } 3602 }
3451 3603
3452 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3453 3605
3454 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3455 3607
3456 0 && sync_job {#d# 3608 $RUNTIME += $TICK;
3457 for(1..10) { 3609 $NEXT_TICK += $TICK;
3458 my $t = Event::time;
3459 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3460 or die;
3461 3610
3462 $map->width (50); 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3463 $map->height (50); 3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3464 $map->alloc; 3613 Coro::async_pool {
3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3614 $Coro::current->{desc} = "runtime saver";
3466 my $t = Event::time - $t; 3615 write_runtime
3467 3616 or warn "ERROR: unable to write runtime file: $!";
3468 #next unless $t < 0.0013;#d#
3469 if ($t < $min) {
3470 $min = $t;
3471 }
3472 $avg = $avg * 0.99 + $t * 0.01;
3473 }
3474 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3475 exit 0;
3476 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3477 }; 3617 };
3618 }
3478 3619
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool {
3485 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 }
3489
3490# my $AFTER = Event::time;
3491# warn $AFTER - $NOW;#d#
3492
3493 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3494 $sig->send; 3621 $sig->send;
3495 } 3622 }
3496 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3497 $sig->send; 3624 $sig->send;
3498 } 3625 }
3499 3626
3500 $NOW = Event::time;
3501
3502 # if we are delayed by four ticks or more, skip them all
3503 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3504
3505 $TICK_WATCHER->at ($NEXT_TICK);
3506 $TICK_WATCHER->start;
3507
3508 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3509 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3510 3629
3511 _post_tick; 3630 _post_tick;
3512 3631};
3513 3632$TICK_WATCHER->priority (EV::MAXPRI);
3514 },
3515);
3516 3633
3517{ 3634{
3518 BDB::max_poll_time $TICK * 0.1; 3635 # configure BDB
3519 $BDB_POLL_WATCHER = Event->io ( 3636
3520 reentrant => 0,
3521 fd => BDB::poll_fileno,
3522 poll => 'r',
3523 prio => 0,
3524 data => WF_AUTOCANCEL,
3525 cb => \&BDB::poll_cb,
3526 );
3527 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
3528 3638 BDB::max_poll_reqs $TICK * 0.1;
3529 BDB::set_sync_prepare { 3639 $Coro::BDB::WATCHER->priority (1);
3530 my $status;
3531 my $current = $Coro::current;
3532 (
3533 sub {
3534 $status = $!;
3535 $current->ready; undef $current;
3536 },
3537 sub {
3538 Coro::schedule while defined $current;
3539 $! = $status;
3540 },
3541 )
3542 };
3543 3640
3544 unless ($DB_ENV) { 3641 unless ($DB_ENV) {
3545 $DB_ENV = BDB::db_env_create; 3642 $DB_ENV = BDB::db_env_create;
3643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3644 | BDB::LOG_AUTOREMOVE, 1);
3645 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3646 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3546 3647
3547 cf::sync_job { 3648 cf::sync_job {
3548 eval { 3649 eval {
3549 BDB::db_env_open 3650 BDB::db_env_open
3550 $DB_ENV, 3651 $DB_ENV,
3552 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3653 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3553 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3654 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3554 0666; 3655 0666;
3555 3656
3556 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3657 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3557
3558 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3559 $DB_ENV->set_lk_detect;
3560 }; 3658 };
3561 3659
3562 cf::cleanup "db_env_open(db): $@" if $@; 3660 cf::cleanup "db_env_open(db): $@" if $@;
3563 }; 3661 };
3564 } 3662 }
3663
3664 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3665 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3666 };
3667 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3668 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3669 };
3670 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3671 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3672 };
3565} 3673}
3566 3674
3567{ 3675{
3676 # configure IO::AIO
3677
3568 IO::AIO::min_parallel 8; 3678 IO::AIO::min_parallel 8;
3569
3570 undef $Coro::AIO::WATCHER;
3571 IO::AIO::max_poll_time $TICK * 0.1; 3679 IO::AIO::max_poll_time $TICK * 0.1;
3572 $AIO_POLL_WATCHER = Event->io ( 3680 $Coro::AIO::WATCHER->priority (1);
3573 reentrant => 0,
3574 data => WF_AUTOCANCEL,
3575 fd => IO::AIO::poll_fileno,
3576 poll => 'r',
3577 prio => 6,
3578 cb => \&IO::AIO::poll_cb,
3579 );
3580} 3681}
3581 3682
3582my $_log_backtrace; 3683my $_log_backtrace;
3583 3684
3584sub _log_backtrace { 3685sub _log_backtrace {
3588 3689
3589 # limit the # of concurrent backtraces 3690 # limit the # of concurrent backtraces
3590 if ($_log_backtrace < 2) { 3691 if ($_log_backtrace < 2) {
3591 ++$_log_backtrace; 3692 ++$_log_backtrace;
3592 async { 3693 async {
3694 $Coro::current->{desc} = "abt $msg";
3695
3593 my @bt = fork_call { 3696 my @bt = fork_call {
3594 @addr = map { sprintf "%x", $_ } @addr; 3697 @addr = map { sprintf "%x", $_ } @addr;
3595 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3698 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3596 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3699 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3597 or die "addr2line: $!"; 3700 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines