summaryrefslogtreecommitdiffstats
path: root/src/libs/zbxsysinfo
diff options
context:
space:
mode:
authorosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-08-01 10:36:17 +0000
committerosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-08-01 10:36:17 +0000
commit37fc71a7297c4ad3b4a6d6313b0468584fa232e2 (patch)
treed44f5de70975e1043dfcac943d3af0bc1cb758be /src/libs/zbxsysinfo
parentd287bd3f8fcb0f9f33f139bafb98d736553ac7df (diff)
downloadzabbix-37fc71a7297c4ad3b4a6d6313b0468584fa232e2.tar.gz
zabbix-37fc71a7297c4ad3b4a6d6313b0468584fa232e2.tar.xz
zabbix-37fc71a7297c4ad3b4a6d6313b0468584fa232e2.zip
- fixed collector for WinXX (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@4497 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxsysinfo')
-rw-r--r--src/libs/zbxsysinfo/aix/cpu.c2
-rw-r--r--src/libs/zbxsysinfo/aix/diskio.c4
-rw-r--r--src/libs/zbxsysinfo/freebsd/cpu.c2
-rw-r--r--src/libs/zbxsysinfo/freebsd/diskio.c4
-rw-r--r--src/libs/zbxsysinfo/hpux/cpu.c2
-rw-r--r--src/libs/zbxsysinfo/hpux/diskio.c4
-rw-r--r--src/libs/zbxsysinfo/linux/cpu.c2
-rw-r--r--src/libs/zbxsysinfo/netbsd/cpu.c2
-rw-r--r--src/libs/zbxsysinfo/netbsd/diskio.c4
-rw-r--r--src/libs/zbxsysinfo/osf/diskio.c4
-rw-r--r--src/libs/zbxsysinfo/osx/cpu.c2
-rw-r--r--src/libs/zbxsysinfo/osx/diskio.c4
-rw-r--r--src/libs/zbxsysinfo/unknown/cpu.c2
-rw-r--r--src/libs/zbxsysinfo/unknown/diskio.c4
-rw-r--r--src/libs/zbxsysinfo/win32/cpu.c4
-rw-r--r--src/libs/zbxsysinfo/win32/pdhmon.c2
16 files changed, 24 insertions, 24 deletions
diff --git a/src/libs/zbxsysinfo/aix/cpu.c b/src/libs/zbxsysinfo/aix/cpu.c
index da5e3cd6..549d24f0 100644
--- a/src/libs/zbxsysinfo/aix/cpu.c
+++ b/src/libs/zbxsysinfo/aix/cpu.c
@@ -72,7 +72,7 @@ int SYSTEM_CPU_UTIL(const char *cmd, const char *param, unsigned flags, AGENT_RE
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !CPU_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/aix/diskio.c b/src/libs/zbxsysinfo/aix/diskio.c
index 003d8185..1d08ce95 100644
--- a/src/libs/zbxsysinfo/aix/diskio.c
+++ b/src/libs/zbxsysinfo/aix/diskio.c
@@ -66,7 +66,7 @@ int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESU
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
@@ -142,7 +142,7 @@ int VFS_DEV_READ(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/freebsd/cpu.c b/src/libs/zbxsysinfo/freebsd/cpu.c
index da5e3cd6..549d24f0 100644
--- a/src/libs/zbxsysinfo/freebsd/cpu.c
+++ b/src/libs/zbxsysinfo/freebsd/cpu.c
@@ -72,7 +72,7 @@ int SYSTEM_CPU_UTIL(const char *cmd, const char *param, unsigned flags, AGENT_RE
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !CPU_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/freebsd/diskio.c b/src/libs/zbxsysinfo/freebsd/diskio.c
index 003d8185..1d08ce95 100644
--- a/src/libs/zbxsysinfo/freebsd/diskio.c
+++ b/src/libs/zbxsysinfo/freebsd/diskio.c
@@ -66,7 +66,7 @@ int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESU
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
@@ -142,7 +142,7 @@ int VFS_DEV_READ(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/hpux/cpu.c b/src/libs/zbxsysinfo/hpux/cpu.c
index 5d298ae4..9e86d8da 100644
--- a/src/libs/zbxsysinfo/hpux/cpu.c
+++ b/src/libs/zbxsysinfo/hpux/cpu.c
@@ -72,7 +72,7 @@ int SYSTEM_CPU_UTIL(const char *cmd, const char *param, unsigned flags, AGENT_RE
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !CPU_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/hpux/diskio.c b/src/libs/zbxsysinfo/hpux/diskio.c
index 003d8185..1d08ce95 100644
--- a/src/libs/zbxsysinfo/hpux/diskio.c
+++ b/src/libs/zbxsysinfo/hpux/diskio.c
@@ -66,7 +66,7 @@ int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESU
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
@@ -142,7 +142,7 @@ int VFS_DEV_READ(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/linux/cpu.c b/src/libs/zbxsysinfo/linux/cpu.c
index 0bf13ce6..3e05d401 100644
--- a/src/libs/zbxsysinfo/linux/cpu.c
+++ b/src/libs/zbxsysinfo/linux/cpu.c
@@ -72,7 +72,7 @@ int SYSTEM_CPU_UTIL(const char *cmd, const char *param, unsigned flags, AGENT_RE
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !CPU_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/netbsd/cpu.c b/src/libs/zbxsysinfo/netbsd/cpu.c
index da5e3cd6..549d24f0 100644
--- a/src/libs/zbxsysinfo/netbsd/cpu.c
+++ b/src/libs/zbxsysinfo/netbsd/cpu.c
@@ -72,7 +72,7 @@ int SYSTEM_CPU_UTIL(const char *cmd, const char *param, unsigned flags, AGENT_RE
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !CPU_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/netbsd/diskio.c b/src/libs/zbxsysinfo/netbsd/diskio.c
index 003d8185..1d08ce95 100644
--- a/src/libs/zbxsysinfo/netbsd/diskio.c
+++ b/src/libs/zbxsysinfo/netbsd/diskio.c
@@ -66,7 +66,7 @@ int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESU
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
@@ -142,7 +142,7 @@ int VFS_DEV_READ(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/osf/diskio.c b/src/libs/zbxsysinfo/osf/diskio.c
index 003d8185..1d08ce95 100644
--- a/src/libs/zbxsysinfo/osf/diskio.c
+++ b/src/libs/zbxsysinfo/osf/diskio.c
@@ -66,7 +66,7 @@ int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESU
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
@@ -142,7 +142,7 @@ int VFS_DEV_READ(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/osx/cpu.c b/src/libs/zbxsysinfo/osx/cpu.c
index da5e3cd6..549d24f0 100644
--- a/src/libs/zbxsysinfo/osx/cpu.c
+++ b/src/libs/zbxsysinfo/osx/cpu.c
@@ -72,7 +72,7 @@ int SYSTEM_CPU_UTIL(const char *cmd, const char *param, unsigned flags, AGENT_RE
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !CPU_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/osx/diskio.c b/src/libs/zbxsysinfo/osx/diskio.c
index 003d8185..1d08ce95 100644
--- a/src/libs/zbxsysinfo/osx/diskio.c
+++ b/src/libs/zbxsysinfo/osx/diskio.c
@@ -66,7 +66,7 @@ int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESU
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
@@ -142,7 +142,7 @@ int VFS_DEV_READ(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/unknown/cpu.c b/src/libs/zbxsysinfo/unknown/cpu.c
index da5e3cd6..549d24f0 100644
--- a/src/libs/zbxsysinfo/unknown/cpu.c
+++ b/src/libs/zbxsysinfo/unknown/cpu.c
@@ -72,7 +72,7 @@ int SYSTEM_CPU_UTIL(const char *cmd, const char *param, unsigned flags, AGENT_RE
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !CPU_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/unknown/diskio.c b/src/libs/zbxsysinfo/unknown/diskio.c
index 003d8185..1d08ce95 100644
--- a/src/libs/zbxsysinfo/unknown/diskio.c
+++ b/src/libs/zbxsysinfo/unknown/diskio.c
@@ -66,7 +66,7 @@ int VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESU
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
@@ -142,7 +142,7 @@ int VFS_DEV_READ(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !DISKDEV_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/win32/cpu.c b/src/libs/zbxsysinfo/win32/cpu.c
index 0c1b257e..a95635e2 100644
--- a/src/libs/zbxsysinfo/win32/cpu.c
+++ b/src/libs/zbxsysinfo/win32/cpu.c
@@ -78,7 +78,7 @@ int SYSTEM_CPU_UTIL(const char *cmd, const char *param, unsigned flags, AGENT_RE
zbx_snprintf(mode, sizeof(mode), "avg1");
}
- if(NULL == collector)
+ if ( !CPU_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
@@ -159,7 +159,7 @@ int SYSTEM_CPU_LOAD(const char *cmd, const char *param, unsigned flags, AGENT_RE
return SYSINFO_RET_FAIL;
}
- if(NULL == collector)
+ if ( !CPU_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
diff --git a/src/libs/zbxsysinfo/win32/pdhmon.c b/src/libs/zbxsysinfo/win32/pdhmon.c
index 761a336e..f00d58b3 100644
--- a/src/libs/zbxsysinfo/win32/pdhmon.c
+++ b/src/libs/zbxsysinfo/win32/pdhmon.c
@@ -32,7 +32,7 @@ int USER_PERFCOUNTER(const char *cmd, const char *param, unsigned flags, AGENT_R
int ret = SYSINFO_RET_FAIL;
- if(NULL == collector)
+ if ( !PERF_COLLECTOR_STARTED(collector) )
{
SET_MSG_RESULT(result, strdup("Collector is not started!"));
return SYSINFO_RET_OK;
generated by cgit (git 2.34.1) at 2024-09-28 19:30:59 +0000