diff options
Diffstat (limited to 'src/libs/zbxsysinfo/osf/cpu.c')
| -rw-r--r-- | src/libs/zbxsysinfo/osf/cpu.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/libs/zbxsysinfo/osf/cpu.c b/src/libs/zbxsysinfo/osf/cpu.c index a01d835c4c9..2cd469d2293 100644 --- a/src/libs/zbxsysinfo/osf/cpu.c +++ b/src/libs/zbxsysinfo/osf/cpu.c @@ -18,9 +18,10 @@ **/ #include "zbxsysinfo.h" +#include "../sysinfo.h" #include "../common/zbxsysinfo_common.h" -int SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result) +int system_cpu_util(AGENT_REQUEST *request, AGENT_RESULT *result) { char *tmp; int ret = SYSINFO_RET_FAIL; @@ -52,13 +53,13 @@ int SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result) tmp = get_rparam(request, 1); if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "user")) - ret = EXECUTE_DBL("iostat 1 2 | tail -n 1 | awk '{printf(\"%s\",$(NF-3))}'", result); + ret = execute_dbl("iostat 1 2 | tail -n 1 | awk '{printf(\"%s\",$(NF-3))}'", result); else if (0 == strcmp(tmp, "nice")) - ret = EXECUTE_DBL("iostat 1 2 | tail -n 1 | awk '{printf(\"%s\",$(NF-2))}'", result); + ret = execute_dbl("iostat 1 2 | tail -n 1 | awk '{printf(\"%s\",$(NF-2))}'", result); else if (0 == strcmp(tmp, "system")) - ret = EXECUTE_DBL("iostat 1 2 | tail -n 1 | awk '{printf(\"%s\",$(NF-1))}'", result); + ret = execute_dbl("iostat 1 2 | tail -n 1 | awk '{printf(\"%s\",$(NF-1))}'", result); else if (0 == strcmp(tmp, "idle")) - ret = EXECUTE_DBL("iostat 1 2 | tail -n 1 | awk '{printf(\"%s\",$(NF))}'", result); + ret = execute_dbl("iostat 1 2 | tail -n 1 | awk '{printf(\"%s\",$(NF))}'", result); else { SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter.")); @@ -68,7 +69,7 @@ int SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result) return ret; } -int SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result) +int system_cpu_load(AGENT_REQUEST *request, AGENT_RESULT *result) { char *tmp; int ret = SYSINFO_RET_FAIL; @@ -91,11 +92,11 @@ int SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result) tmp = get_rparam(request, 1); if (NULL == tmp || '\0' == *tmp || 0 == strcmp(tmp, "avg1")) - ret = EXECUTE_DBL("uptime | awk '{printf(\"%s\", $(NF))}' | sed 's/[ ,]//g'", result); + ret = execute_dbl("uptime | awk '{printf(\"%s\", $(NF))}' | sed 's/[ ,]//g'", result); else if (0 == strcmp(tmp, "avg5")) - ret = EXECUTE_DBL("uptime | awk '{printf(\"%s\", $(NF-1))}' | sed 's/[ ,]//g'", result); + ret = execute_dbl("uptime | awk '{printf(\"%s\", $(NF-1))}' | sed 's/[ ,]//g'", result); else if (0 == strcmp(tmp, "avg15")) - ret = EXECUTE_DBL("uptime | awk '{printf(\"%s\", $(NF-2))}' | sed 's/[ ,]//g'", result); + ret = execute_dbl("uptime | awk '{printf(\"%s\", $(NF-2))}' | sed 's/[ ,]//g'", result); else { SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter.")); |