diff --git a/tools/rom_ram_analyzer/lite_small/pkgs/gn_common_tool.py b/tools/rom_ram_analyzer/lite_small/pkgs/gn_common_tool.py index d12eb4b68b2a4959faa2d2d4aa3cca2520a50943..5293400ad173b001e29f3a8d47111fe2c85e4da1 100644 --- a/tools/rom_ram_analyzer/lite_small/pkgs/gn_common_tool.py +++ b/tools/rom_ram_analyzer/lite_small/pkgs/gn_common_tool.py @@ -277,14 +277,4 @@ part_name = "updater" """ s = "\"${updater_faultloggerd_cfg}\"" print(GnCommonTool.contains_gn_variable(s)) - # print(GnVariableParser.string_parser("updater_faultloggerd_cfg",s)) - # print(re.search( - # "updater_faultloggerd_cfg *= *[\n]?(\".*?\")", s, flags=re.S | re.M).group()) - # print(GnVariableParser.list_parser("t", cc)) - # print(len(GnVariableParser.list_parscer("t", cc))) - # print(TargetNameParser.second_parser(cc)) - # print(GnCommonTool._find_gn_variable_list("a/${b}${e}/$c")) - # print(GnCommonTool._find_gn_variable_list("abc_$abc")) - # print(GnCommonTool.find_values_of_variable( - # "\"${OHOS_PROFILER_SUBSYS_NAME}\"", path="/home/aodongbiao/oh/third_party/abseil-cpp/absl/strings/BUILD.gn", stop_tail="/home/aodongbiao/oh")) ... diff --git a/tools/rom_ram_analyzer/lite_small/src/rom_analysis.py b/tools/rom_ram_analyzer/lite_small/src/rom_analysis.py index e9255398266c667e124ad3e9a604b02dcf360a8e..f827b03e039b3daf5c8bcddfd503ef8cbb63a792 100644 --- a/tools/rom_ram_analyzer/lite_small/src/rom_analysis.py +++ b/tools/rom_ram_analyzer/lite_small/src/rom_analysis.py @@ -30,7 +30,6 @@ import collections from config import result_dict, collector_config, configs, \ project_path, sub_com_dict, product_name, recollect_gn -# from gn_info_collect import GnInfoCollector from pkgs.basic_tool import BasicTool from pkgs.gn_common_tool import GnCommonTool from pkgs.simple_excel_writer import SimpleExcelWriter @@ -286,12 +285,10 @@ class RomAnalysisTool: ] = configs[product_name]["query_order"] query_order["etc"] = configs["target_type"] # etc会查找所有的template rom_size_dict: Dict = dict() - # prodcut_dict: {"so":["a.so", ...], "etc":["b.txt",...]} for t, l in product_dict.items(): for f in l: # 遍历所有文件 if os.path.isdir(f): continue - # query_order: {"a":[static_library", ...]} find_flag = False type_list = query_order.get(t) _, base_name = os.path.split(f) @@ -351,7 +348,3 @@ def main(): if __name__ == "__main__": main() - # relative_dir = ["bin", "usr/lib", "etc"] - # root_dir = "/home/aodongbiao/oh/out/hispark_taurus/ipcamera_hispark_taurus/rootfs" - # rest_dir_list = os.listdir(root_dir) - # RomAnalysisTool._find_files("ipcamera_hispark_taurus") diff --git a/tools/rom_ram_analyzer/lite_small/src/template_processor.py b/tools/rom_ram_analyzer/lite_small/src/template_processor.py index 64d19a479026cee67490d21c976d7d6ad75c5d16..b5378b55b22616a3f5548f5869245fa444e49b1a 100644 --- a/tools/rom_ram_analyzer/lite_small/src/template_processor.py +++ b/tools/rom_ram_analyzer/lite_small/src/template_processor.py @@ -36,8 +36,6 @@ class BaseProcessor(ABC): def call(): # your implementation - DerivedClass(project_path,result_dict,...) - DerivedClass() """ def __init__(self, diff --git a/tools/rom_ram_analyzer/standard/pkgs/basic_tool.py b/tools/rom_ram_analyzer/standard/pkgs/basic_tool.py index b4d548eedd9e0bfcb51a117b2b6845454786f197..96a59ec2bde579deebce71fe8c77ced4e6642345 100644 --- a/tools/rom_ram_analyzer/standard/pkgs/basic_tool.py +++ b/tools/rom_ram_analyzer/standard/pkgs/basic_tool.py @@ -28,6 +28,5 @@ class BasicTool: if __name__ == '__main__': - # print(BasicTool.get_abs_path("~/git/..")) for i in BasicTool.find_all_files(".", apply_abs=False): print(i) \ No newline at end of file diff --git a/tools/rom_ram_analyzer/standard/ram_analyzer.py b/tools/rom_ram_analyzer/standard/ram_analyzer.py index a68d77f4a4e5d9957404f0dc3d9d173a0aff9b1e..c6c2df5ea30a254b28e59e8b1a7011e2b2f247fc 100644 --- a/tools/rom_ram_analyzer/standard/ram_analyzer.py +++ b/tools/rom_ram_analyzer/standard/ram_analyzer.py @@ -227,7 +227,6 @@ class RamAnalyzer: cls.__parse_process_xml(os.path.join(profile_path, xml_base_name), result_dict) else: # 直接执行 - # process_name = os.path.split(first)[-1] if result_dict.get(process_name) is None: result_dict[process_name] = list() result_dict.get(process_name).append(os.path.split(first)[-1]) @@ -238,7 +237,6 @@ class RamAnalyzer: """ 从out/{product_name}/packages/phone/sa_profile/merged_sa查找xml文件并处理得到进程与so的对应关系 """ - # xml_path = os.path.join(product_path, "packages", "phone", "sa_profile", "merged_sa") # 从merged_sa里面收集 xml_list = glob.glob(xml_path + os.sep + "*[.]xml", recursive=True) process_elf_dict: typing.Dict[str, typing.List[str]] = dict() diff --git a/tools/rom_ram_analyzer/standard/rom_analyzer.py b/tools/rom_ram_analyzer/standard/rom_analyzer.py index 35504fa7879d5fa989c8f6b367d7555da45d44c1..b748563f8880268feeb184435bb1aae23de32ca8 100644 --- a/tools/rom_ram_analyzer/standard/rom_analyzer.py +++ b/tools/rom_ram_analyzer/standard/rom_analyzer.py @@ -116,13 +116,11 @@ class RomAnalyzer: @classmethod def __put(cls, unit: typing.Dict[Text, Any], result_dict: typing.Dict[Text, Dict]): """ - { subsystem_name:{ component_name: { file_name: file_size } } - } """ component_name = NOTFOUND if unit.get( "component_name") is None else unit.get("component_name")