openharmony/developtools_integration_verification
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_integration_verification.git synced 2026-07-25 14:15:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

!32 bugfix:解决ram_analyzer在对二进制文件归属失败时程序异常停止的问题

Browse Source 
Merge pull request !32 from aodongbiao/master
This commit is contained in:
openharmony_ci
2023-02-13 12:47:09 +00:00
committed by Gitee
parent 5bfa4bbca0 fb8a5c3c8e
commit e409a66204
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/rom_ram_analyzer/L2/ram_analyzer.py
+9 -6
View File
@@ -8,6 +8,7 @@ import sys
import subprocess
import typing
import xml.dom.minidom as dom
from pprint import pprint
from pkgs.simple_excel_writer import SimpleExcelWriter
@@ -332,7 +333,7 @@ class RamAnalyzer:
def get(key: typing.Any, dt: typing.Dict[str, typing.Any]):
for k, v in dt.items():
if k.startswith(key) or key == v[0]:
if k.startswith(key) or (len(v) > 0 and key == v[0]):
# 要么uinput_inject的对应key为mmi_uinput_inject。对于此类特殊处理，即：如果service_name找不到，但是直接执行的bin等于这个名字，也认为找到
return v
@@ -345,7 +346,7 @@ class RamAnalyzer:
result_dict[process_name] = dict()
result_dict[process_name]["size"] = process_size
result_dict[process_name]["init"] = dict()
result_dict[process_name]["init"][bin if len(bin) != 0 else "UNKOWN"] = size
result_dict[process_name]["init"][bin if len(bin) != 0 else "UNKNOWN"] = size
continue
# 如果是hap，特殊处理
if (process_name.startswith("com.") or process_name.startswith("ohos.")):
@@ -358,22 +359,24 @@ class RamAnalyzer:
result_dict[process_name] = dict()
result_dict[process_name]["size"] = process_size
result_dict[process_name][component_name] = dict()
result_dict[process_name][component_name][hap_name if len(hap_name) != 0 else "UNKOWN"] = size
result_dict[process_name][component_name][hap_name if len(hap_name) != 0 else "UNKNOWN"] = size
continue
so_list: list = get(process_name, process_elf_dict) # 得到进程相关的elf文件list
if so_list is None:
print("warning: process '{}' not found in .xml or .cfg".format(process_name))
result_dict[process_name] = dict()
result_dict[process_name]["size"] = process_size
result_dict[process_name]["UNKOWN"] = dict()
result_dict[process_name]["UNKOWN"]["UNKOWN"] = int()
result_dict[process_name]["UNKNOWN"] = dict()
result_dict[process_name]["UNKNOWN"]["UNKNOWN"] = int()
continue
result_dict[process_name] = dict()
result_dict[process_name]["size"] = process_size
for so in so_list:
unit = so_info_dict.get(so)
if unit is None:
print("warning: '{}' in {} not found in json from rom_analysis".format(so, process_name))
result_dict[process_name]["UNKNOWN"] = dict()
result_dict[process_name]["UNKNOWN"][so] = int()
print("warning: '{}' in {} not found in json from rom analysis result".format(so, process_name))
continue
component_name = unit.get("component_name")
so_size = unit.get("size")