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.369 by root, Thu Sep 13 08:35:25 2007 UTC vs.
Revision 1.382 by root, Thu Oct 11 00:34:31 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
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 | logBacktrace, 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
… …
1025); 1031);
1026 1032
1027sub object_freezer_save { 1033sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1029 1035
1030 my $guard = cf::lock_acquire "io";
1031
1032 sync_job { 1036 sync_job {
1033 if (length $$rdata) { 1037 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1038 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
… …
1042 close $fh; 1046 close $fh;
1043 1047
1044 if (@$objs) { 1048 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1050 chmod SAVE_MODE, $fh;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1052 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1053 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1054 close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1055 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1056 }
… …
1061 } else { 1065 } else {
1062 aio_unlink $filename; 1066 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1064 } 1068 }
1065 }; 1069 };
1066
1067 undef $guard;
1068} 1070}
1069 1071
1070sub object_freezer_as_string { 1072sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1072 1074
… …
1077 1079
1078sub object_thawer_load { 1080sub object_thawer_load {
1079 my ($filename) = @_; 1081 my ($filename) = @_;
1080 1082
1081 my ($data, $av); 1083 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1084
1085 (aio_load $filename, $data) >= 0 1085 (aio_load $filename, $data) >= 0
1086 or return; 1086 or return;
1087 1087
1088 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1090 or return;
1091 1091
1092 undef $guard; 1092 my $st = eval { Coro::Storable::thaw $av }
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs};
1094 } 1095 }
1095 1096
1096 utf8::decode (my $decname = $filename); 1097 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1354
1354 my $f = new_from_file cf::object::thawer path $login 1355 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1356 or return;
1356 1357
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1358 my $pl = cf::player::load_pl $f
1359 or return; 1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1361 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
… …
2043 } 2043 }
2044 2044
2045 $MAP_PREFETCH{$path} |= $load; 2045 $MAP_PREFETCH{$path} |= $load;
2046 2046
2047 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
2048 $Coro::current->{desc} = "map prefetcher";
2049
2048 while (%MAP_PREFETCH) { 2050 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2051 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2052 if (my $map = find $k) {
2051 $map->load if $v; 2053 $map->load if $v;
2052 } 2054 }
… …
2078 return if $self->{deny_save}; 2080 return if $self->{deny_save};
2079 2081
2080 local $self->{last_access} = $self->last_access;#d# 2082 local $self->{last_access} = $self->last_access;#d#
2081 2083
2082 cf::async { 2084 cf::async {
2085 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2086 $_->contr->save for $self->players;
2084 }; 2087 };
2085 2088
2086 if ($uniq) { 2089 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2277=cut
2275 2278
2276sub deref { 2279sub deref {
2277 my ($ref) = @_; 2280 my ($ref) = @_;
2278 2281
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2282 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2285 or return;
2286 $pl->ob->uuid eq $uuid 2286 $pl->ob->uuid eq $uuid
2287 or return; 2287 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2459
2460 $self->enter_link; 2460 $self->enter_link;
2461 2461
2462 (async { 2462 (async {
2463 $Coro::current->{desc} = "player::goto $path $x $y";
2464
2463 # *tag paths override both path and x|y 2465 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2466 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2467 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2468 my $ob = $obs[rand @obs];
2467 2469
… …
2584 # if exit is damned, update players death & WoR home-position 2586 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp) 2587 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED); 2588 if $exit->flag (FLAG_DAMNED);
2587 2589
2588 (async { 2590 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2592
2589 $self->deactivate_recursive; # just to be sure 2593 $self->deactivate_recursive; # just to be sure
2590 unless (eval { 2594 unless (eval {
2591 $self->goto ($slaying, $hp, $sp); 2595 $self->goto ($slaying, $hp, $sp);
2592 2596
2593 1; 2597 1;
… …
2630 2634
2631=cut 2635=cut
2632 2636
2633our %CHANNEL = ( 2637our %CHANNEL = (
2634 "c/identify" => { 2638 "c/identify" => {
2635 id => "identify", 2639 id => "infobox",
2636 title => "Identify", 2640 title => "Identify",
2637 reply => undef, 2641 reply => undef,
2638 tooltip => "Items recently identified", 2642 tooltip => "Items recently identified",
2639 }, 2643 },
2640 "c/examine" => { 2644 "c/examine" => {
2641 id => "examine", 2645 id => "infobox",
2642 title => "Examine", 2646 title => "Examine",
2643 reply => undef, 2647 reply => undef,
2644 tooltip => "Signs and other items you examined", 2648 tooltip => "Signs and other items you examined",
2645 }, 2649 },
2650 "c/lookat" => {
2651 id => "infobox",
2652 title => "Look",
2653 reply => undef,
2654 tooltip => "What you saw there",
2655 },
2646); 2656);
2647 2657
2648sub cf::client::send_msg { 2658sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2659 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2660
2651 $msg = $self->pl->expand_cfpod ($msg); 2661 $msg = $self->pl->expand_cfpod ($msg);
2652 2662
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2663 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2664
2655 # check predefined channels, for the benefit of C 2665 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2666 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel};
2657 2668
2669 $self->ext_msg (channel_info => $channel)
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id};
2673
2658 if (ref $channel) { 2674 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2675 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2676 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2677 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2678 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg; 2679 if $self->can_msg;
… …
3182sub main { 3198sub main {
3183 # we must not ever block the main coroutine 3199 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3200 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3202 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER";
3187 Event::one_event; 3204 Event::one_event;
3188 })->prio (Coro::PRIO_MAX); 3205 })->prio (Coro::PRIO_MAX);
3189 }; 3206 };
3190 3207
3191 reload_config; 3208 reload_config;
… …
3263 # and maps saved/destroyed asynchronously. 3280 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3281 warn "begin emergency player save\n";
3265 for my $login (keys %cf::PLAYER) { 3282 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3283 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3284 $pl->valid or next;
3285 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3286 $pl->save;
3269 } 3287 }
3270 warn "end emergency player save\n"; 3288 warn "end emergency player save\n";
3271 3289
3272 warn "begin emergency map save\n"; 3290 warn "begin emergency map save\n";
… …
3435register_command "reload" => sub { 3453register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3454 my ($who, $arg) = @_;
3437 3455
3438 if ($who->flag (FLAG_WIZ)) { 3456 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3457 $who->message ("reloading server.");
3458 async {
3459 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3460 reload_perl;
3461 };
3441 } 3462 }
3442}; 3463};
3443 3464
3444unshift @INC, $LIBDIR; 3465unshift @INC, $LIBDIR;
3445 3466
… …
3463 3484
3464 my $signal = new Coro::Signal; 3485 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3486 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3487 $signal->wait;
3467} 3488}
3468
3469our $stat_fh;
3470sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3471 3489
3472$TICK_WATCHER = Event->timer ( 3490$TICK_WATCHER = Event->timer (
3473 reentrant => 0, 3491 reentrant => 0,
3474 parked => 1, 3492 parked => 1,
3475 prio => 0, 3493 prio => 0,
… …
3480 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3498 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3481 unless ++$bug_warning > 10; 3499 unless ++$bug_warning > 10;
3482 return; 3500 return;
3483 } 3501 }
3484 3502
3485 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3486
3487 $NOW = $tick_start = Event::time; 3503 $NOW = $tick_start = Event::time;
3488 3504
3489 cf::server_tick; # one server iteration 3505 cf::server_tick; # one server iteration
3490 3506
3491 $RUNTIME += $TICK; 3507 $RUNTIME += $TICK;
3492 $NEXT_TICK += $TICK; 3508 $NEXT_TICK += $TICK;
3493 3509
3494 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3510 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3495 $NEXT_RUNTIME_WRITE = $NOW + 10; 3511 $NEXT_RUNTIME_WRITE = $NOW + 10;
3496 Coro::async_pool { 3512 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver";
3497 write_runtime 3514 write_runtime
3498 or warn "ERROR: unable to write runtime file: $!"; 3515 or warn "ERROR: unable to write runtime file: $!";
3499 }; 3516 };
3500 } 3517 }
3501 3518
3502# my $AFTER = Event::time;
3503# warn $AFTER - $NOW;#d#
3504
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 3520 $sig->send;
3507 } 3521 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 3522 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 3523 $sig->send;
… …
3519 3533
3520 $LOAD = ($NOW - $tick_start) / $TICK; 3534 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 3536
3523 _post_tick; 3537 _post_tick;
3524
3525 # gather some statistics#d#
3526 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3527 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3528 }, 3538 },
3529); 3539);
3530 3540
3531{ 3541{
3532 BDB::min_parallel 8; 3542 BDB::min_parallel 8;
… …
3555 ) 3565 )
3556 }; 3566 };
3557 3567
3558 unless ($DB_ENV) { 3568 unless ($DB_ENV) {
3559 $DB_ENV = BDB::db_env_create; 3569 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3571 | BDB::LOG_AUTOREMOVE, 1);
3572 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560 3574
3561 cf::sync_job { 3575 cf::sync_job {
3562 eval { 3576 eval {
3563 BDB::db_env_open 3577 BDB::db_env_open
3564 $DB_ENV, 3578 $DB_ENV,
… …
3566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3580 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3581 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3568 0666; 3582 0666;
3569 3583
3570 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3584 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3571
3572 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3573 | BDB::LOG_AUTOREMOVE, 1);
3574 $DB_ENV->set_lk_detect;
3575 }; 3585 };
3576 3586
3577 cf::cleanup "db_env_open(db): $@" if $@; 3587 cf::cleanup "db_env_open(db): $@" if $@;
3578 }; 3588 };
3579 } 3589 }
3580 3590
3591 $BDB_DEADLOCK_WATCHER = Event->timer (
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 );
3581 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3601 $BDB_CHECKPOINT_WATCHER = Event->timer (
3582 after => 11, 3602 after => 11,
3583 interval => 60, 3603 interval => 60,
3584 hard => 1, 3604 hard => 1,
3585 prio => 0, 3605 prio => 0,
… …
3608 $AIO_POLL_WATCHER = Event->io ( 3628 $AIO_POLL_WATCHER = Event->io (
3609 reentrant => 0, 3629 reentrant => 0,
3610 data => WF_AUTOCANCEL, 3630 data => WF_AUTOCANCEL,
3611 fd => IO::AIO::poll_fileno, 3631 fd => IO::AIO::poll_fileno,
3612 poll => 'r', 3632 poll => 'r',
3613 prio => 6, 3633 prio => 0,
3614 cb => \&IO::AIO::poll_cb, 3634 cb => \&IO::AIO::poll_cb,
3615 ); 3635 );
3616} 3636}
3617 3637
3618my $_log_backtrace; 3638my $_log_backtrace;
… …
3624 3644
3625 # limit the # of concurrent backtraces 3645 # limit the # of concurrent backtraces
3626 if ($_log_backtrace < 2) { 3646 if ($_log_backtrace < 2) {
3627 ++$_log_backtrace; 3647 ++$_log_backtrace;
3628 async { 3648 async {
3649 $Coro::current->{desc} = "abt $msg";
3650
3629 my @bt = fork_call { 3651 my @bt = fork_call {
3630 @addr = map { sprintf "%x", $_ } @addr; 3652 @addr = map { sprintf "%x", $_ } @addr;
3631 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3653 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3632 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3654 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3633 or die "addr2line: $!"; 3655 or die "addr2line: $!";

Diff Legend

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