am d03c4985: Merge "Turning stack_core into a class to make it compatible with adbs."
* commit 'd03c4985e775b8b7a8126bb32de014766f5a8695': Turning stack_core into a class to make it compatible with adbs.
This commit is contained in:
@@ -69,7 +69,6 @@ def main():
|
||||
lines = f.readlines()
|
||||
f.close()
|
||||
|
||||
print "Reading symbols from", symbol.SYMBOLS_DIR
|
||||
stack_core.ConvertTrace(lines)
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
@@ -17,58 +17,14 @@
|
||||
"""stack symbolizes native crash dumps."""
|
||||
|
||||
import re
|
||||
|
||||
import symbol
|
||||
|
||||
def PrintTraceLines(trace_lines):
|
||||
"""Print back trace."""
|
||||
maxlen = max(map(lambda tl: len(tl[1]), trace_lines))
|
||||
spacing = ""
|
||||
if symbol.ARCH == "arm64" or symbol.ARCH == "mips64" or symbol.ARCH == "x86_64":
|
||||
spacing = " "
|
||||
print
|
||||
print "Stack Trace:"
|
||||
print " RELADDR " + spacing + "FUNCTION".ljust(maxlen) + " FILE:LINE"
|
||||
for tl in trace_lines:
|
||||
(addr, symbol_with_offset, location) = tl
|
||||
print " %8s %s %s" % (addr, symbol_with_offset.ljust(maxlen), location)
|
||||
return
|
||||
|
||||
|
||||
def PrintValueLines(value_lines):
|
||||
"""Print stack data values."""
|
||||
maxlen = max(map(lambda tl: len(tl[2]), value_lines))
|
||||
print
|
||||
print "Stack Data:"
|
||||
print " ADDR VALUE " + "FUNCTION".ljust(maxlen) + " FILE:LINE"
|
||||
for vl in value_lines:
|
||||
(addr, value, symbol_with_offset, location) = vl
|
||||
print " %8s %8s %s %s" % (addr, value, symbol_with_offset.ljust(maxlen), location)
|
||||
return
|
||||
|
||||
UNKNOWN = "<unknown>"
|
||||
HEAP = "[heap]"
|
||||
STACK = "[stack]"
|
||||
|
||||
|
||||
def PrintOutput(trace_lines, value_lines):
|
||||
if trace_lines:
|
||||
PrintTraceLines(trace_lines)
|
||||
if value_lines:
|
||||
PrintValueLines(value_lines)
|
||||
|
||||
def PrintDivider():
|
||||
print
|
||||
print "-----------------------------------------------------\n"
|
||||
|
||||
def CleanLine(ln):
|
||||
# AndroidFeedback adds zero width spaces into its crash reports. These
|
||||
# should be removed or the regular expresssions will fail to match.
|
||||
return unicode(ln, errors='ignore')
|
||||
|
||||
def ConvertTrace(lines):
|
||||
"""Convert strings containing native crash to a stack."""
|
||||
lines = map(CleanLine, lines)
|
||||
tracer = TraceConverter()
|
||||
print "Reading symbols from", symbol.SYMBOLS_DIR
|
||||
tracer.ConvertTrace(lines)
|
||||
|
||||
class TraceConverter:
|
||||
|
||||
process_info_line = re.compile("(pid: [0-9]+, tid: [0-9]+.*)")
|
||||
abi_line = re.compile("(ABI: \'(.*)\')")
|
||||
@@ -77,72 +33,118 @@ def ConvertTrace(lines):
|
||||
thread_line = re.compile("(.*)(\-\-\- ){15}\-\-\-")
|
||||
dalvik_jni_thread_line = re.compile("(\".*\" prio=[0-9]+ tid=[0-9]+ NATIVE.*)")
|
||||
dalvik_native_thread_line = re.compile("(\".*\" sysTid=[0-9]+ nice=[0-9]+.*)")
|
||||
|
||||
for line in lines:
|
||||
abi_header = abi_line.search(line)
|
||||
if abi_header:
|
||||
symbol.ARCH = abi_header.group(2)
|
||||
break
|
||||
|
||||
width = "{8}"
|
||||
if symbol.ARCH == "arm64" or symbol.ARCH == "mips64" or symbol.ARCH == "x86_64":
|
||||
width = "{16}"
|
||||
|
||||
register_line = re.compile("(([ ]*[0-9a-z]{2} +[0-9a-f]" + width + "){4})")
|
||||
|
||||
# Note that both trace and value line matching allow for variable amounts of
|
||||
# whitespace (e.g. \t). This is because the we want to allow for the stack
|
||||
# tool to operate on AndroidFeedback provided system logs. AndroidFeedback
|
||||
# strips out double spaces that are found in tombsone files and logcat output.
|
||||
#
|
||||
# Examples of matched trace lines include lines from tombstone files like:
|
||||
# #00 pc 001cf42e /data/data/com.my.project/lib/libmyproject.so
|
||||
# #00 pc 001cf42e /data/data/com.my.project/lib/libmyproject.so (symbol)
|
||||
# Or lines from AndroidFeedback crash report system logs like:
|
||||
# 03-25 00:51:05.520 I/DEBUG ( 65): #00 pc 001cf42e /data/data/com.my.project/lib/libmyproject.so
|
||||
# Please note the spacing differences.
|
||||
trace_line = re.compile("(.*)\#([0-9]+)[ \t]+(..)[ \t]+([0-9a-f]" + width + ")[ \t]+([^\r\n \t]*)( \((.*)\))?") # pylint: disable-msg=C6310
|
||||
# Examples of matched value lines include:
|
||||
# bea4170c 8018e4e9 /data/data/com.my.project/lib/libmyproject.so
|
||||
# bea4170c 8018e4e9 /data/data/com.my.project/lib/libmyproject.so (symbol)
|
||||
# 03-25 00:51:05.530 I/DEBUG ( 65): bea4170c 8018e4e9 /data/data/com.my.project/lib/libmyproject.so
|
||||
# Again, note the spacing differences.
|
||||
value_line = re.compile("(.*)([0-9a-f]" + width + ")[ \t]+([0-9a-f]" + width + ")[ \t]+([^\r\n \t]*)( \((.*)\))?")
|
||||
# Lines from 'code around' sections of the output will be matched before
|
||||
# value lines because otheriwse the 'code around' sections will be confused as
|
||||
# value lines.
|
||||
#
|
||||
# Examples include:
|
||||
# 801cf40c ffffc4cc 00b2f2c5 00b2f1c7 00c1e1a8
|
||||
# 03-25 00:51:05.530 I/DEBUG ( 65): 801cf40c ffffc4cc 00b2f2c5 00b2f1c7 00c1e1a8
|
||||
code_line = re.compile("(.*)[ \t]*[a-f0-9]" + width +
|
||||
"[ \t]*[a-f0-9]" + width +
|
||||
"[ \t]*[a-f0-9]" + width +
|
||||
"[ \t]*[a-f0-9]" + width +
|
||||
"[ \t]*[a-f0-9]" + width +
|
||||
"[ \t]*[ \r\n]") # pylint: disable-msg=C6310
|
||||
|
||||
register_line = re.compile("$a")
|
||||
trace_line = re.compile("$a")
|
||||
value_line = re.compile("$a")
|
||||
code_line = re.compile("$a")
|
||||
trace_lines = []
|
||||
value_lines = []
|
||||
last_frame = -1
|
||||
width = "{8}"
|
||||
|
||||
for line in lines:
|
||||
process_header = process_info_line.search(line)
|
||||
signal_header = signal_line.search(line)
|
||||
abort_message_header = abort_message_line.search(line)
|
||||
thread_header = thread_line.search(line)
|
||||
register_header = register_line.search(line)
|
||||
abi_header = abi_line.search(line)
|
||||
dalvik_jni_thread_header = dalvik_jni_thread_line.search(line)
|
||||
dalvik_native_thread_header = dalvik_native_thread_line.search(line)
|
||||
def __init__(self): pass
|
||||
|
||||
def UpdateABIRegexes(self):
|
||||
if symbol.ARCH == "arm64" or symbol.ARCH == "mips64" or symbol.ARCH == "x86_64":
|
||||
self.width = "{16}"
|
||||
|
||||
self.register_line = re.compile("(([ ]*[0-9a-z]{2} +[0-9a-f]" + self.width + "){4})")
|
||||
|
||||
# Note that both trace and value line matching allow for variable amounts of
|
||||
# whitespace (e.g. \t). This is because the we want to allow for the stack
|
||||
# tool to operate on AndroidFeedback provided system logs. AndroidFeedback
|
||||
# strips out double spaces that are found in tombsone files and logcat output.
|
||||
#
|
||||
# Examples of matched trace lines include lines from tombstone files like:
|
||||
# #00 pc 001cf42e /data/data/com.my.project/lib/libmyproject.so
|
||||
#
|
||||
# Or lines from AndroidFeedback crash report system logs like:
|
||||
# 03-25 00:51:05.520 I/DEBUG ( 65): #00 pc 001cf42e /data/data/com.my.project/lib/libmyproject.so
|
||||
# Please note the spacing differences.
|
||||
self.trace_line = re.compile("(.*)\#([0-9]+)[ \t]+(..)[ \t]+([0-9a-f]" + self.width + ")[ \t]+([^\r\n \t]*)( \((.*)\))?") # pylint: disable-msg=C6310
|
||||
# Examples of matched value lines include:
|
||||
# bea4170c 8018e4e9 /data/data/com.my.project/lib/libmyproject.so
|
||||
# bea4170c 8018e4e9 /data/data/com.my.project/lib/libmyproject.so (symbol)
|
||||
# 03-25 00:51:05.530 I/DEBUG ( 65): bea4170c 8018e4e9 /data/data/com.my.project/lib/libmyproject.so
|
||||
# Again, note the spacing differences.
|
||||
self.value_line = re.compile("(.*)([0-9a-f]" + self.width + ")[ \t]+([0-9a-f]" + self.width + ")[ \t]+([^\r\n \t]*)( \((.*)\))?")
|
||||
# Lines from 'code around' sections of the output will be matched before
|
||||
# value lines because otheriwse the 'code around' sections will be confused as
|
||||
# value lines.
|
||||
#
|
||||
# Examples include:
|
||||
# 801cf40c ffffc4cc 00b2f2c5 00b2f1c7 00c1e1a8
|
||||
# 03-25 00:51:05.530 I/DEBUG ( 65): 801cf40c ffffc4cc 00b2f2c5 00b2f1c7 00c1e1a8
|
||||
self.code_line = re.compile("(.*)[ \t]*[a-f0-9]" + self.width +
|
||||
"[ \t]*[a-f0-9]" + self.width +
|
||||
"[ \t]*[a-f0-9]" + self.width +
|
||||
"[ \t]*[a-f0-9]" + self.width +
|
||||
"[ \t]*[a-f0-9]" + self.width +
|
||||
"[ \t]*[ \r\n]") # pylint: disable-msg=C6310
|
||||
|
||||
def CleanLine(self, ln):
|
||||
# AndroidFeedback adds zero width spaces into its crash reports. These
|
||||
# should be removed or the regular expresssions will fail to match.
|
||||
return unicode(ln, errors='ignore')
|
||||
|
||||
def PrintTraceLines(self, trace_lines):
|
||||
"""Print back trace."""
|
||||
maxlen = max(map(lambda tl: len(tl[1]), trace_lines))
|
||||
spacing = ""
|
||||
if symbol.ARCH == "arm64" or symbol.ARCH == "mips64" or symbol.ARCH == "x86_64":
|
||||
spacing = " "
|
||||
print
|
||||
print "Stack Trace:"
|
||||
print " RELADDR " + spacing + "FUNCTION".ljust(maxlen) + " FILE:LINE"
|
||||
for tl in self.trace_lines:
|
||||
(addr, symbol_with_offset, location) = tl
|
||||
print " %8s %s %s" % (addr, symbol_with_offset.ljust(maxlen), location)
|
||||
return
|
||||
|
||||
def PrintValueLines(self, value_lines):
|
||||
"""Print stack data values."""
|
||||
maxlen = max(map(lambda tl: len(tl[2]), self.value_lines))
|
||||
print
|
||||
print "Stack Data:"
|
||||
print " ADDR VALUE " + "FUNCTION".ljust(maxlen) + " FILE:LINE"
|
||||
for vl in self.value_lines:
|
||||
(addr, value, symbol_with_offset, location) = vl
|
||||
print " %8s %8s %s %s" % (addr, value, symbol_with_offset.ljust(maxlen), location)
|
||||
return
|
||||
|
||||
def PrintOutput(self, trace_lines, value_lines):
|
||||
if self.trace_lines:
|
||||
self.PrintTraceLines(self.trace_lines)
|
||||
if self.value_lines:
|
||||
self.PrintValueLines(self.value_lines)
|
||||
|
||||
def PrintDivider(self):
|
||||
print
|
||||
print "-----------------------------------------------------\n"
|
||||
|
||||
def ConvertTrace(self, lines):
|
||||
lines = map(self.CleanLine, lines)
|
||||
for line in lines:
|
||||
self.ProcessLine(line)
|
||||
self.PrintOutput(self.trace_lines, self.value_lines)
|
||||
|
||||
def ProcessLine(self, line):
|
||||
process_header = self.process_info_line.search(line)
|
||||
signal_header = self.signal_line.search(line)
|
||||
abort_message_header = self.abort_message_line.search(line)
|
||||
thread_header = self.thread_line.search(line)
|
||||
register_header = self.register_line.search(line)
|
||||
abi_header = self.abi_line.search(line)
|
||||
dalvik_jni_thread_header = self.dalvik_jni_thread_line.search(line)
|
||||
dalvik_native_thread_header = self.dalvik_native_thread_line.search(line)
|
||||
if process_header or signal_header or abort_message_header or thread_header or abi_header or \
|
||||
register_header or dalvik_jni_thread_header or dalvik_native_thread_header:
|
||||
if trace_lines or value_lines:
|
||||
PrintOutput(trace_lines, value_lines)
|
||||
PrintDivider()
|
||||
trace_lines = []
|
||||
value_lines = []
|
||||
last_frame = -1
|
||||
if self.trace_lines or self.value_lines:
|
||||
self.PrintOutput(self.trace_lines, self.value_lines)
|
||||
self.PrintDivider()
|
||||
self.trace_lines = []
|
||||
self.value_lines = []
|
||||
self.last_frame = -1
|
||||
if process_header:
|
||||
print process_header.group(1)
|
||||
if signal_header:
|
||||
@@ -159,21 +161,23 @@ def ConvertTrace(lines):
|
||||
print dalvik_native_thread_header.group(1)
|
||||
if abi_header:
|
||||
print abi_header.group(1)
|
||||
continue
|
||||
if trace_line.match(line):
|
||||
match = trace_line.match(line)
|
||||
symbol.ARCH = abi_header.group(2)
|
||||
self.UpdateABIRegexes()
|
||||
return
|
||||
if self.trace_line.match(line):
|
||||
match = self.trace_line.match(line)
|
||||
(unused_0, frame, unused_1,
|
||||
code_addr, area, symbol_present, symbol_name) = match.groups()
|
||||
|
||||
if frame <= last_frame and (trace_lines or value_lines):
|
||||
PrintOutput(trace_lines, value_lines)
|
||||
PrintDivider()
|
||||
trace_lines = []
|
||||
value_lines = []
|
||||
last_frame = frame
|
||||
if frame <= self.last_frame and (self.trace_lines or self.value_lines):
|
||||
self.PrintOutput(self.trace_lines, self.value_lines)
|
||||
self.PrintDivider()
|
||||
self.trace_lines = []
|
||||
self.value_lines = []
|
||||
self.last_frame = frame
|
||||
|
||||
if area == UNKNOWN or area == HEAP or area == STACK:
|
||||
trace_lines.append((code_addr, "", area))
|
||||
if area == "<unknown>" or area == "[heap]" or area == "[stack]":
|
||||
self.trace_lines.append((code_addr, "", area))
|
||||
else:
|
||||
# If a calls b which further calls c and c is inlined to b, we want to
|
||||
# display "a -> b -> c" in the stack trace instead of just "a -> c"
|
||||
@@ -184,27 +188,30 @@ def ConvertTrace(lines):
|
||||
if symbol_present:
|
||||
source_symbol = symbol.CallCppFilt(symbol_name)
|
||||
else:
|
||||
source_symbol = UNKNOWN
|
||||
source_symbol = "<unknown>"
|
||||
if not source_location:
|
||||
source_location = area
|
||||
if nest_count > 0:
|
||||
nest_count = nest_count - 1
|
||||
trace_lines.append(("v------>", source_symbol, source_location))
|
||||
arrow = "v------>"
|
||||
if symbol.ARCH == "arm64" or symbol.ARCH == "mips64" or symbol.ARCH == "x86_64":
|
||||
arrow = "v-------------->"
|
||||
self.trace_lines.append((arrow, source_symbol, source_location))
|
||||
else:
|
||||
if not object_symbol_with_offset:
|
||||
object_symbol_with_offset = source_symbol
|
||||
trace_lines.append((code_addr,
|
||||
self.trace_lines.append((code_addr,
|
||||
object_symbol_with_offset,
|
||||
source_location))
|
||||
if code_line.match(line):
|
||||
if self.code_line.match(line):
|
||||
# Code lines should be ignored. If this were exluded the 'code around'
|
||||
# sections would trigger value_line matches.
|
||||
continue;
|
||||
if value_line.match(line):
|
||||
match = value_line.match(line)
|
||||
return
|
||||
if self.value_line.match(line):
|
||||
match = self.value_line.match(line)
|
||||
(unused_, addr, value, area, symbol_present, symbol_name) = match.groups()
|
||||
if area == UNKNOWN or area == HEAP or area == STACK or not area:
|
||||
value_lines.append((addr, value, "", area))
|
||||
if area == "<unknown>" or area == "[heap]" or area == "[stack]" or not area:
|
||||
self.value_lines.append((addr, value, "", area))
|
||||
else:
|
||||
info = symbol.SymbolInformation(area, value)
|
||||
(source_symbol, source_location, object_symbol_with_offset) = info.pop()
|
||||
@@ -212,17 +219,14 @@ def ConvertTrace(lines):
|
||||
if symbol_present:
|
||||
source_symbol = symbol.CallCppFilt(symbol_name)
|
||||
else:
|
||||
source_symbol = UNKNOWN
|
||||
source_symbol = "<unknown>"
|
||||
if not source_location:
|
||||
source_location = area
|
||||
if not object_symbol_with_offset:
|
||||
object_symbol_with_offset = source_symbol
|
||||
value_lines.append((addr,
|
||||
self.value_lines.append((addr,
|
||||
value,
|
||||
object_symbol_with_offset,
|
||||
source_location))
|
||||
|
||||
PrintOutput(trace_lines, value_lines)
|
||||
|
||||
|
||||
# vi: ts=2 sw=2
|
||||
#self.PrintOutput(self.trace_lines, self.value_lines)
|
||||
|
||||
Reference in New Issue
Block a user