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.364 by root, Tue Sep 11 08:41:11 2007 UTC vs.
Revision 1.385 by root, Fri Oct 12 19:13:26 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use 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::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
… …
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
… …
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;
85our $BDB_CHECKPOINT_WATCHER; 86our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 87our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 88our $DB_ENV;
88 89
89our %CFG; 90our %CFG;
… …
353our @SLOT_QUEUE; 354our @SLOT_QUEUE;
354our $SLOT_QUEUE; 355our $SLOT_QUEUE;
355 356
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
358 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
359 362
360 while () { 363 while () {
361 next_job: 364 next_job:
362 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
370 } 373 }
371 } 374 }
372 } 375 }
373 376
374 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 380 $signal->wait;
378 } else { 381 } else {
379 Coro::schedule; 382 Coro::schedule;
380 } 383 }
… …
424 my $time = Event::time; 427 my $time = Event::time;
425 428
426 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
428 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
429 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
430 # (but this is cancel-safe) 435 # (but this is cancel-safe)
431 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
432 437
433 my $busy = 1; 438 my $busy = 1;
434 my @res; 439 my @res;
435 440
436 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 443 @res = eval { $job->() };
438 warn $@ if $@; 444 warn $@ if $@;
439 undef $busy; 445 undef $busy;
440 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
441 447
… …
965# 971#
966 972
967sub _can_merge { 973sub _can_merge {
968 my ($ob1, $ob2) = @_; 974 my ($ob1, $ob2) = @_;
969 975
976 return 1;#d#
977
978 #todo#d# kill yourself and do some recursive checking manually without storable
979 sync_job {
980 my $guard = Coro::Storable::guard;
970 local $Storable::canonical = 1; 981 local $Storable::canonical = 1;
971 my $fob1 = Storable::freeze $ob1; 982 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2; 983 my $fob2 = Storable::freeze $ob2;
973
974 $fob1 eq $fob2 984 $fob1 eq $fob2
985 }
975} 986}
976 987
977sub reattach { 988sub reattach {
978 # basically do the same as instantiate, without calling instantiate 989 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 990 my ($obj) = @_;
… …
1025); 1036);
1026 1037
1027sub object_freezer_save { 1038sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1039 my ($filename, $rdata, $objs) = @_;
1029 1040
1030 my $guard = cf::lock_acquire "io";
1031
1032 sync_job { 1041 sync_job {
1033 if (length $$rdata) { 1042 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1043 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1044 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1045 $decname, length $$rdata, scalar @$objs;
… …
1042 close $fh; 1051 close $fh;
1043 1052
1044 if (@$objs) { 1053 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1055 chmod SAVE_MODE, $fh;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1057 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1058 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1059 close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1060 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1061 }
… …
1061 } else { 1070 } else {
1062 aio_unlink $filename; 1071 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1072 aio_unlink "$filename.pst";
1064 } 1073 }
1065 }; 1074 };
1066
1067 undef $guard;
1068} 1075}
1069 1076
1070sub object_freezer_as_string { 1077sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1078 my ($rdata, $objs) = @_;
1072 1079
… …
1077 1084
1078sub object_thawer_load { 1085sub object_thawer_load {
1079 my ($filename) = @_; 1086 my ($filename) = @_;
1080 1087
1081 my ($data, $av); 1088 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1089
1085 (aio_load $filename, $data) >= 0 1090 (aio_load $filename, $data) >= 0
1086 or return; 1091 or return;
1087 1092
1088 unless (aio_stat "$filename.pst") { 1093 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1094 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1095 or return;
1091 1096
1092 undef $guard; 1097 my $st = eval { Coro::Storable::thaw $av }
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs};
1094 } 1100 }
1095 1101
1096 utf8::decode (my $decname = $filename); 1102 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1103 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1104 $decname, length $data, scalar @{$av || []};
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1358 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1359
1354 my $f = new_from_file cf::object::thawer path $login 1360 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1361 or return;
1356 1362
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1363 my $pl = cf::player::load_pl $f
1359 or return; 1364 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1365 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1366 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1367 $cf::PLAYER{$login} = $pl
… …
2043 } 2048 }
2044 2049
2045 $MAP_PREFETCH{$path} |= $load; 2050 $MAP_PREFETCH{$path} |= $load;
2046 2051
2047 $MAP_PREFETCHER ||= cf::async { 2052 $MAP_PREFETCHER ||= cf::async {
2053 $Coro::current->{desc} = "map prefetcher";
2054
2048 while (%MAP_PREFETCH) { 2055 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2056 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2057 if (my $map = find $k) {
2051 $map->load if $v; 2058 $map->load if $v;
2052 } 2059 }
… …
2078 return if $self->{deny_save}; 2085 return if $self->{deny_save};
2079 2086
2080 local $self->{last_access} = $self->last_access;#d# 2087 local $self->{last_access} = $self->last_access;#d#
2081 2088
2082 cf::async { 2089 cf::async {
2090 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2091 $_->contr->save for $self->players;
2084 }; 2092 };
2085 2093
2086 if ($uniq) { 2094 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2282=cut
2275 2283
2276sub deref { 2284sub deref {
2277 my ($ref) = @_; 2285 my ($ref) = @_;
2278 2286
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2287 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2288 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2289 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2290 or return;
2286 $pl->ob->uuid eq $uuid 2291 $pl->ob->uuid eq $uuid
2287 or return; 2292 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2463 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2464
2460 $self->enter_link; 2465 $self->enter_link;
2461 2466
2462 (async { 2467 (async {
2468 $Coro::current->{desc} = "player::goto $path $x $y";
2469
2470 # *tag paths override both path and x|y
2471 if ($path =~ /^\*(.*)$/) {
2472 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2473 my $ob = $obs[rand @obs];
2474
2475 # see if we actually can go there
2476 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2477 $ob = $obs[rand @obs];
2478 } else {
2479 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2480 }
2481 # else put us there anyways for now #d#
2482
2483 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2484 } else {
2485 ($path, $x, $y) = (undef, undef, undef);
2486 }
2487 }
2488
2463 my $map = eval { 2489 my $map = eval {
2464 my $map = cf::map::find $path; 2490 my $map = defined $path ? cf::map::find $path : undef;
2465 2491
2466 if ($map) { 2492 if ($map) {
2467 $map = $map->customise_for ($self); 2493 $map = $map->customise_for ($self);
2468 $map = $check->($map) if $check && $map; 2494 $map = $check->($map) if $check && $map;
2469 } else { 2495 } else {
2470 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2496 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 } 2497 }
2472 2498
2473 $map 2499 $map
2474 }; 2500 };
2475 2501
… …
2565 # if exit is damned, update players death & WoR home-position 2591 # if exit is damned, update players death & WoR home-position
2566 $self->contr->savebed ($slaying, $hp, $sp) 2592 $self->contr->savebed ($slaying, $hp, $sp)
2567 if $exit->flag (FLAG_DAMNED); 2593 if $exit->flag (FLAG_DAMNED);
2568 2594
2569 (async { 2595 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2597
2570 $self->deactivate_recursive; # just to be sure 2598 $self->deactivate_recursive; # just to be sure
2571 unless (eval { 2599 unless (eval {
2572 $self->goto ($slaying, $hp, $sp); 2600 $self->goto ($slaying, $hp, $sp);
2573 2601
2574 1; 2602 1;
… …
2611 2639
2612=cut 2640=cut
2613 2641
2614our %CHANNEL = ( 2642our %CHANNEL = (
2615 "c/identify" => { 2643 "c/identify" => {
2616 id => "identify", 2644 id => "infobox",
2617 title => "Identify", 2645 title => "Identify",
2618 reply => undef, 2646 reply => undef,
2619 tooltip => "Items recently identified", 2647 tooltip => "Items recently identified",
2620 }, 2648 },
2621 "c/examine" => { 2649 "c/examine" => {
2622 id => "examine", 2650 id => "infobox",
2623 title => "Examine", 2651 title => "Examine",
2624 reply => undef, 2652 reply => undef,
2625 tooltip => "Signs and other items you examined", 2653 tooltip => "Signs and other items you examined",
2626 }, 2654 },
2655 "c/lookat" => {
2656 id => "infobox",
2657 title => "Look",
2658 reply => undef,
2659 tooltip => "What you saw there",
2660 },
2627); 2661);
2628 2662
2629sub cf::client::send_msg { 2663sub cf::client::send_msg {
2630 my ($self, $channel, $msg, $color, @extra) = @_; 2664 my ($self, $channel, $msg, $color, @extra) = @_;
2631 2665
2632 $msg = $self->pl->expand_cfpod ($msg); 2666 $msg = $self->pl->expand_cfpod ($msg);
2633 2667
2634 $color &= cf::NDI_CLIENT_MASK; # just in case... 2668 $color &= cf::NDI_CLIENT_MASK; # just in case...
2635 2669
2636 # check predefined channels, for the benefit of C 2670 # check predefined channels, for the benefit of C
2637 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2671 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel};
2638 2673
2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id};
2678
2639 if (ref $channel) { 2679 } elsif (ref $channel) {
2640 # send meta info to client, if not yet sent 2680 # send meta info to client, if not yet sent
2641 unless (exists $self->{channel}{$channel->{id}}) { 2681 unless (exists $self->{channel}{$channel->{id}}) {
2642 $self->{channel}{$channel->{id}} = $channel; 2682 $self->{channel}{$channel->{id}} = $channel;
2643 $self->ext_msg (channel_info => $channel) 2683 $self->ext_msg (channel_info => $channel)
2644 if $self->can_msg; 2684 if $self->can_msg;
… …
2861=pod 2901=pod
2862 2902
2863The following functions and methods are available within a safe environment: 2903The following functions and methods are available within a safe environment:
2864 2904
2865 cf::object 2905 cf::object
2866 contr pay_amount pay_player map x y force_find force_add 2906 contr pay_amount pay_player map x y force_find force_add destroy
2867 insert remove name archname title slaying race decrease_ob_nr 2907 insert remove name archname title slaying race decrease_ob_nr
2868 2908
2869 cf::object::player 2909 cf::object::player
2870 player 2910 player
2871 2911
… …
2878=cut 2918=cut
2879 2919
2880for ( 2920for (
2881 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2882 insert remove inv name archname title slaying race 2922 insert remove inv name archname title slaying race
2883 decrease_ob_nr)], 2923 decrease_ob_nr destroy)],
2884 ["cf::object::player" => qw(player)], 2924 ["cf::object::player" => qw(player)],
2885 ["cf::player" => qw(peaceful)], 2925 ["cf::player" => qw(peaceful)],
2886 ["cf::map" => qw(trigger)], 2926 ["cf::map" => qw(trigger)],
2887) { 2927) {
2888 no strict 'refs'; 2928 no strict 'refs';
… …
3163sub main { 3203sub main {
3164 # we must not ever block the main coroutine 3204 # we must not ever block the main coroutine
3165 local $Coro::idle = sub { 3205 local $Coro::idle = sub {
3166 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3167 (async { 3207 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER";
3168 Event::one_event; 3209 Event::one_event;
3169 })->prio (Coro::PRIO_MAX); 3210 })->prio (Coro::PRIO_MAX);
3170 }; 3211 };
3171 3212
3172 reload_config; 3213 reload_config;
… …
3244 # and maps saved/destroyed asynchronously. 3285 # and maps saved/destroyed asynchronously.
3245 warn "begin emergency player save\n"; 3286 warn "begin emergency player save\n";
3246 for my $login (keys %cf::PLAYER) { 3287 for my $login (keys %cf::PLAYER) {
3247 my $pl = $cf::PLAYER{$login} or next; 3288 my $pl = $cf::PLAYER{$login} or next;
3248 $pl->valid or next; 3289 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3249 $pl->save; 3291 $pl->save;
3250 } 3292 }
3251 warn "end emergency player save\n"; 3293 warn "end emergency player save\n";
3252 3294
3253 warn "begin emergency map save\n"; 3295 warn "begin emergency map save\n";
… …
3416register_command "reload" => sub { 3458register_command "reload" => sub {
3417 my ($who, $arg) = @_; 3459 my ($who, $arg) = @_;
3418 3460
3419 if ($who->flag (FLAG_WIZ)) { 3461 if ($who->flag (FLAG_WIZ)) {
3420 $who->message ("reloading server."); 3462 $who->message ("reloading server.");
3463 async {
3464 $Coro::current->{desc} = "perl_reload";
3421 async { reload_perl }; 3465 reload_perl;
3466 };
3422 } 3467 }
3423}; 3468};
3424 3469
3425unshift @INC, $LIBDIR; 3470unshift @INC, $LIBDIR;
3426 3471
… …
3444 3489
3445 my $signal = new Coro::Signal; 3490 my $signal = new Coro::Signal;
3446 push @WAIT_FOR_TICK_BEGIN, $signal; 3491 push @WAIT_FOR_TICK_BEGIN, $signal;
3447 $signal->wait; 3492 $signal->wait;
3448} 3493}
3449
3450our $stat_fh;
3451sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3452 3494
3453$TICK_WATCHER = Event->timer ( 3495$TICK_WATCHER = Event->timer (
3454 reentrant => 0, 3496 reentrant => 0,
3455 parked => 1, 3497 parked => 1,
3456 prio => 0, 3498 prio => 0,
… …
3461 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3503 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3462 unless ++$bug_warning > 10; 3504 unless ++$bug_warning > 10;
3463 return; 3505 return;
3464 } 3506 }
3465 3507
3466 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3467
3468 $NOW = $tick_start = Event::time; 3508 $NOW = $tick_start = Event::time;
3469 3509
3470 cf::server_tick; # one server iteration 3510 cf::server_tick; # one server iteration
3471 3511
3472 $RUNTIME += $TICK; 3512 $RUNTIME += $TICK;
3473 $NEXT_TICK += $TICK; 3513 $NEXT_TICK += $TICK;
3474 3514
3475 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3515 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3476 $NEXT_RUNTIME_WRITE = $NOW + 10; 3516 $NEXT_RUNTIME_WRITE = $NOW + 10;
3477 Coro::async_pool { 3517 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver";
3478 write_runtime 3519 write_runtime
3479 or warn "ERROR: unable to write runtime file: $!"; 3520 or warn "ERROR: unable to write runtime file: $!";
3480 }; 3521 };
3481 } 3522 }
3482 3523
3483# my $AFTER = Event::time;
3484# warn $AFTER - $NOW;#d#
3485
3486 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3487 $sig->send; 3525 $sig->send;
3488 } 3526 }
3489 while (my $sig = shift @WAIT_FOR_TICK) { 3527 while (my $sig = shift @WAIT_FOR_TICK) {
3490 $sig->send; 3528 $sig->send;
… …
3500 3538
3501 $LOAD = ($NOW - $tick_start) / $TICK; 3539 $LOAD = ($NOW - $tick_start) / $TICK;
3502 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3503 3541
3504 _post_tick; 3542 _post_tick;
3505
3506 # gather some statistics#d#
3507 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3508 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3509 }, 3543 },
3510); 3544);
3511 3545
3512{ 3546{
3513 BDB::min_parallel 8; 3547 BDB::min_parallel 8;
… …
3536 ) 3570 )
3537 }; 3571 };
3538 3572
3539 unless ($DB_ENV) { 3573 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 3574 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1);
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3541 3579
3542 cf::sync_job { 3580 cf::sync_job {
3543 eval { 3581 eval {
3544 BDB::db_env_open 3582 BDB::db_env_open
3545 $DB_ENV, 3583 $DB_ENV,
… …
3547 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3548 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3549 0666; 3587 0666;
3550 3588
3551 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3589 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3552
3553 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3554 | BDB::LOG_AUTOREMOVE, 1);
3555 $DB_ENV->set_lk_detect;
3556 }; 3590 };
3557 3591
3558 cf::cleanup "db_env_open(db): $@" if $@; 3592 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 3593 };
3560 } 3594 }
3561 3595
3596 $BDB_DEADLOCK_WATCHER = Event->timer (
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 );
3562 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3606 $BDB_CHECKPOINT_WATCHER = Event->timer (
3563 after => 11, 3607 after => 11,
3564 interval => 60, 3608 interval => 60,
3565 hard => 1, 3609 hard => 1,
3566 prio => 0, 3610 prio => 0,
… …
3589 $AIO_POLL_WATCHER = Event->io ( 3633 $AIO_POLL_WATCHER = Event->io (
3590 reentrant => 0, 3634 reentrant => 0,
3591 data => WF_AUTOCANCEL, 3635 data => WF_AUTOCANCEL,
3592 fd => IO::AIO::poll_fileno, 3636 fd => IO::AIO::poll_fileno,
3593 poll => 'r', 3637 poll => 'r',
3594 prio => 6, 3638 prio => 0,
3595 cb => \&IO::AIO::poll_cb, 3639 cb => \&IO::AIO::poll_cb,
3596 ); 3640 );
3597} 3641}
3598 3642
3599my $_log_backtrace; 3643my $_log_backtrace;
… …
3605 3649
3606 # limit the # of concurrent backtraces 3650 # limit the # of concurrent backtraces
3607 if ($_log_backtrace < 2) { 3651 if ($_log_backtrace < 2) {
3608 ++$_log_backtrace; 3652 ++$_log_backtrace;
3609 async { 3653 async {
3654 $Coro::current->{desc} = "abt $msg";
3655
3610 my @bt = fork_call { 3656 my @bt = fork_call {
3611 @addr = map { sprintf "%x", $_ } @addr; 3657 @addr = map { sprintf "%x", $_ } @addr;
3612 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3658 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3613 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3659 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3614 or die "addr2line: $!"; 3660 or die "addr2line: $!";

Diff Legend

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