Merge "stack: support output from dumpsys meminfo --unreachable"
diff --git a/scripts/example_crashes.py b/scripts/example_crashes.py
index 4b8b6b5..29f4c94 100755
--- a/scripts/example_crashes.py
+++ b/scripts/example_crashes.py
@@ -185,3 +185,17 @@
#07 pc 000000000001d3eb /system/lib64/libc.so (__start_thread+11)
#08 pc 00000000000138f5 /system/lib64/libc.so (__bionic_clone+53)
"""
+
+libmemunreachable = """
+ Unreachable memory
+ 48 bytes in 2 unreachable allocations
+ ABI: 'arm'
+
+ 24 bytes unreachable at a11e6748
+ and 24 similar unreachable bytes in 1 allocation
+ contents:
+ a11e6748: 63 6f 6d 2e 61 6e 64 72 6f 69 64 2e 73 79 73 74 com.android.syst
+ a11e6758: 65 6d 75 69 00 00 00 00 emui....
+ #00 pc 000076ae /system/lib/libcutils.so (set_process_name+45)
+ #01 pc 000989d6 /system/lib/libandroid_runtime.so (android_os_Process_setArgV0(_JNIEnv*, _jobject*, _jstring*)+125)
+"""
diff --git a/scripts/stack_core.py b/scripts/stack_core.py
index d29acbf..6750667 100755
--- a/scripts/stack_core.py
+++ b/scripts/stack_core.py
@@ -47,6 +47,10 @@
zipinfo_central_info_match = re.compile(
"^\s*(\S+)$\s*offset of local header from start of archive:\s*(\d+)"
".*^\s*compressed size:\s+(\d+)", re.M | re.S)
+ unreachable_line = re.compile("((\d+ bytes in \d+ unreachable allocations)|"+\
+ "(\d+ bytes unreachable at [0-9a-f]+)|"+\
+ "(referencing \d+ unreachable bytes in \d+ allocation(s)?)|"+\
+ "(and \d+ similar unreachable bytes in \d+ allocation(s)?))")
trace_lines = []
value_lines = []
last_frame = -1
@@ -306,8 +310,11 @@
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)
+ unreachable_header = self.unreachable_line.search(line)
if process_header or signal_header or abort_message_header or thread_header or \
- register_header or dalvik_jni_thread_header or dalvik_native_thread_header or revision_header:
+ register_header or dalvik_jni_thread_header or dalvik_native_thread_header or \
+ revision_header or unreachable_header:
+ ret = True
if self.trace_lines or self.value_lines:
self.PrintOutput(self.trace_lines, self.value_lines)
self.PrintDivider()
@@ -330,6 +337,8 @@
print dalvik_native_thread_header.group(1)
if revision_header:
print revision_header.group(1)
+ if unreachable_header:
+ print unreachable_header.group(1)
return True
trace_line_dict = self.MatchTraceLine(line)
if trace_line_dict is not None:
@@ -448,6 +457,24 @@
def test_x86_64_registers(self):
self.assert_register_matches("x86_64", example_crashes.x86_64, '\\b(rax|rsi|r8|r12|cs|rip)\\b')
+class LibmemunreachablePatternTests(unittest.TestCase):
+ def test_libmemunreachable(self):
+ tc = TraceConverter()
+ lines = example_crashes.libmemunreachable.split('\n')
+
+ symbol.SetAbi(lines)
+ self.assertEquals(symbol.ARCH, "arm")
+
+ tc.UpdateAbiRegexes()
+ header_lines = 0
+ for line in lines:
+ tc.ProcessLine(line)
+ if re.search(tc.unreachable_line, line) is not None:
+ header_lines += 1
+
+ self.assertEquals(header_lines, 3)
+ self.assertEquals(len(tc.trace_lines), 2)
+ tc.PrintOutput(tc.trace_lines, tc.value_lines)
if __name__ == '__main__':
unittest.main()
