Bug 1050601 - Remove fix-linux-stack.pl. r=ted.

--HG--
extra : rebase_source : f344aa5db9e16575835a7de3df34c311635c128b
This commit is contained in:
Nicholas Nethercote 2014-09-03 09:24:38 -07:00
Родитель 5d2757e9d4
Коммит ab2d367e37
9 изменённых файлов: 26 добавлений и 317 удалений

Просмотреть файл

@ -108,7 +108,7 @@ libs:: $(topsrcdir)/tools/rb/fix_macosx_stack.py
endif
ifeq ($(OS_ARCH),Linux)
libs:: $(topsrcdir)/tools/rb/fix-linux-stack.pl
libs:: $(topsrcdir)/tools/rb/fix_linux_stack.py
$(INSTALL) $< $(DIST)/bin
endif

Просмотреть файл

@ -68,7 +68,6 @@ _IS_CYGWIN = False
#endif
#expand _IS_CAMINO = __IS_CAMINO__ != 0
#expand _BIN_SUFFIX = __BIN_SUFFIX__
#expand _PERL = __PERL__
#expand _DEFAULT_APP = "./" + __BROWSER_PATH__
#expand _CERTS_SRC_DIR = __CERTS_SRC_DIR__
@ -143,7 +142,6 @@ class Automation(object):
IS_CYGWIN = _IS_CYGWIN
IS_CAMINO = _IS_CAMINO
BIN_SUFFIX = _BIN_SUFFIX
PERL = _PERL
UNIXISH = not IS_WIN32 and not IS_MAC
@ -671,7 +669,6 @@ class Automation(object):
def waitForFinish(self, proc, utilityPath, timeout, maxTime, startTime, debuggerInfo, symbolsPath):
""" Look for timeout or crashes and return the status after the process terminates """
stackFixerProcess = None
stackFixerFunction = None
didTimeout = False
hitMaxTime = False
@ -694,12 +691,12 @@ class Automation(object):
stackFixerFunction = lambda line: stackFixerModule.fixSymbols(line)
del sys.path[0]
elif self.IS_DEBUG_BUILD and self.IS_LINUX:
# Run logsource through fix-linux-stack.pl (uses addr2line)
# Run each line through a function in fix_linux_stack.py (uses addr2line)
# This method is preferred for developer machines, so we don't have to run "make buildsymbols".
stackFixerProcess = self.Process([self.PERL, os.path.join(utilityPath, "fix-linux-stack.pl")],
stdin=logsource,
stdout=subprocess.PIPE)
logsource = stackFixerProcess.stdout
sys.path.insert(0, utilityPath)
import fix_linux_stack as stackFixerModule
stackFixerFunction = lambda line: stackFixerModule.fixSymbols(line)
del sys.path[0]
# With metro browser runs this script launches the metro test harness which launches the browser.
# The metro test harness hands back the real browser process id via log output which we need to
@ -725,7 +722,7 @@ class Automation(object):
self.log.info("INFO | automation.py | metro browser sub process id detected: %s", browserProcessId)
if not hitMaxTime and maxTime and datetime.now() - startTime > timedelta(seconds = maxTime):
# Kill the application, but continue reading from stack fixer so as not to deadlock on stackFixerProcess.wait().
# Kill the application.
hitMaxTime = True
self.log.info("TEST-UNEXPECTED-FAIL | %s | application ran for longer than allowed maximum time of %d seconds", self.lastTestSeen, int(maxTime))
self.killAndGetStack(proc.pid, utilityPath, debuggerInfo)
@ -743,11 +740,6 @@ class Automation(object):
self.lastTestSeen = "Main app process exited normally"
if status != 0 and not didTimeout and not hitMaxTime:
self.log.info("TEST-UNEXPECTED-FAIL | %s | Exited with code %d during test run", self.lastTestSeen, status)
if stackFixerProcess is not None:
fixerStatus = stackFixerProcess.wait()
automationutils.printstatus(status, "stackFixerProcess")
if fixerStatus != 0 and not didTimeout and not hitMaxTime:
self.log.info("TEST-UNEXPECTED-FAIL | automation.py | Stack fixer process exited with code %d during test run", fixerStatus)
return status
def buildCommandLine(self, app, debuggerInfo, profileDir, testURL, extraArgs):

