RepoMirrors/gperftools
1
0
Fork 0
mirror of https://github.com/gperftools/gperftools synced 2025-02-21 06:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the use of addr2line to discover the separator symbol.

Browse Source 
In systems where addr2line has a version greater than 2.22 pprof fails
in discover the separator symbol (_fini). This patch identifies if
addr2line can find the symbol, otherwise pprof uses objdump to recover
a address that addr2line's newer versions can recognize as the separator
function.
This commit is contained in:
Raphael Moreira Zinsly 2014-04-08 17:37:29 -03:00 committed by Aliaksey Kandratsenka
parent 8b2e5ee831
commit a1ae66ef11
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/pprof
View File

@ -4987,6 +4987,7 @@ sub error {
sub GetProcedureBoundariesViaNm {
my $escaped_nm_command = shift; # shell-escaped
my $regexp = shift;
my $image = shift;
my $symbol_table = {};
open(NM, "$escaped_nm_command |") || error("$escaped_nm_command: $!\n");
@ -5056,6 +5057,37 @@ sub GetProcedureBoundariesViaNm {
$symbol_table->{$routine} = [HexExtend($last_start),
HexExtend($last_start)];
}
# Verify if addr2line can find the $sep_symbol. If not, we use objdump
# to find the address for the $sep_symbol on code section which addr2line
# can find.
if (defined($sep_address)){
my $start_val = $sep_address;
my $addr2line = $obj_tool_map{"addr2line"};
my $cmd = ShellEscape($addr2line, "-f", "-C", "-e", $image, "-i");
open(FINI, "echo $start_val | $cmd |")
|| error("echo $start_val | $cmd: $!\n");
$_ = <FINI>;
s/\r?\n$//g;
my $fini = $_;
close(FINI);
if ($fini ne $sep_symbol){
my $objdump = $obj_tool_map{"objdump"};
$cmd = ShellEscape($objdump, "-d", $image);
my $grep = ShellEscape("grep", $sep_symbol);
my $tail = ShellEscape("tail", "-n", "1");
open(FINI, "$cmd | $grep | $tail |")
|| error("$cmd | $grep | $tail: $!\n");
s/\r//g; # turn windows-looking lines into unix-looking lines
my $data = <FINI>;
if (defined($data)){
($start_val, $fini) = split(/ </,$data);
}
close(FINI);
}
$sep_address = HexExtend($start_val);
}
return $symbol_table;
}
@ -5135,7 +5167,7 @@ sub GetProcedureBoundaries {
}
foreach my $nm_command (@nm_commands) {
my $symbol_table = GetProcedureBoundariesViaNm($nm_command, $regexp);
my $symbol_table = GetProcedureBoundariesViaNm($nm_command, $regexp, $image);
return $symbol_table if (%{$symbol_table});
}
my $symbol_table = {};