diff --git a/scripts/Android.bp b/scripts/Android.bp index 146935c55..c0f62015c 100644 --- a/scripts/Android.bp +++ b/scripts/Android.bp @@ -27,3 +27,23 @@ python_library_host { }, } +python_test_host { + name: "python-native_heapdump_viewer_test", + main: "native_heapdump_viewer_tests.py", + srcs: [ + "native_heapdump_viewer.py", + "native_heapdump_viewer_tests.py", + ], + test_config: "native_heapdump_viewer-tests.xml", + test_suites: ["general-tests"], +} + +python_test_host { + name: "python-symbol_test", + main: "symbol.py", + // Would be nice to use the library above, but as it's single-source + // this doesn't work. + srcs: ["symbol.py"], + test_config: "symbol-tests.xml", + test_suites: ["general-tests"], +} diff --git a/scripts/TEST_MAPPING b/scripts/TEST_MAPPING new file mode 100644 index 000000000..1d2b9d07c --- /dev/null +++ b/scripts/TEST_MAPPING @@ -0,0 +1,10 @@ +{ + "presubmit": [ + { + "name": "python-native_heapdump_viewer_test" + }, + { + "name": "python-symbol_test" + } + ] +} diff --git a/scripts/native_heapdump_viewer-tests.xml b/scripts/native_heapdump_viewer-tests.xml new file mode 100644 index 000000000..25d562376 --- /dev/null +++ b/scripts/native_heapdump_viewer-tests.xml @@ -0,0 +1,7 @@ + + diff --git a/scripts/native_heapdump_viewer.py b/scripts/native_heapdump_viewer.py index e888e8f42..9b2a6e594 100755 --- a/scripts/native_heapdump_viewer.py +++ b/scripts/native_heapdump_viewer.py @@ -82,13 +82,13 @@ Usage: elif sys.argv[i] == "--reverse": self.reverse_frames = True elif sys.argv[i][0] == '-': - print "Invalid option " + sys.argv[i] + print("Invalid option %s" % (sys.argv[i])) else: extra_args.append(sys.argv[i]) i += 1 if len(extra_args) != 1: - print self._usage + print(self._usage) sys.exit(1) self.native_heap = extra_args[0] @@ -118,10 +118,11 @@ def GetVersion(native_heap): re_line = re.compile("Android\s+Native\s+Heap\s+Dump\s+(?Pv\d+\.\d+)\s*$") matched = 0 - for line in open(native_heap, "r"): - m = re_line.match(line) - if m: - return m.group('version') + with open(native_heap, "r") as f: + for line in f: + m = re_line.match(line) + if m: + return m.group('version') return None def GetNumFieldValidByParsingLines(native_heap): @@ -143,24 +144,25 @@ def GetNumFieldValidByParsingLines(native_heap): re_line = re.compile("z\s+(?P\d+)\s+sz\s+(?P\d+)\s+num\s+(?P\d+)") matched = 0 backtrace_size = 0 - for line in open(native_heap, "r"): - if backtrace_size == 0: - m = re_backtrace.match(line) - if m: - backtrace_size = int(m.group('backtrace_size')) - parts = line.split() - if len(parts) > 7 and parts[0] == "z" and parts[2] == "sz": - m = re_line.match(line) - if m: - num_allocations = int(m.group('num_allocations')) - if num_allocations == backtrace_size: - # At least three lines must match this pattern before - # considering this the old buggy version of malloc debug. - matched += 1 - if matched == 3: - return False - else: - return True + with open(native_heap, "r") as f: + for line in f: + if backtrace_size == 0: + m = re_backtrace.match(line) + if m: + backtrace_size = int(m.group('backtrace_size')) + parts = line.split() + if len(parts) > 7 and parts[0] == "z" and parts[2] == "sz": + m = re_line.match(line) + if m: + num_allocations = int(m.group('num_allocations')) + if num_allocations == backtrace_size: + # At least three lines must match this pattern before + # considering this the old buggy version of malloc debug. + matched += 1 + if matched == 3: + return False + else: + return True return matched == 0 def GetNumFieldValid(native_heap): @@ -220,34 +222,35 @@ def ParseNativeHeap(native_heap, reverse_frames, num_field_valid, app_symboldir) re_map = re.compile("(?P[0-9a-f]+)-(?P[0-9a-f]+) .... (?P[0-9a-f]+) [0-9a-f]+:[0-9a-f]+ [0-9]+ +(?P.*)") - for line in open(native_heap, "r"): - # Format of line: - # z 0 sz 50 num 1 bt 000000000000a100 000000000000b200 - parts = line.split() - if len(parts) > 7 and parts[0] == "z" and parts[2] == "sz": - is_zygote = parts[1] != "1" - size = int(parts[3]) - if num_field_valid: - num_allocs = int(parts[5]) + with open(native_heap, "r") as f: + for line in f: + # Format of line: + # z 0 sz 50 num 1 bt 000000000000a100 000000000000b200 + parts = line.split() + if len(parts) > 7 and parts[0] == "z" and parts[2] == "sz": + is_zygote = parts[1] != "1" + size = int(parts[3]) + if num_field_valid: + num_allocs = int(parts[5]) + else: + num_allocs = 1 + frames = list(map(lambda x: int(x, 16), parts[7:])) + if reverse_frames: + frames = list(reversed(frames)) + backtraces.append(Backtrace(is_zygote, size, num_allocs, frames)) else: - num_allocs = 1 - frames = map(lambda x: int(x, 16), parts[7:]) - if reverse_frames: - frames = list(reversed(frames)) - backtraces.append(Backtrace(is_zygote, size, num_allocs, frames)) - else: - # Parse map line: - # 720de01000-720ded7000 r-xp 00000000 fd:00 495 /system/lib64/libc.so - m = re_map.match(line) - if m: - # Offset of mapping start - start = int(m.group('start'), 16) - # Offset of mapping end - end = int(m.group('end'), 16) - # Offset within file that is mapped - offset = int(m.group('offset'), 16) - name = m.group('name') - mappings.append(GetMappingFromOffset(Mapping(start, end, offset, name), app_symboldir)) + # Parse map line: + # 720de01000-720ded7000 r-xp 00000000 fd:00 495 /system/lib64/libc.so + m = re_map.match(line) + if m: + # Offset of mapping start + start = int(m.group('start'), 16) + # Offset of mapping end + end = int(m.group('end'), 16) + # Offset within file that is mapped + offset = int(m.group('offset'), 16) + name = m.group('name') + mappings.append(GetMappingFromOffset(Mapping(start, end, offset, name), app_symboldir)) return backtraces, mappings def FindMapping(mappings, addr): @@ -300,7 +303,7 @@ def ResolveAddrs(html_output, symboldir, app_symboldir, backtraces, mappings): # Resolve functions and line numbers. if html_output == False: - print "Resolving symbols using directory %s..." % symboldir + print("Resolving symbols using directory %s..." % symboldir) for lib in addrs_by_lib: sofile = app_symboldir + lib @@ -335,7 +338,7 @@ def ResolveAddrs(html_output, symboldir, app_symboldir, backtraces, mappings): resolved_addrs[addrs_by_lib[lib][x]] = FrameDescription("---", "---", lib) else: if html_output == False: - print "%s not found for symbol resolution" % lib + print("%s not found for symbol resolution" % lib) fd = FrameDescription("???", "???", lib) for addr in addrs_by_lib[lib]: @@ -374,7 +377,7 @@ def Display(resolved_addrs, indent, total, parent_total, node): parent_percent = 0 if parent_total != 0: parent_percent = 100 * node.size / float(parent_total) - print "%9d %6.2f%% %6.2f%% %8d %s%s %s %s %s" % (node.size, total_percent, parent_percent, node.number, indent, node.addr, fd.library, fd.function, fd.location) + print("%9d %6.2f%% %6.2f%% %8d %s%s %s %s %s" % (node.size, total_percent, parent_percent, node.number, indent, node.addr, fd.library, fd.function, fd.location)) children = sorted(node.children.values(), key=lambda x: x.size, reverse=True) for child in children: Display(resolved_addrs, indent + " ", total, node.size, child) @@ -395,23 +398,23 @@ def DisplayHtml(verbose, resolved_addrs, total, node, extra, label_count): label = label.replace("<", "<") label = label.replace(">", ">") children = sorted(node.children.values(), key=lambda x: x.size, reverse=True) - print '
  • ' + print('
  • ') if len(children) > 0: - print '' - print '' - print '
      ' + print('') + print('') + print('
        ') label_count += 1 for child in children: label_count = DisplayHtml(verbose, resolved_addrs, total, child, "", label_count) - print '
      ' + print('
    ') else: - print label - print '
    • ' + print(label) + print('') return label_count def CreateHtml(verbose, app, zygote, resolved_addrs): - print """ + print(""" Native allocation HTML viewer

    Click on an individual line to expand/collapse to see the details of the allocation data
      -""" +""") label_count = 0 label_count = DisplayHtml(verbose, resolved_addrs, app.size, app, "app ", label_count) if zygote.size > 0: DisplayHtml(verbose, resolved_addrs, zygote.size, zygote, "zygote ", label_count) - print "
    " + print("") def main(): args = Args() @@ -468,12 +471,12 @@ def main(): if args.html_output: CreateHtml(args.verbose, app, zygote, resolved_addrs) else: - print "" - print "%9s %6s %6s %8s %s %s %s %s" % ("BYTES", "%TOTAL", "%PARENT", "COUNT", "ADDR", "LIBRARY", "FUNCTION", "LOCATION") + print("") + print("%9s %6s %6s %8s %s %s %s %s" % ("BYTES", "%TOTAL", "%PARENT", "COUNT", "ADDR", "LIBRARY", "FUNCTION", "LOCATION")) Display(resolved_addrs, "", app.size, app.size + zygote.size, app) - print "" + print("") Display(resolved_addrs, "", zygote.size, app.size + zygote.size, zygote) - print "" + print("") if __name__ == '__main__': main() diff --git a/scripts/native_heapdump_viewer_tests.py b/scripts/native_heapdump_viewer_tests.py index 1b30c2352..423d1c89c 100755 --- a/scripts/native_heapdump_viewer_tests.py +++ b/scripts/native_heapdump_viewer_tests.py @@ -27,7 +27,7 @@ class NativeHeapdumpViewerTest(unittest.TestCase): def CreateTmpFile(self, contents): fd, self._tmp_file_name = tempfile.mkstemp() - os.write(fd, contents) + os.write(fd, contents.encode()) os.close(fd) return self._tmp_file_name @@ -36,7 +36,7 @@ class NativeHeapdumpViewerTest(unittest.TestCase): try: os.unlink(self._tmp_file_name) except Exception: - print "Failed to delete " + heap + print("Failed to delete %s" % (heap)) class GetNumFieldValidTest(NativeHeapdumpViewerTest): _map_data = """ @@ -180,4 +180,4 @@ END self.assertEqual("/system/lib64/libutils.so", mappings[1].name) if __name__ == '__main__': - unittest.main() + unittest.main(verbosity=2) diff --git a/scripts/symbol-tests.xml b/scripts/symbol-tests.xml new file mode 100644 index 000000000..a0e575bc4 --- /dev/null +++ b/scripts/symbol-tests.xml @@ -0,0 +1,7 @@ + + diff --git a/scripts/symbol.py b/scripts/symbol.py index 5c92ae68f..e6560e42d 100755 --- a/scripts/symbol.py +++ b/scripts/symbol.py @@ -28,18 +28,24 @@ import signal import subprocess import unittest -ANDROID_BUILD_TOP = os.environ["ANDROID_BUILD_TOP"] -if not ANDROID_BUILD_TOP: +try: + ANDROID_BUILD_TOP = str(os.environ["ANDROID_BUILD_TOP"]) + if not ANDROID_BUILD_TOP: + ANDROID_BUILD_TOP = "." +except: ANDROID_BUILD_TOP = "." def FindSymbolsDir(): saveddir = os.getcwd() os.chdir(ANDROID_BUILD_TOP) + stream = None try: cmd = "build/soong/soong_ui.bash --dumpvar-mode --abs TARGET_OUT_UNSTRIPPED" stream = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True).stdout - return os.path.join(ANDROID_BUILD_TOP, stream.read().strip()) + return os.path.join(ANDROID_BUILD_TOP, str(stream.read().strip())) finally: + if stream is not None: + stream.close() os.chdir(saveddir) SYMBOLS_DIR = FindSymbolsDir() @@ -166,7 +172,7 @@ def FindToolchain(): _CACHED_TOOLCHAIN = toolchain _CACHED_TOOLCHAIN_ARCH = ARCH - print "Using %s toolchain from: %s" % (_CACHED_TOOLCHAIN_ARCH, _CACHED_TOOLCHAIN) + print("Using %s toolchain from: %s" % (_CACHED_TOOLCHAIN_ARCH, _CACHED_TOOLCHAIN)) return _CACHED_TOOLCHAIN @@ -547,6 +553,7 @@ class FindToolchainTests(unittest.TestCase): ARCH = abi FindToolchain() # Will throw on failure. + @unittest.skipIf(ANDROID_BUILD_TOP == '.', 'Test only supported in an Android tree.') def test_toolchains_found(self): self.assert_toolchain_found("arm") self.assert_toolchain_found("arm64") @@ -717,7 +724,13 @@ class SetArchTests(unittest.TestCase): def test_no_abi(self): global ARCH - self.assertRaisesRegexp(Exception, "Could not determine arch from input, use --arch=XXX to specify it", SetAbi, []) + # Python2 vs Python3 compatibility: Python3 warns on Regexp deprecation, but Regex + # does not provide that name. + if not hasattr(unittest.TestCase, 'assertRaisesRegex'): + unittest.TestCase.assertRaisesRegex = getattr(unittest.TestCase, 'assertRaisesRegexp') + self.assertRaisesRegex(Exception, + "Could not determine arch from input, use --arch=XXX to specify it", + SetAbi, []) if __name__ == '__main__': - unittest.main() + unittest.main(verbosity=2)