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.399 by root, Sun Dec 16 02:50:33 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;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS (); 26use JSON::XS 2.01 ();
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
… …
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 75our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 76our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 78our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 79our $USE_FSYNC = 1; # use fsync to write maps - default off
83 80
84our $BDB_POLL_WATCHER; 81our $BDB_POLL_WATCHER;
82our $BDB_DEADLOCK_WATCHER;
83our $BDB_CHECKPOINT_WATCHER;
84our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 85our $DB_ENV;
86 86
87our %CFG; 87our %CFG;
88 88
89our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 90our $RUNTIME;
91our $NOW;
91 92
92our (%PLAYER, %PLAYER_LOADING); # all users 93our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 94our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 95our $LINK_MAP; # the special {link} map, which is always available
95 96
… …
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
… …
212)) { 213)) {
213 no strict 'refs'; 214 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 216}
216 217
217$Event::DIED = sub { 218$EV::DIED = sub {
218 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
219}; 220};
220 221
221############################################################################# 222#############################################################################
222 223
… …
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 247 $d
247 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
248} 249}
249 250
250=item $ref = cf::from_json $json 251=item $ref = cf::decode_json $json
251 252
252Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
253 254
254=item $json = cf::to_json $ref 255=item $json = cf::encode_json $ref
255 256
256Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
257 258
258=cut 259=cut
259 260
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 262
262sub to_json ($) { $json_coder->encode ($_[0]) } 263sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 264sub decode_json($) { $json_coder->decode ($_[0]) }
264 265
265=item cf::lock_wait $string 266=item cf::lock_wait $string
266 267
267Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
268 269
… …
333 }; 334 };
334 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
335 $guard 336 $guard
336} 337}
337 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
338=item cf::get_slot $time[, $priority[, $name]] 354=item cf::get_slot $time[, $priority[, $name]]
339 355
340Allocate $time seconds of blocking CPU time at priority C<$priority>: 356Allocate $time seconds of blocking CPU time at priority C<$priority>:
341This 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
342of 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.
… …
351our @SLOT_QUEUE; 367our @SLOT_QUEUE;
352our $SLOT_QUEUE; 368our $SLOT_QUEUE;
353 369
354$SLOT_QUEUE->cancel if $SLOT_QUEUE; 370$SLOT_QUEUE->cancel if $SLOT_QUEUE;
355$SLOT_QUEUE = Coro::async { 371$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager");
373
356 my $signal = new Coro::Signal; 374 my $signal = new Coro::Signal;
357 375
358 while () { 376 while () {
359 next_job: 377 next_job:
360 my $avail = cf::till_tick; 378 my $avail = cf::till_tick;
… …
368 } 386 }
369 } 387 }
370 } 388 }
371 389
372 if (@SLOT_QUEUE) { 390 if (@SLOT_QUEUE) {
373 # 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
374 push @cf::WAIT_FOR_TICK, $signal; 392 push @cf::WAIT_FOR_TICK, $signal;
375 $signal->wait; 393 $signal->wait;
376 } else { 394 } else {
377 Coro::schedule; 395 Coro::schedule;
378 } 396 }
… …
401 419
402BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
403 421
404=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
405 423
406The design of Crossfire TRT requires that the main coroutine ($Coro::main) 424The design of Deliantra requires that the main coroutine ($Coro::main)
407is always able to handle events or runnable, as Crossfire TRT is only 425is 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 426partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
409acceptable. 427acceptable.
410 428
411If 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
412the given BLOCK in another coroutine while waiting for the result. The 430the given BLOCK in another coroutine while waiting for the result. The
… …
417 435
418sub sync_job(&) { 436sub sync_job(&) {
419 my ($job) = @_; 437 my ($job) = @_;
420 438
421 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
422 my $time = Event::time; 440 my $time = EV::time;
423 441
424 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
425 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
426 444
445 LOG llevError, Carp::longmess "sync job";#d#
446
427 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
428 # (but this is cancel-safe) 448 # (but this is cancel-safe)
429 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
430 450
431 my $busy = 1; 451 my $busy = 1;
432 my @res; 452 my @res;
433 453
434 (async { 454 (async {
455 $Coro::current->desc ("sync job coro");
435 @res = eval { $job->() }; 456 @res = eval { $job->() };
436 warn $@ if $@; 457 warn $@ if $@;
437 undef $busy; 458 undef $busy;
438 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
439 460
440 while ($busy) { 461 while ($busy) {
441 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
442 } 466 }
467 }
443 468
444 $time = Event::time - $time; 469 $time = EV::time - $time;
445 470
446 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
447 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
448 473
449 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
… …
479=item fork_call { }, $args 504=item fork_call { }, $args
480 505
481Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
482process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
483Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
484never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
485 510
486=cut 511=cut
487 512
488sub fork_call(&@) { 513sub fork_call(&@) {
489 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
… …
507=item cf::db_put $family => $key => $value 532=item cf::db_put $family => $key => $value
508 533
509Stores 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
510data 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).
511 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
512=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}
513 560
514our $DB; 561our $DB;
515 562
516sub db_init { 563sub db_init {
517 unless ($DB) {
518 $DB = BDB::db_create $DB_ENV;
519
520 cf::sync_job { 564 cf::sync_job {
521 eval { 565 $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 } 566 };
531} 567}
532 568
533sub db_get($$) { 569sub db_get($$) {
534 my $key = "$_[0]/$_[1]"; 570 my $key = "$_[0]/$_[1]";
535 571
… …
639attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
640to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
641 677
642In 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>
643C<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
644Crossfire TRT). 680Deliantra).
645 681
646=over 4 682=over 4
647 683
648=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
649 685
… …
947 983
948=cut 984=cut
949 985
950############################################################################# 986#############################################################################
951# object support 987# object support
952#
953 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#
954sub _can_merge { 1022sub _can_merge {
955 my ($ob1, $ob2) = @_; 1023 my ($ob1, $ob2) = @_;
956 1024
957 local $Storable::canonical = 1; 1025 ++$SLOW_MERGES;#d#
958 my $fob1 = Storable::freeze $ob1;
959 my $fob2 = Storable::freeze $ob2;
960 1026
961 $fob1 eq $fob2 1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
962} 1029}
963 1030
964sub reattach { 1031sub reattach {
965 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
966 my ($obj) = @_; 1033 my ($obj) = @_;
… …
988cf::attachable->attach ( 1055cf::attachable->attach (
989 prio => -1000000, 1056 prio => -1000000,
990 on_instantiate => sub { 1057 on_instantiate => sub {
991 my ($obj, $data) = @_; 1058 my ($obj, $data) = @_;
992 1059
993 $data = from_json $data; 1060 $data = decode_json $data;
994 1061
995 for (@$data) { 1062 for (@$data) {
996 my ($name, $args) = @$_; 1063 my ($name, $args) = @$_;
997 1064
998 $obj->attach ($name, %{$args || {} }); 1065 $obj->attach ($name, %{$args || {} });
… …
1011 }, 1078 },
1012); 1079);
1013 1080
1014sub object_freezer_save { 1081sub object_freezer_save {
1015 my ($filename, $rdata, $objs) = @_; 1082 my ($filename, $rdata, $objs) = @_;
1016
1017 my $guard = cf::lock_acquire "io";
1018 1083
1019 sync_job { 1084 sync_job {
1020 if (length $$rdata) { 1085 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename); 1086 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1087 warn sprintf "saving %s (%d,%d)\n",
… …
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
1083 utf8::decode (my $decname = $filename); 1144 utf8::decode (my $decname = $filename);
1084 warn sprintf "loading %s (%d,%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
1085 $decname, length $data, scalar @{$av || []}; 1146 $decname, length $data, scalar @{$av || []};
… …
1339 aio_unlink +(playerdir $login) . "/$login.pl"; 1400 aio_unlink +(playerdir $login) . "/$login.pl";
1340 1401
1341 my $f = new_from_file cf::object::thawer path $login 1402 my $f = new_from_file cf::object::thawer path $login
1342 or return; 1403 or return;
1343 1404
1344 $f->next;
1345 my $pl = cf::player::load_pl $f 1405 my $pl = cf::player::load_pl $f
1346 or return; 1406 or return;
1347 local $cf::PLAYER_LOADING{$login} = $pl; 1407 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs; 1408 $f->resolve_delayed_derefs;
1349 $cf::PLAYER{$login} = $pl 1409 $cf::PLAYER{$login} = $pl
… …
1501 1561
1502Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1503 1563
1504=cut 1564=cut
1505 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
1506sub expand_cfpod { 1577sub expand_cfpod {
1507 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1508 1579
1509 # escape & and < 1580 my $xml;
1510 s/&/&amp;/g;
1511 s/(?<![BIUGHT])</&lt;/g;
1512 1581
1513 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1514 1585
1515 1 while 1586 $group =~ s/&/&amp;/g;
1516 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1517 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1518 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1519 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1591 ([BCGHITU])
1521 # replace G<male|female> tags 1592 <
1522 || s{G<([^>|]*)\|([^>]*)>}{ 1593 (?:
1523 $self->gender ? $2 : $1 1594 ([^<>]*) (?{ $group = $^N })
1524 }ge 1595 | < $interior >
1525 # replace H<hint text> 1596 )
1526 || s{H<([^\>]*)>} 1597 >
1598 %gcsx
1527 { 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") {
1528 ("<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>",
1529 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1530 "") 1619 "")
1531 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1532 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1533 1631
1632 for ($xml) {
1534 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1535 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1536 1635
1537 # compress some whitespace 1636 # compress some whitespace
1538 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1539 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1540 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1541 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1542 1642
1543 $_ 1643 $xml
1544} 1644}
1645
1646no re 'eval';
1545 1647
1546sub hintmode { 1648sub hintmode {
1547 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1548 $_[0]{hintmode} 1650 $_[0]{hintmode}
1549} 1651}
… …
2030 } 2132 }
2031 2133
2032 $MAP_PREFETCH{$path} |= $load; 2134 $MAP_PREFETCH{$path} |= $load;
2033 2135
2034 $MAP_PREFETCHER ||= cf::async { 2136 $MAP_PREFETCHER ||= cf::async {
2137 $Coro::current->{desc} = "map prefetcher";
2138
2035 while (%MAP_PREFETCH) { 2139 while (%MAP_PREFETCH) {
2036 while (my ($k, $v) = each %MAP_PREFETCH) { 2140 while (my ($k, $v) = each %MAP_PREFETCH) {
2037 if (my $map = find $k) { 2141 if (my $map = find $k) {
2038 $map->load if $v; 2142 $map->load if $v;
2039 } 2143 }
… …
2065 return if $self->{deny_save}; 2169 return if $self->{deny_save};
2066 2170
2067 local $self->{last_access} = $self->last_access;#d# 2171 local $self->{last_access} = $self->last_access;#d#
2068 2172
2069 cf::async { 2173 cf::async {
2174 $Coro::current->{desc} = "map player save";
2070 $_->contr->save for $self->players; 2175 $_->contr->save for $self->players;
2071 }; 2176 };
2072 2177
2073 if ($uniq) { 2178 if ($uniq) {
2074 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2261=cut 2366=cut
2262 2367
2263sub deref { 2368sub deref {
2264 my ($ref) = @_; 2369 my ($ref) = @_;
2265 2370
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2371 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2); 2372 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2373 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return; 2374 or return;
2273 $pl->ob->uuid eq $uuid 2375 $pl->ob->uuid eq $uuid
2274 or return; 2376 or return;
… …
2445 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2446 2548
2447 $self->enter_link; 2549 $self->enter_link;
2448 2550
2449 (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
2450 my $map = eval { 2573 my $map = eval {
2451 my $map = cf::map::find $path; 2574 my $map = defined $path ? cf::map::find $path : undef;
2452 2575
2453 if ($map) { 2576 if ($map) {
2454 $map = $map->customise_for ($self); 2577 $map = $map->customise_for ($self);
2455 $map = $check->($map) if $check && $map; 2578 $map = $check->($map) if $check && $map;
2456 } else { 2579 } else {
2457 $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);
2458 } 2581 }
2459 2582
2460 $map 2583 $map
2461 }; 2584 };
2462 2585
… …
2515 $rmp->{origin_y} = $exit->y; 2638 $rmp->{origin_y} = $exit->y;
2516 } 2639 }
2517 2640
2518 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2519 2642
2520 my $data = cf::to_json $rmp; 2643 my $data = cf::encode_json $rmp;
2521 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2522 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2523 2646
2524 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2525 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
… …
2552 # if exit is damned, update players death & WoR home-position 2675 # if exit is damned, update players death & WoR home-position
2553 $self->contr->savebed ($slaying, $hp, $sp) 2676 $self->contr->savebed ($slaying, $hp, $sp)
2554 if $exit->flag (FLAG_DAMNED); 2677 if $exit->flag (FLAG_DAMNED);
2555 2678
2556 (async { 2679 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2681
2557 $self->deactivate_recursive; # just to be sure 2682 $self->deactivate_recursive; # just to be sure
2558 unless (eval { 2683 unless (eval {
2559 $self->goto ($slaying, $hp, $sp); 2684 $self->goto ($slaying, $hp, $sp);
2560 2685
2561 1; 2686 1;
… …
2596the 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
2597the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2598 2723
2599=cut 2724=cut
2600 2725
2726# non-persistent channels (usually the info channel)
2601our %CHANNEL = ( 2727our %CHANNEL = (
2602 "c/identify" => { 2728 "c/identify" => {
2603 id => "identify", 2729 id => "infobox",
2604 title => "Identify", 2730 title => "Identify",
2605 reply => undef, 2731 reply => undef,
2606 tooltip => "Items recently identified", 2732 tooltip => "Items recently identified",
2607 }, 2733 },
2608 "c/examine" => { 2734 "c/examine" => {
2609 id => "examine", 2735 id => "infobox",
2610 title => "Examine", 2736 title => "Examine",
2611 reply => undef, 2737 reply => undef,
2612 tooltip => "Signs and other items you examined", 2738 tooltip => "Signs and other items you examined",
2613 }, 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 },
2614); 2776);
2615 2777
2616sub cf::client::send_msg { 2778sub cf::client::send_msg {
2617 my ($self, $channel, $msg, $color, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
2618 2780
2619 $msg = $self->pl->expand_cfpod ($msg); 2781 $msg = $self->pl->expand_cfpod ($msg);
2620 2782
2621 $color &= cf::NDI_CLIENT_MASK; # just in case... 2783 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622 2784
2623 # check predefined channels, for the benefit of C 2785 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2786 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel};
2625 2788
2789 $self->ext_msg (channel_info => $channel)
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id};
2793
2626 if (ref $channel) { 2794 } elsif (ref $channel) {
2627 # send meta info to client, if not yet sent 2795 # send meta info to client, if not yet sent
2628 unless (exists $self->{channel}{$channel->{id}}) { 2796 unless (exists $self->{channel}{$channel->{id}}) {
2629 $self->{channel}{$channel->{id}} = $channel; 2797 $self->{channel}{$channel->{id}} = $channel;
2630 $self->ext_msg (channel_info => $channel) 2798 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg; 2799 if $self->can_msg;
… …
2848=pod 3016=pod
2849 3017
2850The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2851 3019
2852 cf::object 3020 cf::object
2853 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
2854 insert remove name archname title slaying race decrease_ob_nr 3022 insert remove name archname title slaying race decrease_ob_nr
2855 3023
2856 cf::object::player 3024 cf::object::player
2857 player 3025 player
2858 3026
… …
2865=cut 3033=cut
2866 3034
2867for ( 3035for (
2868 ["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
2869 insert remove inv name archname title slaying race 3037 insert remove inv name archname title slaying race
2870 decrease_ob_nr)], 3038 decrease_ob_nr destroy)],
2871 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2872 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2873 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2874) { 3042) {
2875 no strict 'refs'; 3043 no strict 'refs';
… …
3150sub main { 3318sub main {
3151 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
3152 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
3153 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#
3154 (async { 3322 (async {
3155 Event::one_event; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT;
3156 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
3157 }; 3326 };
3158 3327
3159 reload_config; 3328 reload_config;
3160 db_init; 3329 db_init;
3161 load_extensions; 3330 load_extensions;
3162 3331
3163 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3164 Event::loop; 3334 EV::loop;
3165} 3335}
3166 3336
3167############################################################################# 3337#############################################################################
3168# initialisation and cleanup 3338# initialisation and cleanup
3169 3339
3170# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
3171BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
3172 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
3173 Event->signal ( 3344 $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"; 3345 cf::cleanup "SIG$signal";
3180 },
3181 ); 3346 };
3182 } 3347 }
3183} 3348}
3184 3349
3185sub write_runtime { 3350sub write_runtime {
3186 my $runtime = "$LOCALDIR/runtime"; 3351 my $runtime = "$LOCALDIR/runtime";
… …
3231 # and maps saved/destroyed asynchronously. 3396 # and maps saved/destroyed asynchronously.
3232 warn "begin emergency player save\n"; 3397 warn "begin emergency player save\n";
3233 for my $login (keys %cf::PLAYER) { 3398 for my $login (keys %cf::PLAYER) {
3234 my $pl = $cf::PLAYER{$login} or next; 3399 my $pl = $cf::PLAYER{$login} or next;
3235 $pl->valid or next; 3400 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3236 $pl->save; 3402 $pl->save;
3237 } 3403 }
3238 warn "end emergency player save\n"; 3404 warn "end emergency player save\n";
3239 3405
3240 warn "begin emergency map save\n"; 3406 warn "begin emergency map save\n";
… …
3279 warn "syncing database to disk"; 3445 warn "syncing database to disk";
3280 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
3281 3447
3282 # 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
3283 3449
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"; 3450 warn "flushing outstanding aio requests";
3290 for (;;) { 3451 for (;;) {
3291 BDB::flush; 3452 BDB::flush;
3292 IO::AIO::flush; 3453 IO::AIO::flush;
3293 Coro::cede; 3454 Coro::cede_notself;
3294 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
3295 warn "iterate..."; 3456 warn "iterate...";
3296 } 3457 }
3297 3458
3298 ++$RELOAD; 3459 ++$RELOAD;
… …
3387 3548
3388sub reload_perl() { 3549sub reload_perl() {
3389 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
3390 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
3391 3552
3392 $RELOAD_WATCHER ||= Event->timer ( 3553 $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; 3554 undef $RELOAD_WATCHER;
3399 }, 3555 do_reload_perl;
3400 ); 3556 };
3401} 3557}
3402 3558
3403register_command "reload" => sub { 3559register_command "reload" => sub {
3404 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
3405 3561
3406 if ($who->flag (FLAG_WIZ)) { 3562 if ($who->flag (FLAG_WIZ)) {
3407 $who->message ("reloading server."); 3563 $who->message ("reloading server.");
3564 async {
3565 $Coro::current->{desc} = "perl_reload";
3408 async { reload_perl }; 3566 reload_perl;
3567 };
3409 } 3568 }
3410}; 3569};
3411 3570
3412unshift @INC, $LIBDIR; 3571unshift @INC, $LIBDIR;
3413 3572
… …
3432 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
3433 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
3434 $signal->wait; 3593 $signal->wait;
3435} 3594}
3436 3595
3437 my $min = 1e6;#d# 3596$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) { 3597 if ($Coro::current != $Coro::main) {
3447 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"
3448 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
3449 return; 3600 return;
3450 } 3601 }
3451 3602
3452 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
3453 3604
3454 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
3455 3606
3456 0 && sync_job {#d# 3607 $RUNTIME += $TICK;
3457 for(1..10) { 3608 $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 3609
3462 $map->width (50); 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3463 $map->height (50); 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
3464 $map->alloc; 3612 Coro::async_pool {
3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3613 $Coro::current->{desc} = "runtime saver";
3466 my $t = Event::time - $t; 3614 write_runtime
3467 3615 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 }; 3616 };
3617 }
3478 3618
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) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3494 $sig->send; 3620 $sig->send;
3495 } 3621 }
3496 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
3497 $sig->send; 3623 $sig->send;
3498 } 3624 }
3499 3625
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; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
3509 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3510 3628
3511 _post_tick; 3629 _post_tick;
3512 3630};
3513 3631$TICK_WATCHER->priority (EV::MAXPRI);
3514 },
3515);
3516 3632
3517{ 3633{
3634 BDB::min_parallel 8;
3518 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
3519 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
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;
3528 3637
3529 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3530 my $status; 3639 my $status;
3531 my $current = $Coro::current; 3640 my $current = $Coro::current;
3532 ( 3641 (
… …
3541 ) 3650 )
3542 }; 3651 };
3543 3652
3544 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3545 $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);
3546 3659
3547 cf::sync_job { 3660 cf::sync_job {
3548 eval { 3661 eval {
3549 BDB::db_env_open 3662 BDB::db_env_open
3550 $DB_ENV, 3663 $DB_ENV,
… …
3552 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
3553 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3554 0666; 3667 0666;
3555 3668
3556 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 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 }; 3670 };
3561 3671
3562 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3563 }; 3673 };
3564 } 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 };
3565} 3685}
3566 3686
3567{ 3687{
3568 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3569 3689
3570 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3571 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3572 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
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} 3693}
3581 3694
3582my $_log_backtrace; 3695my $_log_backtrace;
3583 3696
3584sub _log_backtrace { 3697sub _log_backtrace {
… …
3588 3701
3589 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3590 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3591 ++$_log_backtrace; 3704 ++$_log_backtrace;
3592 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3593 my @bt = fork_call { 3708 my @bt = fork_call {
3594 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3595 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3596 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 |"
3597 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

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