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.366 by root, Tue Sep 11 16:05:35 2007 UTC vs.
Revision 1.386 by root, Mon Oct 15 17:50:27 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
… …
960 966
961=cut 967=cut
962 968
963############################################################################# 969#############################################################################
964# object support 970# object support
965#
966 971
972sub _object_equal($$);
973sub _object_equal($$) {
974 my ($a, $b) = @_;
975
976 return 0 unless (ref $a) eq (ref $b);
977
978 if ("HASH" eq ref $a) {
979 my @ka = keys %$a;
980 my @kb = keys %$b;
981
982 return 0 if @ka != @kb;
983
984 for (0 .. $#ka) {
985 return 0 unless $ka[$_] eq $kb[$_];
986 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
987 }
988
989 } elsif ("ARRAY" eq ref $a) {
990
991 return 0 if @$a != @$b;
992
993 for (0 .. $#$a) {
994 return 0 unless _object_equal $a->[$_], $b->[$_];
995 }
996
997 } elsif ($a ne $b) {
998 return 0;
999 }
1000
1001 1
1002}
1003
1004our $SLOW_MERGES;#d#
967sub _can_merge { 1005sub _can_merge {
968 my ($ob1, $ob2) = @_; 1006 my ($ob1, $ob2) = @_;
969 1007
970 local $Storable::canonical = 1; 1008 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1009
974 $fob1 eq $fob2 1010 # we do the slow way here
1011 return _object_equal $ob1, $ob2
975} 1012}
976 1013
977sub reattach { 1014sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1015 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1016 my ($obj) = @_;
… …
1025); 1062);
1026 1063
1027sub object_freezer_save { 1064sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1065 my ($filename, $rdata, $objs) = @_;
1029 1066
1030 my $guard = cf::lock_acquire "io";
1031
1032 sync_job { 1067 sync_job {
1033 if (length $$rdata) { 1068 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1069 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1070 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1071 $decname, length $$rdata, scalar @$objs;
… …
1042 close $fh; 1077 close $fh;
1043 1078
1044 if (@$objs) { 1079 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1080 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1081 chmod SAVE_MODE, $fh;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1083 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1084 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1085 close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1086 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1087 }
… …
1061 } else { 1096 } else {
1062 aio_unlink $filename; 1097 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1098 aio_unlink "$filename.pst";
1064 } 1099 }
1065 }; 1100 };
1066
1067 undef $guard;
1068} 1101}
1069 1102
1070sub object_freezer_as_string { 1103sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1104 my ($rdata, $objs) = @_;
1072 1105
… …
1077 1110
1078sub object_thawer_load { 1111sub object_thawer_load {
1079 my ($filename) = @_; 1112 my ($filename) = @_;
1080 1113
1081 my ($data, $av); 1114 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1115
1085 (aio_load $filename, $data) >= 0 1116 (aio_load $filename, $data) >= 0
1086 or return; 1117 or return;
1087 1118
1088 unless (aio_stat "$filename.pst") { 1119 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1120 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1121 or return;
1091 1122
1092 undef $guard; 1123 my $st = eval { Coro::Storable::thaw $av }
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs};
1094 } 1126 }
1095 1127
1096 utf8::decode (my $decname = $filename); 1128 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1129 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1130 $decname, length $data, scalar @{$av || []};
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1384 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1385
1354 my $f = new_from_file cf::object::thawer path $login 1386 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1387 or return;
1356 1388
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1389 my $pl = cf::player::load_pl $f
1359 or return; 1390 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1391 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1392 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1393 $cf::PLAYER{$login} = $pl
… …
2043 } 2074 }
2044 2075
2045 $MAP_PREFETCH{$path} |= $load; 2076 $MAP_PREFETCH{$path} |= $load;
2046 2077
2047 $MAP_PREFETCHER ||= cf::async { 2078 $MAP_PREFETCHER ||= cf::async {
2079 $Coro::current->{desc} = "map prefetcher";
2080
2048 while (%MAP_PREFETCH) { 2081 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2082 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2083 if (my $map = find $k) {
2051 $map->load if $v; 2084 $map->load if $v;
2052 } 2085 }
… …
2078 return if $self->{deny_save}; 2111 return if $self->{deny_save};
2079 2112
2080 local $self->{last_access} = $self->last_access;#d# 2113 local $self->{last_access} = $self->last_access;#d#
2081 2114
2082 cf::async { 2115 cf::async {
2116 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2117 $_->contr->save for $self->players;
2084 }; 2118 };
2085 2119
2086 if ($uniq) { 2120 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2308=cut
2275 2309
2276sub deref { 2310sub deref {
2277 my ($ref) = @_; 2311 my ($ref) = @_;
2278 2312
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2313 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2314 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2315 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2316 or return;
2286 $pl->ob->uuid eq $uuid 2317 $pl->ob->uuid eq $uuid
2287 or return; 2318 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2489 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2490
2460 $self->enter_link; 2491 $self->enter_link;
2461 2492
2462 (async { 2493 (async {
2494 $Coro::current->{desc} = "player::goto $path $x $y";
2495
2463 # *tag paths override both path and x|y 2496 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2497 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2498 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2499 my $ob = $obs[rand @obs];
2467 2500
2468 # todo: use ob_blocked to check all tiles of the destination "object" 2501 # see if we actually can go there
2469 # for suitability. 2502 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2503 $ob = $obs[rand @obs];
2504 } else {
2505 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2506 }
2507 # else put us there anyways for now #d#
2470 2508
2471 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2509 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2510 } else {
2511 ($path, $x, $y) = (undef, undef, undef);
2472 } 2512 }
2473 } 2513 }
2474 2514
2475 my $map = eval { 2515 my $map = eval {
2476 my $map = cf::map::find $path; 2516 my $map = defined $path ? cf::map::find $path : undef;
2477 2517
2478 if ($map) { 2518 if ($map) {
2479 $map = $map->customise_for ($self); 2519 $map = $map->customise_for ($self);
2480 $map = $check->($map) if $check && $map; 2520 $map = $check->($map) if $check && $map;
2481 } else { 2521 } else {
2482 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2522 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2483 } 2523 }
2484 2524
2485 $map 2525 $map
2486 }; 2526 };
2487 2527
… …
2577 # if exit is damned, update players death & WoR home-position 2617 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp) 2618 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED); 2619 if $exit->flag (FLAG_DAMNED);
2580 2620
2581 (async { 2621 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2623
2582 $self->deactivate_recursive; # just to be sure 2624 $self->deactivate_recursive; # just to be sure
2583 unless (eval { 2625 unless (eval {
2584 $self->goto ($slaying, $hp, $sp); 2626 $self->goto ($slaying, $hp, $sp);
2585 2627
2586 1; 2628 1;
… …
2623 2665
2624=cut 2666=cut
2625 2667
2626our %CHANNEL = ( 2668our %CHANNEL = (
2627 "c/identify" => { 2669 "c/identify" => {
2628 id => "identify", 2670 id => "infobox",
2629 title => "Identify", 2671 title => "Identify",
2630 reply => undef, 2672 reply => undef,
2631 tooltip => "Items recently identified", 2673 tooltip => "Items recently identified",
2632 }, 2674 },
2633 "c/examine" => { 2675 "c/examine" => {
2634 id => "examine", 2676 id => "infobox",
2635 title => "Examine", 2677 title => "Examine",
2636 reply => undef, 2678 reply => undef,
2637 tooltip => "Signs and other items you examined", 2679 tooltip => "Signs and other items you examined",
2638 }, 2680 },
2681 "c/lookat" => {
2682 id => "infobox",
2683 title => "Look",
2684 reply => undef,
2685 tooltip => "What you saw there",
2686 },
2639); 2687);
2640 2688
2641sub cf::client::send_msg { 2689sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2690 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2691
2644 $msg = $self->pl->expand_cfpod ($msg); 2692 $msg = $self->pl->expand_cfpod ($msg);
2645 2693
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2694 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2695
2648 # check predefined channels, for the benefit of C 2696 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2697 if ($CHANNEL{$channel}) {
2698 $channel = $CHANNEL{$channel};
2650 2699
2700 $self->ext_msg (channel_info => $channel)
2701 if $self->can_msg;
2702
2703 $channel = $channel->{id};
2704
2651 if (ref $channel) { 2705 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2706 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2707 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2708 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2709 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2710 if $self->can_msg;
… …
2873=pod 2927=pod
2874 2928
2875The following functions and methods are available within a safe environment: 2929The following functions and methods are available within a safe environment:
2876 2930
2877 cf::object 2931 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 2932 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 2933 insert remove name archname title slaying race decrease_ob_nr
2880 2934
2881 cf::object::player 2935 cf::object::player
2882 player 2936 player
2883 2937
… …
2890=cut 2944=cut
2891 2945
2892for ( 2946for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 2948 insert remove inv name archname title slaying race
2895 decrease_ob_nr)], 2949 decrease_ob_nr destroy)],
2896 ["cf::object::player" => qw(player)], 2950 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 2951 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 2952 ["cf::map" => qw(trigger)],
2899) { 2953) {
2900 no strict 'refs'; 2954 no strict 'refs';
… …
3175sub main { 3229sub main {
3176 # we must not ever block the main coroutine 3230 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3231 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3233 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER";
3180 Event::one_event; 3235 Event::one_event;
3181 })->prio (Coro::PRIO_MAX); 3236 })->prio (Coro::PRIO_MAX);
3182 }; 3237 };
3183 3238
3184 reload_config; 3239 reload_config;
… …
3256 # and maps saved/destroyed asynchronously. 3311 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3312 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3313 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3314 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3315 $pl->valid or next;
3316 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3317 $pl->save;
3262 } 3318 }
3263 warn "end emergency player save\n"; 3319 warn "end emergency player save\n";
3264 3320
3265 warn "begin emergency map save\n"; 3321 warn "begin emergency map save\n";
… …
3428register_command "reload" => sub { 3484register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3485 my ($who, $arg) = @_;
3430 3486
3431 if ($who->flag (FLAG_WIZ)) { 3487 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3488 $who->message ("reloading server.");
3489 async {
3490 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3491 reload_perl;
3492 };
3434 } 3493 }
3435}; 3494};
3436 3495
3437unshift @INC, $LIBDIR; 3496unshift @INC, $LIBDIR;
3438 3497
… …
3456 3515
3457 my $signal = new Coro::Signal; 3516 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3517 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3518 $signal->wait;
3460} 3519}
3461
3462our $stat_fh;
3463sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3464 3520
3465$TICK_WATCHER = Event->timer ( 3521$TICK_WATCHER = Event->timer (
3466 reentrant => 0, 3522 reentrant => 0,
3467 parked => 1, 3523 parked => 1,
3468 prio => 0, 3524 prio => 0,
… …
3473 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3529 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3474 unless ++$bug_warning > 10; 3530 unless ++$bug_warning > 10;
3475 return; 3531 return;
3476 } 3532 }
3477 3533
3478 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3479
3480 $NOW = $tick_start = Event::time; 3534 $NOW = $tick_start = Event::time;
3481 3535
3482 cf::server_tick; # one server iteration 3536 cf::server_tick; # one server iteration
3483 3537
3484 $RUNTIME += $TICK; 3538 $RUNTIME += $TICK;
3485 $NEXT_TICK += $TICK; 3539 $NEXT_TICK += $TICK;
3486 3540
3487 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3541 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3488 $NEXT_RUNTIME_WRITE = $NOW + 10; 3542 $NEXT_RUNTIME_WRITE = $NOW + 10;
3489 Coro::async_pool { 3543 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver";
3490 write_runtime 3545 write_runtime
3491 or warn "ERROR: unable to write runtime file: $!"; 3546 or warn "ERROR: unable to write runtime file: $!";
3492 }; 3547 };
3493 } 3548 }
3494 3549
3495# my $AFTER = Event::time;
3496# warn $AFTER - $NOW;#d#
3497
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3551 $sig->send;
3500 } 3552 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3553 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3554 $sig->send;
… …
3512 3564
3513 $LOAD = ($NOW - $tick_start) / $TICK; 3565 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3567
3516 _post_tick; 3568 _post_tick;
3517
3518 # gather some statistics#d#
3519 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3520 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3521 }, 3569 },
3522); 3570);
3523 3571
3524{ 3572{
3525 BDB::min_parallel 8; 3573 BDB::min_parallel 8;
… …
3548 ) 3596 )
3549 }; 3597 };
3550 3598
3551 unless ($DB_ENV) { 3599 unless ($DB_ENV) {
3552 $DB_ENV = BDB::db_env_create; 3600 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3602 | BDB::LOG_AUTOREMOVE, 1);
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 3605
3554 cf::sync_job { 3606 cf::sync_job {
3555 eval { 3607 eval {
3556 BDB::db_env_open 3608 BDB::db_env_open
3557 $DB_ENV, 3609 $DB_ENV,
… …
3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3611 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3612 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3561 0666; 3613 0666;
3562 3614
3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3615 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3564
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3567 $DB_ENV->set_lk_detect;
3568 }; 3616 };
3569 3617
3570 cf::cleanup "db_env_open(db): $@" if $@; 3618 cf::cleanup "db_env_open(db): $@" if $@;
3571 }; 3619 };
3572 } 3620 }
3573 3621
3622 $BDB_DEADLOCK_WATCHER = Event->timer (
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 );
3574 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3632 $BDB_CHECKPOINT_WATCHER = Event->timer (
3575 after => 11, 3633 after => 11,
3576 interval => 60, 3634 interval => 60,
3577 hard => 1, 3635 hard => 1,
3578 prio => 0, 3636 prio => 0,
… …
3601 $AIO_POLL_WATCHER = Event->io ( 3659 $AIO_POLL_WATCHER = Event->io (
3602 reentrant => 0, 3660 reentrant => 0,
3603 data => WF_AUTOCANCEL, 3661 data => WF_AUTOCANCEL,
3604 fd => IO::AIO::poll_fileno, 3662 fd => IO::AIO::poll_fileno,
3605 poll => 'r', 3663 poll => 'r',
3606 prio => 6, 3664 prio => 0,
3607 cb => \&IO::AIO::poll_cb, 3665 cb => \&IO::AIO::poll_cb,
3608 ); 3666 );
3609} 3667}
3610 3668
3611my $_log_backtrace; 3669my $_log_backtrace;
… …
3617 3675
3618 # limit the # of concurrent backtraces 3676 # limit the # of concurrent backtraces
3619 if ($_log_backtrace < 2) { 3677 if ($_log_backtrace < 2) {
3620 ++$_log_backtrace; 3678 ++$_log_backtrace;
3621 async { 3679 async {
3680 $Coro::current->{desc} = "abt $msg";
3681
3622 my @bt = fork_call { 3682 my @bt = fork_call {
3623 @addr = map { sprintf "%x", $_ } @addr; 3683 @addr = map { sprintf "%x", $_ } @addr;
3624 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3684 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3625 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3685 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3626 or die "addr2line: $!"; 3686 or die "addr2line: $!";

Diff Legend

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