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.359 by root, Sat Sep 8 18:15:55 2007 UTC vs.
Revision 1.375 by root, Sun Sep 30 20:22:21 2007 UTC

… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 88our $DB_ENV;
86 89
87our %CFG; 90our %CFG;
88 91
89our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
… …
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
196 198
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
352our @SLOT_QUEUE; 354our @SLOT_QUEUE;
353our $SLOT_QUEUE; 355our $SLOT_QUEUE;
354 356
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
357 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
358 362
359 while () { 363 while () {
360 next_job: 364 next_job:
361 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
431 435
432 my $busy = 1; 436 my $busy = 1;
433 my @res; 437 my @res;
434 438
435 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 441 @res = eval { $job->() };
437 warn $@ if $@; 442 warn $@ if $@;
438 undef $busy; 443 undef $busy;
439 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
440 445
… …
508=item cf::db_put $family => $key => $value 513=item cf::db_put $family => $key => $value
509 514
510Stores the given C<$value> in the family. It can currently store binary 515Stores 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). 516data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 517
518=item $db = cf::db_table "name"
519
520Create and/or open a new database table. The string must not be "db" and must be unique
521within each server.
522
513=cut 523=cut
524
525sub db_table($) {
526 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV;
528
529 eval {
530 $db->set_flags (BDB::CHKSUM);
531
532 utf8::encode $name;
533 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
534 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
535 cf::cleanup "db_open(db): $!" if $!;
536 };
537 cf::cleanup "db_open(db): $@" if $@;
538
539 $db
540}
514 541
515our $DB; 542our $DB;
516 543
517sub db_init { 544sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 545 cf::sync_job {
522 eval { 546 $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 } 547 };
532} 548}
533 549
534sub db_get($$) { 550sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 551 my $key = "$_[0]/$_[1]";
536 552
… …
1013); 1029);
1014 1030
1015sub object_freezer_save { 1031sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
1017 1033
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1034 sync_job {
1021 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
1024 1039
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
… …
1048 } else { 1063 } else {
1049 aio_unlink $filename; 1064 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
1051 } 1066 }
1052 }; 1067 };
1053
1054 undef $guard;
1055} 1068}
1056 1069
1057sub object_freezer_as_string { 1070sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1059 1072
… …
1064 1077
1065sub object_thawer_load { 1078sub object_thawer_load {
1066 my ($filename) = @_; 1079 my ($filename) = @_;
1067 1080
1068 my ($data, $av); 1081 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1082
1072 (aio_load $filename, $data) >= 0 1083 (aio_load $filename, $data) >= 0
1073 or return; 1084 or return;
1074 1085
1075 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1088 or return;
1078 1089
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
1081 } 1091 }
1082 1092
1093 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1095 $decname, length $data, scalar @{$av || []};
1085 1096
1086 ($data, $av) 1097 ($data, $av)
1087} 1098}
1088 1099
1089=head2 COMMAND CALLBACKS 1100=head2 COMMAND CALLBACKS
… …
1277 1288
1278=head3 cf::player 1289=head3 cf::player
1279 1290
1280=over 4 1291=over 4
1281 1292
1293=item cf::player::num_playing
1294
1295Returns the official number of playing players, as per the Crossfire metaserver rules.
1296
1297=cut
1298
1299sub num_playing {
1300 scalar grep
1301 $_->ob->map
1302 && !$_->hidden
1303 && !$_->ob->flag (cf::FLAG_WIZ),
1304 cf::player::list
1305}
1306
1282=item cf::player::find $login 1307=item cf::player::find $login
1283 1308
1284Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
1285 1310
1286=cut 1311=cut
… …
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1350
1326 my $f = new_from_file cf::object::thawer path $login 1351 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1352 or return;
1328 1353
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1354 my $pl = cf::player::load_pl $f
1331 or return; 1355 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1356 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1357 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
… …
1891 1915
1892 { 1916 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1894 1918
1895 return unless $self->valid; 1919 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1921
1898 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1899 1923
1900 $self->alloc; 1924 $self->alloc;
1901 1925
… …
2015 } 2039 }
2016 2040
2017 $MAP_PREFETCH{$path} |= $load; 2041 $MAP_PREFETCH{$path} |= $load;
2018 2042
2019 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
2020 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2048 if (my $map = find $k) {
2023 $map->load if $v; 2049 $map->load if $v;
2024 } 2050 }
… …
2050 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2051 2077
2052 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
2053 2079
2054 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2056 }; 2083 };
2057 2084
2058 if ($uniq) { 2085 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2431 2458
2432 $self->enter_link; 2459 $self->enter_link;
2433 2460
2434 (async { 2461 (async {
2462 $Coro::current->{desc} = "player::goto $path $x $y";
2463
2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs];
2468
2469 # see if we actually can go there
2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2476
2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2480 }
2481 }
2482
2435 my $map = eval { 2483 my $map = eval {
2436 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2437 2485
2438 if ($map) { 2486 if ($map) {
2439 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2440 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2441 } else { 2489 } else {
2442 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2443 } 2491 }
2444 2492
2445 $map 2493 $map
2446 }; 2494 };
2447 2495
… …
2537 # if exit is damned, update players death & WoR home-position 2585 # if exit is damned, update players death & WoR home-position
2538 $self->contr->savebed ($slaying, $hp, $sp) 2586 $self->contr->savebed ($slaying, $hp, $sp)
2539 if $exit->flag (FLAG_DAMNED); 2587 if $exit->flag (FLAG_DAMNED);
2540 2588
2541 (async { 2589 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2591
2542 $self->deactivate_recursive; # just to be sure 2592 $self->deactivate_recursive; # just to be sure
2543 unless (eval { 2593 unless (eval {
2544 $self->goto ($slaying, $hp, $sp); 2594 $self->goto ($slaying, $hp, $sp);
2545 2595
2546 1; 2596 1;
… …
2583 2633
2584=cut 2634=cut
2585 2635
2586our %CHANNEL = ( 2636our %CHANNEL = (
2587 "c/identify" => { 2637 "c/identify" => {
2588 id => "identify", 2638 id => "infobox",
2589 title => "Identify", 2639 title => "Identify",
2590 reply => undef, 2640 reply => undef,
2591 tooltip => "Items recently identified", 2641 tooltip => "Items recently identified",
2592 }, 2642 },
2593 "c/examine" => { 2643 "c/examine" => {
2594 id => "examine", 2644 id => "infobox",
2595 title => "Examine", 2645 title => "Examine",
2596 reply => undef, 2646 reply => undef,
2597 tooltip => "Signs and other items you examined", 2647 tooltip => "Signs and other items you examined",
2598 }, 2648 },
2649 "c/lookat" => {
2650 id => "infobox",
2651 title => "Look",
2652 reply => undef,
2653 tooltip => "What you saw there",
2654 },
2599); 2655);
2600 2656
2601sub cf::client::send_msg { 2657sub cf::client::send_msg {
2602 my ($self, $channel, $msg, $color, @extra) = @_; 2658 my ($self, $channel, $msg, $color, @extra) = @_;
2603 2659
2604 $msg = $self->pl->expand_cfpod ($msg); 2660 $msg = $self->pl->expand_cfpod ($msg);
2605 2661
2606 $color &= cf::NDI_CLIENT_MASK; # just in case... 2662 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607 2663
2608 # check predefined channels, for the benefit of C 2664 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2665 if ($CHANNEL{$channel}) {
2666 $channel = $CHANNEL{$channel};
2610 2667
2668 $self->ext_msg (channel_info => $channel)
2669 if $self->can_msg;
2670
2671 $channel = $channel->{id};
2672
2611 if (ref $channel) { 2673 } elsif (ref $channel) {
2612 # send meta info to client, if not yet sent 2674 # send meta info to client, if not yet sent
2613 unless (exists $self->{channel}{$channel->{id}}) { 2675 unless (exists $self->{channel}{$channel->{id}}) {
2614 $self->{channel}{$channel->{id}} = $channel; 2676 $self->{channel}{$channel->{id}} = $channel;
2615 $self->ext_msg (channel_info => $channel) 2677 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg; 2678 if $self->can_msg;
… …
3135sub main { 3197sub main {
3136 # we must not ever block the main coroutine 3198 # we must not ever block the main coroutine
3137 local $Coro::idle = sub { 3199 local $Coro::idle = sub {
3138 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3200 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3139 (async { 3201 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER";
3140 Event::one_event; 3203 Event::one_event;
3141 })->prio (Coro::PRIO_MAX); 3204 })->prio (Coro::PRIO_MAX);
3142 }; 3205 };
3143 3206
3144 reload_config; 3207 reload_config;
… …
3388register_command "reload" => sub { 3451register_command "reload" => sub {
3389 my ($who, $arg) = @_; 3452 my ($who, $arg) = @_;
3390 3453
3391 if ($who->flag (FLAG_WIZ)) { 3454 if ($who->flag (FLAG_WIZ)) {
3392 $who->message ("reloading server."); 3455 $who->message ("reloading server.");
3456 async {
3457 $Coro::current->{desc} = "perl_reload";
3393 async { reload_perl }; 3458 reload_perl;
3459 };
3394 } 3460 }
3395}; 3461};
3396 3462
3397unshift @INC, $LIBDIR; 3463unshift @INC, $LIBDIR;
3398 3464
… …
3417 my $signal = new Coro::Signal; 3483 my $signal = new Coro::Signal;
3418 push @WAIT_FOR_TICK_BEGIN, $signal; 3484 push @WAIT_FOR_TICK_BEGIN, $signal;
3419 $signal->wait; 3485 $signal->wait;
3420} 3486}
3421 3487
3422 my $min = 1e6;#d#
3423 my $avg = 10;
3424$TICK_WATCHER = Event->timer ( 3488$TICK_WATCHER = Event->timer (
3425 reentrant => 0, 3489 reentrant => 0,
3426 parked => 1, 3490 parked => 1,
3427 prio => 0, 3491 prio => 0,
3428 at => $NEXT_TICK || $TICK, 3492 at => $NEXT_TICK || $TICK,
… …
3436 3500
3437 $NOW = $tick_start = Event::time; 3501 $NOW = $tick_start = Event::time;
3438 3502
3439 cf::server_tick; # one server iteration 3503 cf::server_tick; # one server iteration
3440 3504
3441 0 && sync_job {#d#
3442 for(1..10) {
3443 my $t = Event::time;
3444 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3445 or die;
3446
3447 $map->width (50);
3448 $map->height (50);
3449 $map->alloc;
3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3451 my $t = Event::time - $t;
3452
3453 #next unless $t < 0.0013;#d#
3454 if ($t < $min) {
3455 $min = $t;
3456 }
3457 $avg = $avg * 0.99 + $t * 0.01;
3458 }
3459 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3460 exit 0;
3461 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3462 };
3463
3464 $RUNTIME += $TICK; 3505 $RUNTIME += $TICK;
3465 $NEXT_TICK += $TICK; 3506 $NEXT_TICK += $TICK;
3466 3507
3467 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3508 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3468 $NEXT_RUNTIME_WRITE = $NOW + 10; 3509 $NEXT_RUNTIME_WRITE = $NOW + 10;
3469 Coro::async_pool { 3510 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver";
3470 write_runtime 3512 write_runtime
3471 or warn "ERROR: unable to write runtime file: $!"; 3513 or warn "ERROR: unable to write runtime file: $!";
3472 }; 3514 };
3473 } 3515 }
3474 3516
3475# my $AFTER = Event::time;
3476# warn $AFTER - $NOW;#d#
3477
3478 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3479 $sig->send; 3518 $sig->send;
3480 } 3519 }
3481 while (my $sig = shift @WAIT_FOR_TICK) { 3520 while (my $sig = shift @WAIT_FOR_TICK) {
3482 $sig->send; 3521 $sig->send;
… …
3492 3531
3493 $LOAD = ($NOW - $tick_start) / $TICK; 3532 $LOAD = ($NOW - $tick_start) / $TICK;
3494 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3495 3534
3496 _post_tick; 3535 _post_tick;
3497
3498
3499 }, 3536 },
3500); 3537);
3501 3538
3502{ 3539{
3540 BDB::min_parallel 8;
3503 BDB::max_poll_time $TICK * 0.1; 3541 BDB::max_poll_time $TICK * 0.1;
3504 $BDB_POLL_WATCHER = Event->io ( 3542 $BDB_POLL_WATCHER = Event->io (
3505 reentrant => 0, 3543 reentrant => 0,
3506 fd => BDB::poll_fileno, 3544 fd => BDB::poll_fileno,
3507 poll => 'r', 3545 poll => 'r',
3508 prio => 0, 3546 prio => 0,
3509 data => WF_AUTOCANCEL, 3547 data => WF_AUTOCANCEL,
3510 cb => \&BDB::poll_cb, 3548 cb => \&BDB::poll_cb,
3511 ); 3549 );
3512 BDB::min_parallel 8;
3513 3550
3514 BDB::set_sync_prepare { 3551 BDB::set_sync_prepare {
3515 my $status; 3552 my $status;
3516 my $current = $Coro::current; 3553 my $current = $Coro::current;
3517 ( 3554 (
… …
3526 ) 3563 )
3527 }; 3564 };
3528 3565
3529 unless ($DB_ENV) { 3566 unless ($DB_ENV) {
3530 $DB_ENV = BDB::db_env_create; 3567 $DB_ENV = BDB::db_env_create;
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3569 | BDB::LOG_AUTOREMOVE, 1);
3570 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3571 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3531 3572
3532 cf::sync_job { 3573 cf::sync_job {
3533 eval { 3574 eval {
3534 BDB::db_env_open 3575 BDB::db_env_open
3535 $DB_ENV, 3576 $DB_ENV,
… …
3537 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3578 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3538 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3579 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3539 0666; 3580 0666;
3540 3581
3541 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3582 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3542
3543 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3544 $DB_ENV->set_lk_detect;
3545 }; 3583 };
3546 3584
3547 cf::cleanup "db_env_open(db): $@" if $@; 3585 cf::cleanup "db_env_open(db): $@" if $@;
3548 }; 3586 };
3549 } 3587 }
3588
3589 $BDB_DEADLOCK_WATCHER = Event->timer (
3590 after => 3,
3591 interval => 1,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3597 },
3598 );
3599 $BDB_CHECKPOINT_WATCHER = Event->timer (
3600 after => 11,
3601 interval => 60,
3602 hard => 1,
3603 prio => 0,
3604 data => WF_AUTOCANCEL,
3605 cb => sub {
3606 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3607 },
3608 );
3609 $BDB_TRICKLE_WATCHER = Event->timer (
3610 after => 5,
3611 interval => 10,
3612 hard => 1,
3613 prio => 0,
3614 data => WF_AUTOCANCEL,
3615 cb => sub {
3616 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3617 },
3618 );
3550} 3619}
3551 3620
3552{ 3621{
3553 IO::AIO::min_parallel 8; 3622 IO::AIO::min_parallel 8;
3554 3623
… …
3573 3642
3574 # limit the # of concurrent backtraces 3643 # limit the # of concurrent backtraces
3575 if ($_log_backtrace < 2) { 3644 if ($_log_backtrace < 2) {
3576 ++$_log_backtrace; 3645 ++$_log_backtrace;
3577 async { 3646 async {
3647 $Coro::current->{desc} = "abt $msg";
3648
3578 my @bt = fork_call { 3649 my @bt = fork_call {
3579 @addr = map { sprintf "%x", $_ } @addr; 3650 @addr = map { sprintf "%x", $_ } @addr;
3580 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3651 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3581 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3652 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3582 or die "addr2line: $!"; 3653 or die "addr2line: $!";

Diff Legend

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