From e20fa0e02356bba270d09cf48196413cc23096ae Mon Sep 17 00:00:00 2001 From: flying Date: Mon, 29 Apr 2024 08:12:14 +0000 Subject: [PATCH 1/2] UP Signed-off-by: flying --- .../rom_ram_analyzer/lite_small/src/config.py | 8 +++++--- tools/rom_ram_analyzer/lite_small/src/misc.py | 4 ++-- .../lite_small/src/template_processor.py | 18 +++++++++--------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/tools/rom_ram_analyzer/lite_small/src/config.py b/tools/rom_ram_analyzer/lite_small/src/config.py index 30f5ecc..2f43ea3 100644 --- a/tools/rom_ram_analyzer/lite_small/src/config.py +++ b/tools/rom_ram_analyzer/lite_small/src/config.py @@ -24,14 +24,16 @@ import sys import argparse import json import logging -from typing import Any +from typing import Any, Tuple, Dict, Text import preprocess from pkgs.simple_yaml_tool import SimpleYamlTool from pkgs.basic_tool import do_nothing, BasicTool from get_subsystem_component import SC -from misc import * -from template_processor import * +from misc import TargetNameParser, SOPostHandler, APostHandler, DefaultPostHandler, LiteLibPostHandler, \ + LiteComponentPostHandler, UnittestPostHandler, HAPPostHandler, HapPackPostHandler, lite_lib_s2m_post_handler, \ + target_s2m_post_handler, extension_handler, target_type_handler, hap_name_handler, mod_handler +from template_processor import BaseProcessor, DefaultProcessor, StrResourceProcessor, ListResourceProcessor def parse_args(): diff --git a/tools/rom_ram_analyzer/lite_small/src/misc.py b/tools/rom_ram_analyzer/lite_small/src/misc.py index 0ec8119..2bfb2e8 100644 --- a/tools/rom_ram_analyzer/lite_small/src/misc.py +++ b/tools/rom_ram_analyzer/lite_small/src/misc.py @@ -244,7 +244,7 @@ class TargetPostHandler(BasePostHandler): ... -def LiteLibS2MPostHandler(unit: Dict, result_dict: Dict) -> None: +def lite_lib_s2m_post_handler(unit: Dict, result_dict: Dict) -> None: rt = unit.get("real_target_type") new_unit = copy.deepcopy(unit) if rt == "shared_library": @@ -270,7 +270,7 @@ def LiteLibS2MPostHandler(unit: Dict, result_dict: Dict) -> None: result_dict["lite_library"][k] = new_new_unit -def TargetS2MPostHandler(unit: Dict, result_dict: Dict) -> None: +def target_s2m_post_handler(unit: Dict, result_dict: Dict) -> None: unit["description"] = "may not exist" tmp_a = copy.deepcopy(unit) tmp_a["real_target_type"] = "static_library" 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 24fd7ca..1f898be 100644 --- a/tools/rom_ram_analyzer/lite_small/src/template_processor.py +++ b/tools/rom_ram_analyzer/lite_small/src/template_processor.py @@ -16,7 +16,7 @@ # This file contains some template processor to collection information # from some gn's template in BUILD.gn -from typing import Tuple, Union, Callable, Literal +from typing import Tuple, Union, Callable, Literal, Dict, Text from abc import ABC, abstractmethod import os import logging @@ -24,7 +24,7 @@ from pprint import pprint from pkgs.basic_tool import do_nothing, BasicTool from pkgs.gn_common_tool import GnCommonTool, GnVariableParser -from misc import * +from misc import BasePostHandler, gn_lineno_collect TYPE = Literal["str", "list"] @@ -140,7 +140,7 @@ def _gn_var_process(project_path: str, gn_v: str, alt_v: str, gn_path: str, ifro class DefaultProcessor(BaseProcessor): @property - def UNDEFINED(self): + def undefined(self): return "UNDEFINED" def helper(self, target_name: str, paragraph: str, gn_path: str, line_no: int, _sub: str, _com: str) -> Tuple[str]: @@ -154,9 +154,9 @@ class DefaultProcessor(BaseProcessor): com, com_from = _gn_var_process( self.project_path, com, _com, gn_path, "gn", "json", True) if not sub: - sub = self.UNDEFINED + sub = self.undefined if not com: - com = self.UNDEFINED + com = self.undefined result = { "gn_path": gn_path, "target_type": self.target_type, @@ -218,9 +218,9 @@ class StrResourceProcessor(DefaultProcessor): com, com_from = _gn_var_process( self.project_path, com, _com, gn_path, "gn", "json") if not sub: - sub = self.UNDEFINED + sub = self.undefined if not com: - com = self.UNDEFINED + com = self.undefined _, file_name = os.path.split(resources) result = { "gn_path": gn_path, @@ -254,9 +254,9 @@ class ListResourceProcessor(DefaultProcessor): com, com_from = _gn_var_process( self.project_path, com, _com, gn_path, "gn", "json") if not sub: - sub = self.UNDEFINED + sub = self.undefined if not com: - com = self.UNDEFINED + com = self.undefined for ff in resources: _, file_name = os.path.split(ff) result = { -- Gitee From e9b630447ecf06d37211fd737ccf35d1c71c54fe Mon Sep 17 00:00:00 2001 From: flying Date: Tue, 30 Apr 2024 01:02:26 +0000 Subject: [PATCH 2/2] update tools/rom_ram_analyzer/lite_small/src/config.py. Signed-off-by: flying --- tools/rom_ram_analyzer/lite_small/src/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/rom_ram_analyzer/lite_small/src/config.py b/tools/rom_ram_analyzer/lite_small/src/config.py index 2f43ea3..4357fff 100644 --- a/tools/rom_ram_analyzer/lite_small/src/config.py +++ b/tools/rom_ram_analyzer/lite_small/src/config.py @@ -165,7 +165,7 @@ collector_config: Tuple[BaseProcessor] = ( "extension": extension_handler, }, unit_post_handler=LiteLibPostHandler(), - ud_post_handler=LiteLibS2MPostHandler, + ud_post_handler=lite_lib_s2m_post_handler, ), DefaultProcessor(project_path=project_path, # hap有个hap_name result_dict=result_dict, @@ -248,7 +248,7 @@ collector_config: Tuple[BaseProcessor] = ( other_info_handlers={ }, unit_post_handler=DefaultPostHandler(), - ud_post_handler=TargetS2MPostHandler + ud_post_handler=target_s2m_post_handler ), DefaultProcessor(project_path=project_path, result_dict=result_dict, -- Gitee