diff options
Diffstat (limited to 'src/libs/zbxsysinfo/aix/memory.c')
| -rw-r--r-- | src/libs/zbxsysinfo/aix/memory.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/libs/zbxsysinfo/aix/memory.c b/src/libs/zbxsysinfo/aix/memory.c index b34ca838342..1e028712ca1 100644 --- a/src/libs/zbxsysinfo/aix/memory.c +++ b/src/libs/zbxsysinfo/aix/memory.c @@ -18,6 +18,7 @@ **/ #include "zbxsysinfo.h" +#include "../sysinfo.h" #include "log.h" @@ -36,7 +37,7 @@ static perfstat_memory_total_t m; return SYSINFO_RET_FAIL; \ } -static int VM_MEMORY_TOTAL(AGENT_RESULT *result) +static int vm_memory_total(AGENT_RESULT *result) { ZBX_PERFSTAT_MEMORY_TOTAL(); @@ -46,7 +47,7 @@ static int VM_MEMORY_TOTAL(AGENT_RESULT *result) return SYSINFO_RET_OK; } -static int VM_MEMORY_PINNED(AGENT_RESULT *result) +static int vm_memory_pinned(AGENT_RESULT *result) { ZBX_PERFSTAT_MEMORY_TOTAL(); @@ -56,7 +57,7 @@ static int VM_MEMORY_PINNED(AGENT_RESULT *result) return SYSINFO_RET_OK; } -static int VM_MEMORY_FREE(AGENT_RESULT *result) +static int vm_memory_free(AGENT_RESULT *result) { ZBX_PERFSTAT_MEMORY_TOTAL(); @@ -66,7 +67,7 @@ static int VM_MEMORY_FREE(AGENT_RESULT *result) return SYSINFO_RET_OK; } -static int VM_MEMORY_USED(AGENT_RESULT *result) +static int vm_memory_used(AGENT_RESULT *result) { ZBX_PERFSTAT_MEMORY_TOTAL(); @@ -76,7 +77,7 @@ static int VM_MEMORY_USED(AGENT_RESULT *result) return SYSINFO_RET_OK; } -static int VM_MEMORY_PUSED(AGENT_RESULT *result) +static int vm_memory_pused(AGENT_RESULT *result) { ZBX_PERFSTAT_MEMORY_TOTAL(); @@ -91,7 +92,7 @@ static int VM_MEMORY_PUSED(AGENT_RESULT *result) return SYSINFO_RET_OK; } -static int VM_MEMORY_AVAILABLE(AGENT_RESULT *result) +static int vm_memory_available(AGENT_RESULT *result) { ZBX_PERFSTAT_MEMORY_TOTAL(); @@ -100,7 +101,7 @@ static int VM_MEMORY_AVAILABLE(AGENT_RESULT *result) return SYSINFO_RET_OK; } -static int VM_MEMORY_PAVAILABLE(AGENT_RESULT *result) +static int vm_memory_pavailable(AGENT_RESULT *result) { ZBX_PERFSTAT_MEMORY_TOTAL(); @@ -115,7 +116,7 @@ static int VM_MEMORY_PAVAILABLE(AGENT_RESULT *result) return SYSINFO_RET_OK; } -static int VM_MEMORY_CACHED(AGENT_RESULT *result) +static int vm_memory_cached(AGENT_RESULT *result) { ZBX_PERFSTAT_MEMORY_TOTAL(); @@ -126,7 +127,7 @@ static int VM_MEMORY_CACHED(AGENT_RESULT *result) #endif -int VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result) +int vm_memory_size(AGENT_REQUEST *request, AGENT_RESULT *result) { #ifdef HAVE_LIBPERFSTAT int ret; @@ -141,21 +142,21 @@ 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, "pinned")) - ret = VM_MEMORY_PINNED(result); + ret = vm_memory_pinned(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 if (0 == strcmp(mode, "cached")) - ret = VM_MEMORY_CACHED(result); + ret = vm_memory_cached(result); else { SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter.")); |