summaryrefslogtreecommitdiffstats
path: root/scripts/stack_core.py
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-07-07 21:55:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-07 21:55:08 +0000
commit0d5ba377f41d91226ceaf55d161f260e1900bdcb (patch)
tree59bbcef8638be5b3f0dd1bba872695d4ab3c75ec /scripts/stack_core.py
parentf615b65f1a0725391270c00664db6a4ee328d777 (diff)
parent434f3f67b4b7ba38e0390046be8d8f53af8644de (diff)
downloadandroid_development-0d5ba377f41d91226ceaf55d161f260e1900bdcb.tar.gz
android_development-0d5ba377f41d91226ceaf55d161f260e1900bdcb.tar.bz2
android_development-0d5ba377f41d91226ceaf55d161f260e1900bdcb.zip
am 434f3f67: am 121b2939: Merge "stack_core now also detects the "Revision: #" line."
* commit '434f3f67b4b7ba38e0390046be8d8f53af8644de': stack_core now also detects the "Revision: #" line.
Diffstat (limited to 'scripts/stack_core.py')
-rwxr-xr-xscripts/stack_core.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/stack_core.py b/scripts/stack_core.py
index 056f6073f..fbf57ff84 100755
--- a/scripts/stack_core.py
+++ b/scripts/stack_core.py
@@ -28,6 +28,7 @@ def ConvertTrace(lines):
class TraceConverter:
process_info_line = re.compile("(pid: [0-9]+, tid: [0-9]+.*)")
abi_line = re.compile("(ABI: \'(.*)\')")
+ revision_line = re.compile("(Revision: \'(.*)\')")
signal_line = re.compile("(signal [0-9]+ \(.*\).*)")
abort_message_line = re.compile("(Abort message: '.*')")
thread_line = re.compile("(.*)(\-\-\- ){15}\-\-\-")
@@ -143,10 +144,11 @@ class TraceConverter:
thread_header = self.thread_line.search(line)
register_header = self.register_line.search(line)
abi_header = self.abi_line.search(line)
+ revision_header = self.revision_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:
+ register_header or dalvik_jni_thread_header or dalvik_native_thread_header or revision_header:
if self.trace_lines or self.value_lines:
self.PrintOutput(self.trace_lines, self.value_lines)
self.PrintDivider()
@@ -167,6 +169,8 @@ class TraceConverter:
print dalvik_jni_thread_header.group(1)
if dalvik_native_thread_header:
print dalvik_native_thread_header.group(1)
+ if revision_header:
+ print revision_header.group(1)
if abi_header:
print abi_header.group(1)
symbol.ARCH = abi_header.group(2)