tools/stack_decode.py: backtrace.h doesn't always emit a symbol name

Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
envoyproxy · Aug 26, 2019 · 00ee946 · 00ee946
1 parent 3f88846
commit 00ee946
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/tools/stack_decode.py b/tools/stack_decode.py
@@ -25,11 +25,13 @@
 def decode_stacktrace_log(object_file, input_source):
   traces = {}
   # Match something like:
-  #     [backtrace] bazel-out/local-dbg/bin/source/server/_virtual_includes/backtrace_lib/server/backtrace.h:84]
+  #     [backtrace] [bazel-out/local-dbg/bin/source/server/_virtual_includes/backtrace_lib/server/backtrace.h:84]
   backtrace_marker = "\[backtrace\] [^\s]+"
   # Match something like:
   #     ${backtrace_marker} #10: SYMBOL [0xADDR]
-  stackaddr_re = re.compile("%s #\d+: .* \[(0x[0-9a-fA-F]+)\]$" % backtrace_marker)
+  # or:
+  #     ${backtrace_marker} #10: [0xADDR]
+  stackaddr_re = re.compile("%s #\d+:(?: .*)? \[(0x[0-9a-fA-F]+)\]$" % backtrace_marker)
 
   try:
     while True: