Remove parameters from symbolized stack traces.
The expanded parameters take a lot horizontal space
and almost always push the file:line of the screen,
or text-wrap generating multiple lines per frame.
This CL tries to make the output less cluttered by
removing parameters from the unmangled method names.
It is possible to add the parameters back using
the --verbose command line argument.
Test: Add unit tests, investigate crashes from logcat
Change-Id: I42d1e26dbc2fa9db8b7bd95ce449cb2bd93f93f8
diff --git a/scripts/stack_core.py b/scripts/stack_core.py
index 6e84db3..50d5c94 100755
--- a/scripts/stack_core.py
+++ b/scripts/stack_core.py
@@ -498,12 +498,15 @@
# display "a -> b -> c" in the stack trace instead of just "a -> c"
info = symbol.SymbolInformation(lib, code_addr)
nest_count = len(info) - 1
- for (source_symbol, source_location, object_symbol_with_offset) in info:
+ for (source_symbol, source_location, symbol_with_offset) in info:
if not source_symbol:
if symbol_present:
source_symbol = symbol.CallCppFilt(symbol_name)
else:
source_symbol = "<unknown>"
+ if not symbol.VERBOSE:
+ source_symbol = symbol.FormatSymbolWithoutParameters(source_symbol)
+ symbol_with_offset = symbol.FormatSymbolWithoutParameters(symbol_with_offset)
if not source_location:
source_location = area
if lib_name:
@@ -515,11 +518,9 @@
arrow = "v-------------->"
self.trace_lines.append((arrow, source_symbol, source_location))
else:
- if not object_symbol_with_offset:
- object_symbol_with_offset = source_symbol
- self.trace_lines.append((code_addr,
- object_symbol_with_offset,
- source_location))
+ if not symbol_with_offset:
+ symbol_with_offset = source_symbol
+ self.trace_lines.append((code_addr, symbol_with_offset, source_location))
if self.code_line.match(line):
# Code lines should be ignored. If this were exluded the 'code around'
# sections would trigger value_line matches.