diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-25 15:56:33 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-25 15:56:33 +0000 |
| commit | f34eb9596b1831eff096a3518097a1edb18ccff0 (patch) | |
| tree | fb58f192c886cced768c88deb20247f410d63c09 /src/libs/zbxsysinfo/aix/cpu.c | |
| parent | 5e31f8a01e418799fb7840db0abfd36c8b5281f8 (diff) | |
| download | zabbix-f34eb9596b1831eff096a3518097a1edb18ccff0.tar.gz zabbix-f34eb9596b1831eff096a3518097a1edb18ccff0.tar.xz zabbix-f34eb9596b1831eff096a3518097a1edb18ccff0.zip | |
- added "SET_<TYPE>_RESULT" macross (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@2369 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxsysinfo/aix/cpu.c')
| -rw-r--r-- | src/libs/zbxsysinfo/aix/cpu.c | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/src/libs/zbxsysinfo/aix/cpu.c b/src/libs/zbxsysinfo/aix/cpu.c index 157ab650..75a8db56 100644 --- a/src/libs/zbxsysinfo/aix/cpu.c +++ b/src/libs/zbxsysinfo/aix/cpu.c @@ -221,8 +221,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R if(getloadavg(load, 3)) { - result->type |= AR_DOUBLE; - result->dbl = load[0]; + SET_DBL_RESULT(result, load[0]); return SYSINFO_RET_OK; } else @@ -243,8 +242,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R } else { - result->type |= AR_DOUBLE; - result->dbl = (double)dyn.psd_avg_1_min; + SET_DBL_RESULT(result, dyn.psd_avg_1_min); return SYSINFO_RET_OK; } #else @@ -270,8 +268,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R { return SYSINFO_RET_FAIL; } - result->type |= AR_DOUBLE; - result->dbl = (double)kn->value.ul/256.0; + SET_DBL_RESULT(result, ((double)kn->value.ul)/256.0); return SYSINFO_RET_OK; #else #ifdef HAVE_KNLIST_H @@ -286,8 +283,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R return SYSINFO_RET_FAIL; } - result->type |= AR_DOUBLE; - result->dbl = loadavg[0]; + SET_DBL_RESULT(result, loadavg[0]); return SYSINFO_RET_OK; #else assert(result); @@ -312,8 +308,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R if(getloadavg(load, 3)) { - result->type |= AR_DOUBLE; - result->dbl = load[1]; + SET_DBL_RESULT(result, load[1]); return SYSINFO_RET_OK; } else @@ -334,8 +329,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R } else { - result->type |= AR_DOUBLE; - result->dbl = (double)dyn.psd_avg_5_min; + SET_DBL_RESULT(result, dyn.psd_avg_5_min); return SYSINFO_RET_OK; } #else @@ -361,8 +355,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R { return SYSINFO_RET_FAIL; } - result->type |= AR_DOUBLE; - result->dbl = (double)kn->value.ul/256.0; + SET_DBL_RESULT(result, ((double)kn->value.ul)/256.0); return SYSINFO_RET_OK; #else #ifdef HAVE_KNLIST_H @@ -377,8 +370,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R return STSINFO_RET_FAIL; } - result->type |= AR_DOUBLE; - result->dbl = loadavg[1]; + SET_DBL_RESULT(result, loadavg[1]); return SYSINFO_RET_OK; #else assert(result); @@ -403,8 +395,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_ if(getloadavg(load, 3)) { - result->type |= AR_DOUBLE; - result->dbl = load[2]; + SET_DBL_RESULT(result, load[2]); return SYSINFO_RET_OK; } else @@ -425,8 +416,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_ } else { - result->type |= AR_DOUBLE; - result->dbl = (double)dyn.psd_avg_15_min; + SET_DBL_RESULT(result, dyn.psd_avg_15_min); return SYSINFO_RET_OK; } #else @@ -452,8 +442,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_ { return SYSINFO_RET_FAIL; } - result->type |= AR_DOUBLE; - result->dbl = (double)kn->value.ul/256.0; + SET_DBL_RESULT(result, ((double)kn->value.ul)/256.0); return SYSINFO_RET_OK; #else #ifdef HAVE_KNLIST_H @@ -468,8 +457,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_ return STSINFO_RET_FAIL; } - result->type |= AR_DOUBLE; - result->dbl = loadavg[2]; + SET_DBL_RESULT(result, loadavg[2]); return SYSINFO_RET_OK; #else assert(result); |