LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stack symbolization: Replace functools.cache

Browse Source 
Use lru_cache(maxsize=None) instead which is equivalent,
and is available on older python versions as well.

Also fix a bug where null "lib" variable was dereferenced.

Bug: 204507951
Bug: 171980804
Test: Run script with python3.7
Change-Id: I922ee48451ad3c60c2237fb0554e1838c1bf81af
This commit is contained in:
David Srbecky
2021-10-29 11:35:18 +01:00
parent b0f82fbc61
commit df6d482c25
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/stack_core.py
View File

@@ -313,7 +313,7 @@ class TraceConverter:
return None, None return None, None
# Find all files in the symbols directory and group them by basename (without directory). # Find all files in the symbols directory and group them by basename (without directory).
@functools.cache @functools.lru_cache(maxsize=None)
def GlobSymbolsDir(self, symbols_dir): def GlobSymbolsDir(self, symbols_dir):
files_by_basename = {} files_by_basename = {}
for path in sorted(pathlib.Path(symbols_dir).glob("**/*")): for path in sorted(pathlib.Path(symbols_dir).glob("**/*")):
@@ -321,7 +321,7 @@ class TraceConverter:
return files_by_basename return files_by_basename
# Use the "file" command line tool to find the bitness and build_id of given ELF file. # Use the "file" command line tool to find the bitness and build_id of given ELF file.
@functools.cache @functools.lru_cache(maxsize=None)
def GetLibraryInfo(self, lib): def GetLibraryInfo(self, lib):
stdout = subprocess.check_output(["file", lib], text=True) stdout = subprocess.check_output(["file", lib], text=True)
match = self.file_tool_output.search(stdout) match = self.file_tool_output.search(stdout)
@@ -330,7 +330,7 @@ class TraceConverter:
return None return None
# Search for a library with the given basename and build_id anywhere in the symbols directory. # Search for a library with the given basename and build_id anywhere in the symbols directory.
@functools.cache @functools.lru_cache(maxsize=None)
def GetLibraryByBuildId(self, symbols_dir, basename, build_id): def GetLibraryByBuildId(self, symbols_dir, basename, build_id):
for candidate in self.GlobSymbolsDir(symbols_dir).get(basename): for candidate in self.GlobSymbolsDir(symbols_dir).get(basename):
info = self.GetLibraryInfo(candidate) info = self.GetLibraryInfo(candidate)
@@ -484,10 +484,11 @@ class TraceConverter:
if build_id: if build_id:
# If we have the build_id, do a brute-force search of the symbols directory. # If we have the build_id, do a brute-force search of the symbols directory.
lib = self.GetLibraryByBuildId(symbol.SYMBOLS_DIR, os.path.basename(lib), build_id) basename = os.path.basename(lib)
lib = self.GetLibraryByBuildId(symbol.SYMBOLS_DIR, basename, build_id)
if not lib: if not lib:
print("WARNING: Cannot find {} with build id {} in symbols directory." print("WARNING: Cannot find {} with build id {} in symbols directory."
.format(os.path.basename(lib), build_id)) .format(basename, build_id))
else: else:
# When using atest, test paths are different between the out/ directory # When using atest, test paths are different between the out/ directory
# and device. Apply fixups. # and device. Apply fixups.