From 89171766319964eeab8d165ebbbf5c204c620e45 Mon Sep 17 00:00:00 2001 From: heppen Date: Fri, 24 May 2024 15:46:50 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(proc):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=86=85=E5=AD=98=E5=9C=B0=E5=9D=80=E4=BC=A0=E9=80=92=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pwrapic/src/pwrproc.c | 4 ++-- pwrapis/src/procservice.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pwrapic/src/pwrproc.c b/pwrapic/src/pwrproc.c index da36b98..6c38312 100644 --- a/pwrapic/src/pwrproc.c +++ b/pwrapic/src/pwrproc.c @@ -171,7 +171,7 @@ int AddWattProcs(const pid_t wattProcs[], uint32_t num) ReqInputParam input; input.optType = PROC_ADD_WATT_PROCS; input.dataLen = (uint32_t)sizeof(pid_t) * num; - input.data = (char *)&wattProcs; + input.data = (char *)wattProcs; RspOutputParam output; output.rspBuffSize = NULL; @@ -191,7 +191,7 @@ int DelWattProcs(const pid_t wattProcs[], uint32_t num) ReqInputParam input; input.optType = PROC_DEL_WATT_PROCS; input.dataLen = (uint32_t)sizeof(pid_t) * num; - input.data = (char *)&wattProcs; + input.data = (char *)wattProcs; RspOutputParam output; output.rspBuffSize = NULL; diff --git a/pwrapis/src/procservice.c b/pwrapis/src/procservice.c index 596ee34..f54055f 100644 --- a/pwrapis/src/procservice.c +++ b/pwrapis/src/procservice.c @@ -22,7 +22,9 @@ #include "utils.h" #include "cpuservice.h" -#define GET_US_PROCS_CMD "pstree -pn 1 | grep -o '([[:digit:]]*)' | grep -o '[[:digit:]]*'" +#define GET_US_PROCS_CMD \ + "pstree -pn 1 | grep -v pstree | grep -v grep | grep -o '([[:digit:]]*)' | grep -o " \ + "'[[:digit:]]*'" #define QUERY_PROCS_CMD "ps -ef | grep -E '%s' | grep -v grep | awk '{print $2}'" #define WATT_CGROUP_PATH "/sys/fs/cgroup/cpu/watt_sched" -- Gitee