diff options
Diffstat (limited to 'src/libs/zbxsysinfo/osf/memory.c')
| -rw-r--r-- | src/libs/zbxsysinfo/osf/memory.c | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/src/libs/zbxsysinfo/osf/memory.c b/src/libs/zbxsysinfo/osf/memory.c index de910b18479..10a192050cd 100644 --- a/src/libs/zbxsysinfo/osf/memory.c +++ b/src/libs/zbxsysinfo/osf/memory.c @@ -18,19 +18,20 @@ **/ #include "zbxsysinfo.h" +#include "../sysinfo.h" #include "../common/zbxsysinfo_common.h" -static int VM_MEMORY_TOTAL(AGENT_RESULT *result) +static int vm_memory_total(AGENT_RESULT *result) { - return EXECUTE_INT("vmstat -s | awk 'BEGIN{pages=0}{gsub(\"[()]\",\"\");if($4==\"pagesize\")pgsize=($6);if(($2==\"inactive\"||$2==\"active\"||$2==\"wired\")&&$3==\"pages\")pages+=$1}END{printf (pages*pgsize)}'", result); + return execute_int("vmstat -s | awk 'BEGIN{pages=0}{gsub(\"[()]\",\"\");if($4==\"pagesize\")pgsize=($6);if(($2==\"inactive\"||$2==\"active\"||$2==\"wired\")&&$3==\"pages\")pages+=$1}END{printf (pages*pgsize)}'", result); } -static int VM_MEMORY_FREE(AGENT_RESULT *result) +static int vm_memory_free(AGENT_RESULT *result) { - return EXECUTE_INT("vmstat -s | awk '{gsub(\"[()]\",\"\");if($4==\"pagesize\")pgsize=($6);if($2==\"free\"&&$3==\"pages\")pages=($1)}END{printf (pages*pgsize)}'", result); + return execute_int("vmstat -s | awk '{gsub(\"[()]\",\"\");if($4==\"pagesize\")pgsize=($6);if($2==\"free\"&&$3==\"pages\")pages=($1)}END{printf (pages*pgsize)}'", result); } -static int VM_MEMORY_USED(AGENT_RESULT *result) +static int vm_memory_used(AGENT_RESULT *result) { int ret = SYSINFO_RET_FAIL; AGENT_RESULT result_tmp; @@ -38,7 +39,7 @@ static int VM_MEMORY_USED(AGENT_RESULT *result) zbx_init_agent_result(&result_tmp); - if (SYSINFO_RET_OK != VM_MEMORY_FREE(&result_tmp)) + if (SYSINFO_RET_OK != vm_memory_free(&result_tmp)) { SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg)); goto clean; @@ -46,7 +47,7 @@ static int VM_MEMORY_USED(AGENT_RESULT *result) free = result_tmp.ui64; - if (SYSINFO_RET_OK != VM_MEMORY_TOTAL(&result_tmp)) + if (SYSINFO_RET_OK != vm_memory_total(&result_tmp)) { SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg)); goto clean; @@ -63,7 +64,7 @@ clean: return ret; } -static int VM_MEMORY_PUSED(AGENT_RESULT *result) +static int vm_memory_pused(AGENT_RESULT *result) { int ret = SYSINFO_RET_FAIL; AGENT_RESULT result_tmp; @@ -71,7 +72,7 @@ static int VM_MEMORY_PUSED(AGENT_RESULT *result) zbx_init_agent_result(&result_tmp); - if (SYSINFO_RET_OK != VM_MEMORY_FREE(&result_tmp)) + if (SYSINFO_RET_OK != vm_memory_free(&result_tmp)) { SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg)); goto clean; @@ -79,7 +80,7 @@ static int VM_MEMORY_PUSED(AGENT_RESULT *result) free = result_tmp.ui64; - if (SYSINFO_RET_OK != VM_MEMORY_TOTAL(&result_tmp)) + if (SYSINFO_RET_OK != vm_memory_total(&result_tmp)) { SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg)); goto clean; @@ -102,12 +103,12 @@ clean: return ret; } -static int VM_MEMORY_AVAILABLE(AGENT_RESULT *result) +static int vm_memory_available(AGENT_RESULT *result) { - return VM_MEMORY_FREE(result); + return vm_memory_free(result); } -static int VM_MEMORY_PAVAILABLE(AGENT_RESULT *result) +static int vm_memory_pavailable(AGENT_RESULT *result) { int ret = SYSINFO_RET_FAIL; AGENT_RESULT result_tmp; @@ -115,7 +116,7 @@ static int VM_MEMORY_PAVAILABLE(AGENT_RESULT *result) zbx_init_agent_result(&result_tmp); - if (SYSINFO_RET_OK != VM_MEMORY_FREE(&result_tmp)) + if (SYSINFO_RET_OK != vm_memory_free(&result_tmp)) { SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg)); goto clean; @@ -123,7 +124,7 @@ static int VM_MEMORY_PAVAILABLE(AGENT_RESULT *result) free = result_tmp.ui64; - if (SYSINFO_RET_OK != VM_MEMORY_TOTAL(&result_tmp)) + if (SYSINFO_RET_OK != vm_memory_total(&result_tmp)) { SET_MSG_RESULT(result, zbx_strdup(NULL, result_tmp.msg)); goto clean; @@ -146,7 +147,7 @@ clean: return ret; } -int VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result) +int vm_memory_size(AGENT_REQUEST *request, AGENT_RESULT *result) { char *mode; int ret = SYSINFO_RET_FAIL; @@ -160,17 +161,17 @@ int VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result) mode = get_rparam(request, 0); if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "total")) - ret = VM_MEMORY_TOTAL(result); + ret = vm_memory_total(result); else if (0 == strcmp(mode, "free")) - ret = VM_MEMORY_FREE(result); + ret = vm_memory_free(result); else if (0 == strcmp(mode, "used")) - ret = VM_MEMORY_USED(result); + ret = vm_memory_used(result); else if (0 == strcmp(mode, "pused")) - ret = VM_MEMORY_PUSED(result); + ret = vm_memory_pused(result); else if (0 == strcmp(mode, "available")) - ret = VM_MEMORY_AVAILABLE(result); + ret = vm_memory_available(result); else if (0 == strcmp(mode, "pavailable")) - ret = VM_MEMORY_PAVAILABLE(result); + ret = vm_memory_pavailable(result); else { SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter.")); |