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.358 by root, Fri Sep 7 18:10:52 2007 UTC vs.
Revision 1.378 by root, Thu Oct 4 11:36:54 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);
… …
2073 2100
2074 return if $self->players; 2101 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2076 return if $self->{deny_save}; 2103 return if $self->{deny_save};
2077 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2078 $self->deactivate; 2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2109 $self->clear;
2080 $self->in_memory (cf::MAP_SWAPPED);
2081} 2110}
2082 2111
2083sub reset_at { 2112sub reset_at {
2084 my ($self) = @_; 2113 my ($self) = @_;
2085 2114
… …
2118 } 2147 }
2119 2148
2120 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
2121 2150
2122 $self->deactivate; 2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2123 $self->clear; 2153 $self->clear;
2124
2125 $_->clear_links_to ($self) for values %cf::MAP;
2126 2154
2127 $self->unlink_save; 2155 $self->unlink_save;
2128 $self->destroy; 2156 $self->destroy;
2129} 2157}
2130 2158
… …
2245=cut 2273=cut
2246 2274
2247sub deref { 2275sub deref {
2248 my ($ref) = @_; 2276 my ($ref) = @_;
2249 2277
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2278 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2); 2279 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2280 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return; 2281 or return;
2257 $pl->ob->uuid eq $uuid 2282 $pl->ob->uuid eq $uuid
2258 or return; 2283 or return;
… …
2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2454 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2430 2455
2431 $self->enter_link; 2456 $self->enter_link;
2432 2457
2433 (async { 2458 (async {
2459 $Coro::current->{desc} = "player::goto $path $x $y";
2460
2461 # *tag paths override both path and x|y
2462 if ($path =~ /^\*(.*)$/) {
2463 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2464 my $ob = $obs[rand @obs];
2465
2466 # see if we actually can go there
2467 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2468 $ob = $obs[rand @obs];
2469 } else {
2470 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 }
2472 # else put us there anyways for now #d#
2473
2474 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2475 } else {
2476 ($path, $x, $y) = (undef, undef, undef);
2477 }
2478 }
2479
2434 my $map = eval { 2480 my $map = eval {
2435 my $map = cf::map::find $path; 2481 my $map = defined $path ? cf::map::find $path : undef;
2436 2482
2437 if ($map) { 2483 if ($map) {
2438 $map = $map->customise_for ($self); 2484 $map = $map->customise_for ($self);
2439 $map = $check->($map) if $check && $map; 2485 $map = $check->($map) if $check && $map;
2440 } else { 2486 } else {
2441 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2487 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2442 } 2488 }
2443 2489
2444 $map 2490 $map
2445 }; 2491 };
2446 2492
… …
2536 # if exit is damned, update players death & WoR home-position 2582 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp) 2583 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED); 2584 if $exit->flag (FLAG_DAMNED);
2539 2585
2540 (async { 2586 (async {
2587 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2588
2541 $self->deactivate_recursive; # just to be sure 2589 $self->deactivate_recursive; # just to be sure
2542 unless (eval { 2590 unless (eval {
2543 $self->goto ($slaying, $hp, $sp); 2591 $self->goto ($slaying, $hp, $sp);
2544 2592
2545 1; 2593 1;
… …
2582 2630
2583=cut 2631=cut
2584 2632
2585our %CHANNEL = ( 2633our %CHANNEL = (
2586 "c/identify" => { 2634 "c/identify" => {
2587 id => "identify", 2635 id => "infobox",
2588 title => "Identify", 2636 title => "Identify",
2589 reply => undef, 2637 reply => undef,
2590 tooltip => "Items recently identified", 2638 tooltip => "Items recently identified",
2591 }, 2639 },
2592 "c/examine" => { 2640 "c/examine" => {
2593 id => "examine", 2641 id => "infobox",
2594 title => "Examine", 2642 title => "Examine",
2595 reply => undef, 2643 reply => undef,
2596 tooltip => "Signs and other items you examined", 2644 tooltip => "Signs and other items you examined",
2597 }, 2645 },
2646 "c/lookat" => {
2647 id => "infobox",
2648 title => "Look",
2649 reply => undef,
2650 tooltip => "What you saw there",
2651 },
2598); 2652);
2599 2653
2600sub cf::client::send_msg { 2654sub cf::client::send_msg {
2601 my ($self, $channel, $msg, $color, @extra) = @_; 2655 my ($self, $channel, $msg, $color, @extra) = @_;
2602 2656
2603 $msg = $self->pl->expand_cfpod ($msg); 2657 $msg = $self->pl->expand_cfpod ($msg);
2604 2658
2605 $color &= cf::NDI_CLIENT_MASK; # just in case... 2659 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606 2660
2607 # check predefined channels, for the benefit of C 2661 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2662 if ($CHANNEL{$channel}) {
2663 $channel = $CHANNEL{$channel};
2609 2664
2665 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg;
2667
2668 $channel = $channel->{id};
2669
2610 if (ref $channel) { 2670 } elsif (ref $channel) {
2611 # send meta info to client, if not yet sent 2671 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) { 2672 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel; 2673 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel) 2674 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg; 2675 if $self->can_msg;
… …
3134sub main { 3194sub main {
3135 # we must not ever block the main coroutine 3195 # we must not ever block the main coroutine
3136 local $Coro::idle = sub { 3196 local $Coro::idle = sub {
3137 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3138 (async { 3198 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER";
3139 Event::one_event; 3200 Event::one_event;
3140 })->prio (Coro::PRIO_MAX); 3201 })->prio (Coro::PRIO_MAX);
3141 }; 3202 };
3142 3203
3143 reload_config; 3204 reload_config;
… …
3387register_command "reload" => sub { 3448register_command "reload" => sub {
3388 my ($who, $arg) = @_; 3449 my ($who, $arg) = @_;
3389 3450
3390 if ($who->flag (FLAG_WIZ)) { 3451 if ($who->flag (FLAG_WIZ)) {
3391 $who->message ("reloading server."); 3452 $who->message ("reloading server.");
3453 async {
3454 $Coro::current->{desc} = "perl_reload";
3392 async { reload_perl }; 3455 reload_perl;
3456 };
3393 } 3457 }
3394}; 3458};
3395 3459
3396unshift @INC, $LIBDIR; 3460unshift @INC, $LIBDIR;
3397 3461
… …
3416 my $signal = new Coro::Signal; 3480 my $signal = new Coro::Signal;
3417 push @WAIT_FOR_TICK_BEGIN, $signal; 3481 push @WAIT_FOR_TICK_BEGIN, $signal;
3418 $signal->wait; 3482 $signal->wait;
3419} 3483}
3420 3484
3421 my $min = 1e6;#d#
3422 my $avg = 10;
3423$TICK_WATCHER = Event->timer ( 3485$TICK_WATCHER = Event->timer (
3424 reentrant => 0, 3486 reentrant => 0,
3425 parked => 1, 3487 parked => 1,
3426 prio => 0, 3488 prio => 0,
3427 at => $NEXT_TICK || $TICK, 3489 at => $NEXT_TICK || $TICK,
… …
3435 3497
3436 $NOW = $tick_start = Event::time; 3498 $NOW = $tick_start = Event::time;
3437 3499
3438 cf::server_tick; # one server iteration 3500 cf::server_tick; # one server iteration
3439 3501
3440 0 && sync_job {#d#
3441 for(1..10) {
3442 my $t = Event::time;
3443 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3444 or die;
3445
3446 $map->width (50);
3447 $map->height (50);
3448 $map->alloc;
3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3450 my $t = Event::time - $t;
3451
3452 #next unless $t < 0.0013;#d#
3453 if ($t < $min) {
3454 $min = $t;
3455 }
3456 $avg = $avg * 0.99 + $t * 0.01;
3457 }
3458 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3459 exit 0;
3460 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3461 };
3462
3463 $RUNTIME += $TICK; 3502 $RUNTIME += $TICK;
3464 $NEXT_TICK += $TICK; 3503 $NEXT_TICK += $TICK;
3465 3504
3466 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3505 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3467 $NEXT_RUNTIME_WRITE = $NOW + 10; 3506 $NEXT_RUNTIME_WRITE = $NOW + 10;
3468 Coro::async_pool { 3507 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver";
3469 write_runtime 3509 write_runtime
3470 or warn "ERROR: unable to write runtime file: $!"; 3510 or warn "ERROR: unable to write runtime file: $!";
3471 }; 3511 };
3472 } 3512 }
3473 3513
3474# my $AFTER = Event::time;
3475# warn $AFTER - $NOW;#d#
3476
3477 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3478 $sig->send; 3515 $sig->send;
3479 } 3516 }
3480 while (my $sig = shift @WAIT_FOR_TICK) { 3517 while (my $sig = shift @WAIT_FOR_TICK) {
3481 $sig->send; 3518 $sig->send;
… …
3491 3528
3492 $LOAD = ($NOW - $tick_start) / $TICK; 3529 $LOAD = ($NOW - $tick_start) / $TICK;
3493 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3494 3531
3495 _post_tick; 3532 _post_tick;
3496
3497
3498 }, 3533 },
3499); 3534);
3500 3535
3501{ 3536{
3537 BDB::min_parallel 8;
3502 BDB::max_poll_time $TICK * 0.1; 3538 BDB::max_poll_time $TICK * 0.1;
3503 $BDB_POLL_WATCHER = Event->io ( 3539 $BDB_POLL_WATCHER = Event->io (
3504 reentrant => 0, 3540 reentrant => 0,
3505 fd => BDB::poll_fileno, 3541 fd => BDB::poll_fileno,
3506 poll => 'r', 3542 poll => 'r',
3507 prio => 0, 3543 prio => 0,
3508 data => WF_AUTOCANCEL, 3544 data => WF_AUTOCANCEL,
3509 cb => \&BDB::poll_cb, 3545 cb => \&BDB::poll_cb,
3510 ); 3546 );
3511 BDB::min_parallel 8;
3512 3547
3513 BDB::set_sync_prepare { 3548 BDB::set_sync_prepare {
3514 my $status; 3549 my $status;
3515 my $current = $Coro::current; 3550 my $current = $Coro::current;
3516 ( 3551 (
… …
3525 ) 3560 )
3526 }; 3561 };
3527 3562
3528 unless ($DB_ENV) { 3563 unless ($DB_ENV) {
3529 $DB_ENV = BDB::db_env_create; 3564 $DB_ENV = BDB::db_env_create;
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3567 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3568 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3530 3569
3531 cf::sync_job { 3570 cf::sync_job {
3532 eval { 3571 eval {
3533 BDB::db_env_open 3572 BDB::db_env_open
3534 $DB_ENV, 3573 $DB_ENV,
… …
3536 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3575 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3537 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3576 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3538 0666; 3577 0666;
3539 3578
3540 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3579 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3541
3542 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3543 $DB_ENV->set_lk_detect;
3544 }; 3580 };
3545 3581
3546 cf::cleanup "db_env_open(db): $@" if $@; 3582 cf::cleanup "db_env_open(db): $@" if $@;
3547 }; 3583 };
3548 } 3584 }
3585
3586 $BDB_DEADLOCK_WATCHER = Event->timer (
3587 after => 3,
3588 interval => 1,
3589 hard => 1,
3590 prio => 0,
3591 data => WF_AUTOCANCEL,
3592 cb => sub {
3593 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3594 },
3595 );
3596 $BDB_CHECKPOINT_WATCHER = Event->timer (
3597 after => 11,
3598 interval => 60,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3604 },
3605 );
3606 $BDB_TRICKLE_WATCHER = Event->timer (
3607 after => 5,
3608 interval => 10,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3614 },
3615 );
3549} 3616}
3550 3617
3551{ 3618{
3552 IO::AIO::min_parallel 8; 3619 IO::AIO::min_parallel 8;
3553 3620
… …
3556 $AIO_POLL_WATCHER = Event->io ( 3623 $AIO_POLL_WATCHER = Event->io (
3557 reentrant => 0, 3624 reentrant => 0,
3558 data => WF_AUTOCANCEL, 3625 data => WF_AUTOCANCEL,
3559 fd => IO::AIO::poll_fileno, 3626 fd => IO::AIO::poll_fileno,
3560 poll => 'r', 3627 poll => 'r',
3561 prio => 6, 3628 prio => 0,
3562 cb => \&IO::AIO::poll_cb, 3629 cb => \&IO::AIO::poll_cb,
3563 ); 3630 );
3564} 3631}
3565 3632
3566my $_log_backtrace; 3633my $_log_backtrace;
… …
3572 3639
3573 # limit the # of concurrent backtraces 3640 # limit the # of concurrent backtraces
3574 if ($_log_backtrace < 2) { 3641 if ($_log_backtrace < 2) {
3575 ++$_log_backtrace; 3642 ++$_log_backtrace;
3576 async { 3643 async {
3644 $Coro::current->{desc} = "abt $msg";
3645
3577 my @bt = fork_call { 3646 my @bt = fork_call {
3578 @addr = map { sprintf "%x", $_ } @addr; 3647 @addr = map { sprintf "%x", $_ } @addr;
3579 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3648 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3580 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3649 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3581 or die "addr2line: $!"; 3650 or die "addr2line: $!";

Diff Legend

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