From c0204e5cd800cd42efbca8365c69bdfb8614b6e8 Mon Sep 17 00:00:00 2001 From: Hang Zhao Date: Mon, 25 Apr 2022 16:07:03 +0800 Subject: [PATCH] fix open sysak.rules error when mservice disabled Signed-off-by: Hang Zhao --- source/sysak.c | 9 +++++++++ source/tools/detect/loadtask/loadtask.sh | 11 +++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/source/sysak.c b/source/sysak.c index e84551bc..d35373e7 100644 --- a/source/sysak.c +++ b/source/sysak.c @@ -62,6 +62,9 @@ static void mod_ctrl(bool enable) bool has_ko = false; char modinfo[MAX_SUBCMD_ARGS]; + if (access(system_modules,0) != 0) + return; + modlist_fp = fopen(system_modules, "r"); if (!modlist_fp){ printf("open %s failed\n", system_modules); @@ -122,6 +125,9 @@ static void print_each_tool(char *path) char buf[MAX_NAME_LEM + MAX_SUBCMD_ARGS]; char tools_name[MAX_NAME_LEM]; + if (access(path,0) != 0) + return; + fp = fopen(path, "r"); if (!fp){ printf("open %s failed\n", path); @@ -148,6 +154,9 @@ static bool tool_lookup(char *path, char *tool) FILE *fp; char buf[MAX_NAME_LEM + MAX_SUBCMD_ARGS]; + if (access(path,0) != 0) + return false; + fp = fopen(path, "r"); if (!fp){ printf("open %s failed\n", path); diff --git a/source/tools/detect/loadtask/loadtask.sh b/source/tools/detect/loadtask/loadtask.sh index b4f7d1de..6d3d9b13 100755 --- a/source/tools/detect/loadtask/loadtask.sh +++ b/source/tools/detect/loadtask/loadtask.sh @@ -168,7 +168,9 @@ show_result() { collect_global_framegraph() { if [ -f $TOOLS_ROOT/cpu_flamegraph ]; then $TOOLS_ROOT/cpu_flamegraph -d 5 | xargs -I {} sudo cp {} $global_cpuflamegraph - sudo cp $global_cpuflamegraph $tmp_cpuflamegraph + if [ -e $global_cpuflamegraph ];then + sudo cp $global_cpuflamegraph $tmp_cpuflamegraph + fi fi } @@ -186,7 +188,11 @@ current_analyse() { echo "####################################################################################" > $tmpfile echo "Time: `date "+%Y-%m-%d %H:%M:%S"`" >> $tmpfile - echo "$global_cpuflamegraph" >> $tmpfile + if [ -e $global_cpuflamegraph ];then + echo "$global_cpuflamegraph" >> $tmpfile + else + echo "Failed to generate cpu flamwgrapg" >> $tmpfile + fi load_proc=`cat /proc/loadavg` load_proc="load_proc: $load_proc" echo "$load_proc" >> $tmpfile @@ -301,6 +307,7 @@ current_analyse() { echo >> $tmpfile echo "####################################################################################" >> $tmpfile cat ${tmp_cpuflamegraph} >> $tmpfile + rm ${tmp_cpuflamegraph} } history_analyse() { -- Gitee