diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-14 15:54:33 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-14 15:54:33 +0000 |
| commit | 8b3a821222ec9fb5437828f598063a29b8706a36 (patch) | |
| tree | 708aaca8476a6f4758bf41bf757c28f3d20b5aa0 /src/libs/zbxsysinfo/linux/cpu.c | |
| parent | aadd81c310474f516eec3e9f7f3ce0546623510d (diff) | |
| download | zabbix-8b3a821222ec9fb5437828f598063a29b8706a36.tar.gz zabbix-8b3a821222ec9fb5437828f598063a29b8706a36.tar.xz zabbix-8b3a821222ec9fb5437828f598063a29b8706a36.zip | |
Cleaning server code.
git-svn-id: svn://svn.zabbix.com/trunk@2314 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxsysinfo/linux/cpu.c')
| -rw-r--r-- | src/libs/zbxsysinfo/linux/cpu.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/libs/zbxsysinfo/linux/cpu.c b/src/libs/zbxsysinfo/linux/cpu.c index 213e7f03..34a2e261 100644 --- a/src/libs/zbxsysinfo/linux/cpu.c +++ b/src/libs/zbxsysinfo/linux/cpu.c @@ -121,7 +121,7 @@ CPU_FNCLIST assert(result); - clean_result(result); + init_result(result); if(num_param(param) > 3) { @@ -217,7 +217,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R assert(result); - clean_result(result); + init_result(result); if(getloadavg(load, 3)) { @@ -235,7 +235,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R assert(result); - clean_result(result); + init_result(result); if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) == -1) { @@ -258,7 +258,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R assert(result); - clean_result(result); + init_result(result); if (!kc && !(kc = kstat_open())) { @@ -279,7 +279,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R assert(result); - clean_result(result); + init_result(result); if(getloadavg_kmem(loadavg,3) == FAIL) { @@ -292,7 +292,7 @@ int SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_R #else assert(result); - clean_result(result); + init_result(result); return SYSINFO_RET_FAIL; #endif #endif @@ -308,7 +308,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R assert(result); - clean_result(result); + init_result(result); if(getloadavg(load, 3)) { @@ -326,7 +326,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R assert(result); - clean_result(result); + init_result(result); if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) == -1) { @@ -349,7 +349,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R assert(result); - clean_result(result); + init_result(result); if (!kc && !(kc = kstat_open())) { @@ -370,7 +370,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R assert(result); - clean_result(result); + init_result(result); if(getloadavg_kmem(loadavg,3) == FAIL) { @@ -383,7 +383,7 @@ int SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_R #else assert(result); - clean_result(result); + init_result(result); return SYSINFO_RET_FAIL; #endif #endif @@ -399,7 +399,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_ assert(result); - clean_result(result); + init_result(result); if(getloadavg(load, 3)) { @@ -417,7 +417,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_ assert(result); - clean_result(result); + init_result(result); if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) == -1) { @@ -440,7 +440,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_ assert(result); - clean_result(result); + init_result(result); if (!kc && !(kc = kstat_open())) { @@ -461,7 +461,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_ assert(result); - clean_result(result); + init_result(result); if(getloadavg_kmem(loadavg,3) == FAIL) { @@ -474,7 +474,7 @@ int SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_ #else assert(result); - clean_result(result); + init_result(result); return SYSINFO_RET_FAIL; #endif #endif @@ -507,7 +507,7 @@ CPU_FNCLIST assert(result); - clean_result(result); + init_result(result); if(num_param(param) > 2) { @@ -552,7 +552,7 @@ int SYSTEM_CPU_SWITCHES(const char *cmd, const char *param, unsigned flags, { assert(result); - clean_result(result); + init_result(result); return SYSINFO_RET_FAIL; } @@ -569,7 +569,7 @@ int SYSTEM_CPU_INTR(const char *cmd, const char *param, unsigned flags, AGEN assert(result); - clean_result(result); + init_result(result); f=fopen("/proc/stat","r"); if(f) |