From 48e287c32d2d119dc088eb9aa60dd2f94c67a6ed Mon Sep 17 00:00:00 2001 From: xuezhou_yan Date: Tue, 21 Nov 2023 19:50:58 +0800 Subject: [PATCH] =?UTF-8?q?I8I9T0=20[Bug]:=20=E4=BF=AE=E5=A4=8D=E9=9D=99?= =?UTF-8?q?=E6=80=81=E8=AF=84=E4=BC=B0=E5=91=8A=E8=AD=A6=EF=BC=9Aredundant?= =?UTF-8?q?=20code,please=20delete=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xuezhou_yan --- tools/deps_guard/deps_guard.py | 40 +++++++++---------- .../rules/ChipsetSDK/chipsetsdk_indirect.json | 10 ++--- .../config_parser_mgr/cfg/config_parser.py | 14 ++----- .../param/system_parameter_parser.py | 9 +---- .../startup_checker/cmds_rule.py | 5 +-- 5 files changed, 33 insertions(+), 45 deletions(-) diff --git a/tools/deps_guard/deps_guard.py b/tools/deps_guard/deps_guard.py index 987619b..71ac61f 100755 --- a/tools/deps_guard/deps_guard.py +++ b/tools/deps_guard/deps_guard.py @@ -19,33 +19,33 @@ from elf_file_mgr import ElfFileMgr def __createArgParser(): - import argparse + import argparse - parser = argparse.ArgumentParser(description='Check architecture information from compiled output files.') + parser = argparse.ArgumentParser(description='Check architecture information from compiled output files.') - parser.add_argument('-i', '--input', - help='input asset files root directory', required=True) + parser.add_argument('-i', '--input', + help='input asset files root directory', required=True) - parser.add_argument('-r', '--rules', action='append', - help='rules directory', required=False) + parser.add_argument('-r', '--rules', action='append', + help='rules directory', required=False) - parser.add_argument('-n', '--no-fail', - help='force to pass all rules', required=False) + parser.add_argument('-n', '--no-fail', + help='force to pass all rules', required=False) - return parser + return parser def _deps_guard_module(out_path, args=None): - mgr = ElfFileMgr(out_path) - mgr.scan_all_files() + mgr = ElfFileMgr(out_path) + mgr.scan_all_files() - from rules_checker import check_all_rules + from rules_checker import check_all_rules - passed = check_all_rules(mgr, args) - if passed: - print("All rules passed") - return + passed = check_all_rules(mgr, args) + if passed: + print("All rules passed") + return - raise Exception("ERROR: deps_guard failed.") + raise Exception("ERROR: deps_guard failed.") def _startup_guard_module(out_path, args): import sys @@ -66,7 +66,7 @@ def deps_guard(out_path, args=None): if __name__ == '__main__': - parser = __createArgParser() - args = parser.parse_args() + parser = __createArgParser() + args = parser.parse_args() - deps_guard(args.input, args) + deps_guard(args.input, args) diff --git a/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_indirect.json b/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_indirect.json index 6cff643..a461aa2 100755 --- a/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_indirect.json +++ b/tools/deps_guard/rules/ChipsetSDK/chipsetsdk_indirect.json @@ -212,9 +212,9 @@ "so_file_name": "libsqlite.z.so", "path": "//third_party/sqlite:sqlite", "headers": [ - "//third_party/sqlite/include/", - "//commonlibrary/c_utils/base/include/" - ] + "//third_party/sqlite/include/", + "//commonlibrary/c_utils/base/include/" + ] }, { "name": "dsoftbus:nstackx_util", @@ -233,8 +233,8 @@ "so_file_name": "libdfx_dumpcatcher.z.so", "path": "//base/hiviewdfx/faultloggerd/interfaces/innerkits/dump_catcher:libdfx_dumpcatcher", "headers": [ - "//base/hiviewdfx/faultloggerd/interfaces/innerkits/dump_catcher/include/" - ] + "//base/hiviewdfx/faultloggerd/interfaces/innerkits/dump_catcher/include/" + ] }, { "name": "faultloggerd:libdfx_procinfo", diff --git a/tools/startup_guard/config_parser_mgr/cfg/config_parser.py b/tools/startup_guard/config_parser_mgr/cfg/config_parser.py index 299a805..3a1e4b8 100644 --- a/tools/startup_guard/config_parser_mgr/cfg/config_parser.py +++ b/tools/startup_guard/config_parser_mgr/cfg/config_parser.py @@ -58,7 +58,7 @@ class ItemParser(dict): string = jsonStrArray[0] for i in range(1, len(jsonStrArray)): - string = string + "@" + jsonStrArray[i] + string = "{}@{}".format(string, jsonStrArray[i]) return string class CmdParser(ItemParser): @@ -77,7 +77,6 @@ class CmdParser(ItemParser): self["fileId"] = fileId if len(info) > 2: self["content"] = info[2] - #print("Create cmd %s %d" % (self["name"], self["fileId"])) return def __str__(self): @@ -101,7 +100,6 @@ class JobParser(ItemParser): assert(isinstance(json_node, dict)) self["name"] = json_node["name"] self["jobId"] = self._config_parser.get_job_id() - #print("JobParser %s %d" % (json_node["name"], fileId)) self["jobPriority"] = self._config_parser.get_job_priority(json_node["name"]) if fileId and self["fileId"] is None: @@ -345,7 +343,6 @@ class ConfigParser(): try: root = json.load(content) fileId = self.add_File(file_name) - # print("loadConfig %d file_name = %s" % (fileId, file_name)) assert(isinstance(root, dict)) if (root.__contains__("services")): self._load_services(root["services"], fileId) @@ -407,7 +404,6 @@ class ConfigParser(): return self._serviceId def dump_config(self): - # print("Dump jobs: \n") pp = pprint.PrettyPrinter(indent = 0, compact=True) pp.pprint(self._jobs) pass @@ -422,7 +418,7 @@ class ConfigParser(): return False def _scan_config_file(self, file_name): - dir = self._path + file_name + dir = os.path.join(self._path, file_name) if not os.path.exists(dir): return try: @@ -460,7 +456,6 @@ class ConfigParser(): } if (job_priority.__contains__(job_name)): - # print("get_job_priority %s %d" % (job_name, job_priority.get(job_name))) return job_priority.get(job_name) return 100 @@ -473,7 +468,6 @@ class ConfigParser(): if not os.path.exists(boot_event_file): print("Error, invalid config file %s" % boot_event_file) return - #print("loadConfig file_name = %s" % file_name) with open(boot_event_file, encoding='utf-8') as content: try: root = json.load(content) @@ -484,7 +478,7 @@ class ConfigParser(): pass def load_selinux_config(self, file_name): - path = self._path + file_name + path = os.path.join(self._path, file_name) if not os.path.exists(path): print("Error, invalid selinux config file %s" % path) return @@ -507,7 +501,7 @@ class ConfigParser(): pass def startup_config_collect(base_path): - parser = ConfigParser(base_path + "/packages/phone") + parser = ConfigParser(os.path.join(base_path, "packages/phone")) parser.load_config("/system/etc/init.cfg") parser.scan_config() parser.load_selinux_config("/system/etc/selinux/config") diff --git a/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py b/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py index fb07b6d..f7d6ec8 100644 --- a/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py +++ b/tools/startup_guard/config_parser_mgr/param/system_parameter_parser.py @@ -38,7 +38,6 @@ class ParameterParser(dict): def decode(self, info): self["value"] = info.strip("\"").strip("\'") - #print("value '%s'" % self["value"]) return True def __repr__(self): @@ -70,7 +69,6 @@ class ParameterSelinuxParser(ParameterParser): def decode(self, info): self["selinuxLabel"] = info - #print("name %s selinux %s" % (self["prefix"], info)) return True class ParameterFileParser(): @@ -94,12 +92,10 @@ class ParameterFileParser(): self._parameters[param_name] = param def load_parameter_file(self, file_name, str = "="): - # print(" loadParameterFile %s" % fileName) try: with open(file_name, encoding='utf-8') as fp: line = fp.readline() while line : - #print("line %s" % (line)) if line.startswith("#") or len(line) < 3: line = fp.readline() continue @@ -143,7 +139,7 @@ class ParameterFileParser(): "/system/etc/param", ] for path in parameter_paths: - self._scan_parameter_file(dir + "/packages/phone" + path) + self._scan_parameter_file("{}/packages/phone{}".format(dir, path)) def __create_arg_parser(): import argparse @@ -155,8 +151,7 @@ def __create_arg_parser(): def parameters_collect(base_path): parser = ParameterFileParser() parser.scan_parameter_file(base_path) - parser.load_parameter_file(base_path + "/packages/phone/system/etc/selinux/targeted/contexts/parameter_contexts", " ") - # parser.dumpParameter() + parser.load_parameter_file("{}/packages/phone/system/etc/selinux/targeted/contexts/parameter_contexts".format(base_path), " ") return parser if __name__ == '__main__': diff --git a/tools/startup_guard/startup_checker/cmds_rule.py b/tools/startup_guard/startup_checker/cmds_rule.py index c59657b..15d1ed2 100644 --- a/tools/startup_guard/startup_checker/cmds_rule.py +++ b/tools/startup_guard/startup_checker/cmds_rule.py @@ -80,7 +80,6 @@ class cmdRule(BaseRule): def _check_file_id_in_cmds(self, cmdlist, cmdline): file_id_list = set() - # print(cmdlist) for i in range(len(cmdlist)): if cmdline == cmdlist[i]["name"]: file_id_list.add(cmdlist[i]["fileId"]) @@ -99,7 +98,7 @@ class cmdRule(BaseRule): file_lists = cmd["location"] for key, item in parser._files.items(): if item["fileId"] in file_id_list and key not in file_lists: - output = "\'" + cmd["cmd"] + "\' is timeout command, in "+ key + output = "\'{}\' is timeout command, in {}".format(cmd["cmd"], key) self.error("%s" % str(output)) passed = False file_id_list.clear() @@ -127,7 +126,7 @@ class cmdRule(BaseRule): else: for key, item in parser._files.items(): if item["fileId"] == file_id: - log_str = cmd + " is not in start cmd list. " + " path:" + item["file_name"] + log_str = "{} is not in start cmd list. path:{}".format(cmd, item["file_name"]) self.warn("%s" % log_str) passed = False pass -- Gitee