Просмотреть файл

@ -1745,7 +1745,7 @@ PrintSortedRecords(const Writer& aWriter, CodeAddressService* aLocService,
StatusMsg(" printing %s heap block record array...\n", astr);
size_t cumulativeUsableSize = 0;
// Limit the number of records printed, because fix-linux-stack.pl is too
// Limit the number of records printed, because fix_linux_stack.py is too
// damn slow. Note that we don't break out of this loop because we need to
// keep adding to |cumulativeUsableSize|.
uint32_t numRecords = recordArray.length();

Просмотреть файл

@ -50,7 +50,7 @@ def main():
sysname = platform.system()
if sysname == "Linux":
fix = srcdir + os.sep + "tools/rb/fix-linux-stack.pl"
fix = srcdir + os.sep + "tools/rb/fix_linux_stack.py"
elif sysname == "Darwin":
fix = srcdir + os.sep + "tools/rb/fix_macosx_stack.py"
else:

Просмотреть файл

@ -131,7 +131,7 @@ TEST_HARNESS_BINS += fix_macosx_stack.py
endif
ifeq ($(OS_ARCH),Linux)
TEST_HARNESS_BINS += fix-linux-stack.pl
TEST_HARNESS_BINS += fix_linux_stack.py
endif
ifeq (gtk2_1,$(MOZ_WIDGET_TOOLKIT)_$(MOZ_X11))

Просмотреть файл

@ -1480,13 +1480,8 @@ class Mochitest(MochitestUtilsMixin):
printstatus(status, "Main app process")
runner.process_handler = None
if timeout is None:
didTimeout = False
else:
didTimeout = proc.didTimeout
# finalize output handler
outputHandler.finish(didTimeout)
outputHandler.finish()
# record post-test information
if status:
@ -1853,16 +1848,12 @@ class Mochitest(MochitestUtilsMixin):
self.lsanLeaks = lsanLeaks
self.bisectChunk = bisectChunk
# perl binary to use
self.perl = which('perl')
# With metro browser runs this script launches the metro test harness which launches the browser.
# The metro test harness hands back the real browser process id via log output which we need to
# pick up on and parse out. This variable tracks the real browser process id if we find it.
self.browserProcessId = None
# stack fixer function and/or process
self.stackFixerFunction, self.stackFixerProcess = self.stackFixer()
self.stackFixerFunction = self.stackFixer()
def processOutputLine(self, line):
"""per line handler of output for mozprocess"""
@ -1897,14 +1888,13 @@ class Mochitest(MochitestUtilsMixin):
def stackFixer(self):
"""
return 2-tuple, (stackFixerFunction, StackFixerProcess),
if any, to use on the output lines
return stackFixerFunction, if any, to use on the output lines
"""
if not mozinfo.info.get('debug'):
return None, None
return None
stackFixerFunction = stackFixerProcess = None
stackFixerFunction = None
def import_stackFixerModule(module_name):
sys.path.insert(0, self.utilityPath)
@ -1913,35 +1903,20 @@ class Mochitest(MochitestUtilsMixin):
return module
if self.symbolsPath and os.path.exists(self.symbolsPath):
# Run each line through a function in fix_stack_using_bpsyms.py (uses breakpad symbol files)
# Run each line through a function in fix_stack_using_bpsyms.py (uses breakpad symbol files).
# This method is preferred for Tinderbox builds, since native symbols may have been stripped.
stackFixerModule = import_stackFixerModule('fix_stack_using_bpsyms')
stackFixerFunction = lambda line: stackFixerModule.fixSymbols(line, self.symbolsPath)
elif mozinfo.isLinux and self.perl:
# Run logsource through fix-linux-stack.pl (uses addr2line)
elif mozinfo.isLinux:
# Run each line through fix_linux_stack.py (uses addr2line).
# This method is preferred for developer machines, so we don't have to run "make buildsymbols".
stackFixerCommand = [self.perl, os.path.join(self.utilityPath, "fix-linux-stack.pl")]
stackFixerProcess = subprocess.Popen(stackFixerCommand, stdin=subprocess.PIPE,
stdout=subprocess.PIPE)
def fixFunc(lines):
out = []
for line in lines.split('\n'):
stackFixerProcess.stdin.write(line + '\n')
out.append(stackFixerProcess.stdout.readline().rstrip())
return '\n'.join(out)
stackFixerModule = import_stackFixerModule('fix_linux_stack')
stackFixerFunction = lambda line: stackFixerModule.fixSymbols(line)
stackFixerFunction = fixFunc
return (stackFixerFunction, stackFixerProcess)
def finish(self, didTimeout):
if self.stackFixerProcess:
self.stackFixerProcess.communicate()
status = self.stackFixerProcess.returncode
if status and not didTimeout:
self.harness.log.info("TEST-UNEXPECTED-FAIL | runtests.py | Stack fixer process exited with code %d during test run" % status)
return stackFixerFunction
def finish(self):
if self.shutdownLeaks:
self.shutdownLeaks.process()

Просмотреть файл

@ -1,259 +0,0 @@
#!/usr/bin/perl
# vim:sw=4:ts=4:et:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# $Id: fix-linux-stack.pl,v 1.16 2008/05/05 21:51:11 dbaron%dbaron.org Exp $
#
# This script uses addr2line (part of binutils) to process the output of
# nsTraceRefcnt's Linux stack walking code. This is useful for two
# things:
# (1) Getting line number information out of
# |nsTraceRefcnt::WalkTheStack|'s output in debug builds.
# (2) Getting function names out of |nsTraceRefcnt::WalkTheStack|'s
# output on optimized builds (where it mostly prints UNKNOWN
# because only a handful of symbols are exported from component
# libraries).
#
# Use the script by piping output containing stacks (such as raw stacks
# or make-tree.pl balance trees) through this script.
use strict;
use IPC::Open2;
use File::Basename;
# XXX Hard-coded to gdb defaults (works on Fedora).
my $global_debug_dir = '/usr/lib/debug';
# We record several things for each file encountered.
#
# - {pipe_read}, {pipe_write}: these constitute a bidirectional pipe to an
# addr2line process that gives symbol information for a file.
#
# - {cache}: this table holds the results of lookups that we've done
# previously for (pre-adjustment) addresses, which lets us avoid redundant
# calls to addr2line.
#
# - {address_adjustment}: addr2line wants offsets relative to the base address
# for shared libraries, but it wants addresses including the base address
# offset for executables. This holds the appropriate address adjustment to
# add to an offset within file. See bug 230336.
#
my %file_infos;
sub set_address_adjustment($$) {
my ($file, $file_info) = @_;
# find out if it's an executable (as opposed to a shared library)
my $elftype;
open(ELFHDR, '-|', 'readelf', '-h', $file);
while (<ELFHDR>) {
if (/^\s*Type:\s+(\S+)/) {
$elftype = $1;
last;
}
}
close(ELFHDR);
# If it's an executable, make adjustment the base address.
# Otherwise, leave it zero.
my $adjustment = 0;
if ($elftype eq 'EXEC') {
open(ELFSECS, '-|', 'readelf', '-S', $file);
while (<ELFSECS>) {
if (/^\s*\[\s*\d+\]\s+\.text\s+\w+\s+(\w+)\s+(\w+)\s+/) {
# Subtract the .text section's offset within the
# file from its base address.
$adjustment = hex($1) - hex($2);
last;
}
}
close(ELFSECS);
}
$file_info->{address_adjustment} = $adjustment;
}
# Files sometimes contain a link to a separate object file that contains
# the debug sections of the binary, removed so that a smaller file can
# be shipped, but kept separately so that it can be obtained by those
# who want it.
# See http://sources.redhat.com/gdb/current/onlinedocs/gdb_16.html#SEC154
# for documentation of debugging information in separate files.
# On Fedora distributions, these files can be obtained by installing
# *-debuginfo RPM packages.
sub separate_debug_file_for($) {
my ($file) = @_;
# We can read the .gnu_debuglink section using either of:
# objdump -s --section=.gnu_debuglink $file
# readelf -x .gnu_debuglink $file
# Since readelf prints things backwards on little-endian platforms
# for some versions only (backwards on Fedora Core 6, forwards on
# Fedora 7), use objdump.
# See if there's a .gnu_debuglink section
my $have_debuglink = 0;
open(ELFSECS, '-|', 'readelf', '-S', $file);
while (<ELFSECS>) {
if (/^\s*\[\s*\d+\]\s+\.gnu_debuglink\s+\w+\s+(\w+)\s+(\w+)\s+/) {
$have_debuglink = 1;
last;
}
}
close(ELFSECS);
return '' unless ($have_debuglink);
# Determine the endianness of the shared library.
my $endian = '';
open(ELFHDR, '-|', 'readelf', '-h', $file);
while (<ELFHDR>) {
if (/^\s*Data:\s+.*(little|big) endian.*$/) {
$endian = $1;
last;
}
}
close(ELFHDR);
if ($endian ne 'little' && $endian ne 'big') {
print STDERR "Warning: could not determine endianness of $file.\n";
return '';
}
# Read the debuglink section as an array of words, in hexidecimal.
open(DEBUGLINK, '-|', 'objdump', '-s', '--section=.gnu_debuglink', $file);
my @words;
while (<DEBUGLINK>) {
if ($_ =~ /^ [0-9a-f]* ([0-9a-f ]{8}) ([0-9a-f ]{8}) ([0-9a-f ]{8}) ([0-9a-f ]{8}).*/) {
push @words, $1, $2, $3, $4;
}
}
close(DEBUGLINK);
while (@words[$#words] eq ' ') {
pop @words;
}
if ($#words < 1) {
print STDERR "Warning: .gnu_debuglink section in $file too short.\n";
return '';
}
my @chars;
while ($#words >= 0) {
my $w = shift @words;
if ($w =~ /^([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/) {
push @chars, $1, $2, $3, $4;
} else {
print STDERR "Warning: malformed objdump output for $file.\n";
return '';
}
}
my @hash_bytes = map(hex, @chars[$#chars - 3 .. $#chars]);
$#chars -= 4;
my $hash;
if ($endian eq 'little') {
$hash = ($hash_bytes[3] << 24) | ($hash_bytes[2] << 16) | ($hash_bytes[1] << 8) | $hash_bytes[0];
} else {
$hash = ($hash_bytes[0] << 24) | ($hash_bytes[1] << 16) | ($hash_bytes[2] << 8) | $hash_bytes[3];
}
# The string ends with a null-terminator and then 0 to three bytes
# of padding to fill the current 32-bit unit. (This padding is
# usually null bytes, but I've seen null-null-H, on Ubuntu x86_64.)
my $terminator = 1;
while ($chars[$terminator] ne '00') {
if ($terminator == $#chars) {
print STDERR "Warning: missing null terminator in " .
".gnu_debuglink section of $file.\n";
return '';
}
++$terminator;
}
if ($#chars - $terminator > 3) {
print STDERR "Warning: Excess padding in .gnu_debuglink section " .
"of $file.\n";
return '';
}
$#chars = $terminator - 1;
my $basename = join('', map { chr(hex($_)) } @chars);
# Now $basename and $hash represent the information in the
# .gnu_debuglink section.
#printf STDERR "%x: %s\n", $hash, $basename;
my @possible_results = (
dirname($file) . $basename,
dirname($file) . '.debug/' . $basename,
$global_debug_dir . dirname($file) . '/' . $basename
);
foreach my $result (@possible_results) {
if (-f $result) {
# XXX We should check the hash.
return $result;
}
}
return '';
}
sub get_file_info($) {
my ($file) = @_;
my $file_info = $file_infos{$file};
unless (defined $file_info) {
my $debug_file = separate_debug_file_for($file);
$debug_file = $file if ($debug_file eq '');
my $pid = open2($file_info->{pipe_read}, $file_info->{pipe_write},
'/usr/bin/addr2line', '-C', '-f', '-e', $debug_file);
set_address_adjustment($file, $file_info);
$file_infos{$file} = $file_info;
}
return $file_info;
}
# Ignore SIGPIPE as a workaround for addr2line crashes in some situations.
$SIG{PIPE} = 'IGNORE';
select STDOUT; $| = 1; # make STDOUT unbuffered
while (<>) {
my $line = $_;
if ($line =~ /^([ \|0-9-]*)(.*) ?\[([^ ]*) \+(0x[0-9A-F]{1,8})\](.*)$/) {
my $before = $1; # allow preservation of balance trees
my $badsymbol = $2;
my $file = $3;
my $address = hex($4);
my $after = $5; # allow preservation of counts
if (-f $file) {
my $file_info = get_file_info($file);
my $result = $file_info->{cache}->{$address};
if (not defined $result) {
my $address2 = $address + $file_info->{address_adjustment};
my $out = $file_info->{pipe_write};
my $in = $file_info->{pipe_read};
printf {$out} "0x%X\n", $address2;
chomp(my $symbol = <$in>);
chomp(my $fileandline = <$in>);
if (!$symbol || $symbol eq '??') { $symbol = $badsymbol; }
if (!$fileandline || $fileandline eq '??:0') {
$fileandline = $file;
}
$result = "$symbol ($fileandline)";
$file_info->{cache}->{$address} = $result;
}
print "$before$result$after\n";
} else {
print STDERR "Warning: File \"$file\" does not exist.\n";
print $line;
}
} else {
print $line;
}
}

Просмотреть файл

@ -318,7 +318,8 @@ def fixSymbols(line):
if fileline == "??:0" or fileline == "??:?":
fileline = file
return "%s%s (%s)%s\n" % (before, name, fileline, after)
nl = '\n' if line[-1] == '\n' else ''
return "%s%s (%s)%s%s" % (before, name, fileline, after, nl)
else:
sys.stderr.write("Warning: File \"" + file + "\" does not exist.\n")
return line

Просмотреть файл

@ -167,7 +167,7 @@ public:
uintptr_t entryPc = (uintptr_t)(entry.mPc);
// Sometimes we get nothing useful. Just print "???" for the entire entry
// so that fix-linux-stack.pl doesn't complain about an empty filename.
// so that fix_linux_stack.py doesn't complain about an empty filename.
if (!entry.mFunction && !entry.mLibrary[0] && entry.mLOffset == 0) {
snprintf(aBuf, aBufLen, "??? 0x%" PRIxPTR, entryPc);
} else {
@ -179,7 +179,7 @@ public:
entryFunction, entry.mFileName, entry.mLineNo, entryPc);
} else {
// On Linux and Mac we cannot get the filename and line number at
// runtime, so we print the offset in a form that fix-linux-stack.pl and
// runtime, so we print the offset in a form that fix_linux_stack.py and
// fix_macosx_stack.py can post-process.
snprintf(aBuf, aBufLen, "%s[%s +0x%" PRIXPTR "] 0x%" PRIxPTR,
entryFunction, entry.mLibrary, entry.mLOffset, entryPc);