- added support of "system.cpu.util[]" key for HPUX (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@2914 97f52cf1-0a1b-0410-bd0e-c28be96e8082

5 files changed, 60 insertions, 274 deletions

diff --git a/src/libs/zbxsysinfo/hpux/cpu.c b/src/libs/zbxsysinfo/hpux/cpu.c
index 75a8db56..8203daab 100644
--- a/src/libs/zbxsysinfo/hpux/cpu.c
+++ b/src/libs/zbxsysinfo/hpux/cpu.c
@@ -176,299 +176,52 @@ CPU_FNCLIST
 	return SYSINFO_RET_FAIL;
 }
 
-/* AIX CPU info */
-#ifdef HAVE_KNLIST_H
-static int getloadavg_kmem(double loadavg[], int nelem)
-{
-	struct nlist nl;
-	int kmem, i;
-	long avenrun[3];
-
-	nl.n_name = "avenrun";
-	nl.n_value = 0;
-
-	if(knlist(&nl, 1, sizeof(nl)))
-	{
-		return FAIL;
-	}
-	if((kmem = open("/dev/kmem", 0, 0)) <= 0)
-	{
-		return FAIL;
-	}
-
-	if(pread(kmem, avenrun, sizeof(avenrun), nl.n_value) <
-				sizeof(avenrun))
-	{
-		return FAIL;
-	}
-
-	for(i=0;i<nelem;i++)
-	{
-		loadavg[i] = (double) avenrun[i] / 65535;
-	}
-	return SUCCEED;
-}
-#endif
-
 int	SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
-#ifdef HAVE_GETLOADAVG
-	double	load[3];
-
-	assert(result);
-
-        init_result(result);
-		
-	if(getloadavg(load, 3))
-	{
-		SET_DBL_RESULT(result, load[0]);
-		return SYSINFO_RET_OK;
-	}
-	else
-	{
-		return SYSINFO_RET_FAIL;	
-	}
-#else
-#ifdef	HAVE_SYS_PSTAT_H
 	struct	pst_dynamic dyn;
 
 	assert(result);
 
         init_result(result);
 
-	if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) == -1)
-	{
-		return SYSINFO_RET_FAIL;
-	}
-	else
+	if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) != -1)
 	{
 		SET_DBL_RESULT(result, dyn.psd_avg_1_min);
 		return SYSINFO_RET_OK;
 	}
-#else
-#ifdef HAVE_PROC_LOADAVG
-	return	getPROC("/proc/loadavg",1,1, flags, result);
-#else
-#ifdef HAVE_KSTAT_H
-	static kstat_ctl_t *kc = NULL;
-	kstat_t *ks;
-	kstat_named_t *kn;
-
-	assert(result);
-
-        init_result(result);
-	
-	if (!kc && !(kc = kstat_open()))
-	{
-		return SYSINFO_RET_FAIL;
-	}
-	if (!(ks = kstat_lookup(kc, "unix", 0, "system_misc")) ||
-		kstat_read(kc, ks, 0) == -1 ||
-		!(kn = kstat_data_lookup(ks,"avenrun_1min")))
-	{
-		return SYSINFO_RET_FAIL;
-	}
-	SET_DBL_RESULT(result, ((double)kn->value.ul)/256.0);
-	return SYSINFO_RET_OK;
-#else
-#ifdef HAVE_KNLIST_H
-	double loadavg[3];
-
-	assert(result);
-
-        init_result(result);
-		
-	if(getloadavg_kmem(loadavg,3) == FAIL)
-	{
-		return SYSINFO_RET_FAIL;
-	}
-
-	SET_DBL_RESULT(result, loadavg[0]);
-	return SYSINFO_RET_OK;
-#else
-	assert(result);
-
-        init_result(result);
-	return	SYSINFO_RET_FAIL;
-#endif
-#endif
-#endif
-#endif
-#endif
+	return SYSINFO_RET_FAIL;
 }
 
 int	SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
-#ifdef HAVE_GETLOADAVG
-	double	load[3];
-
-	assert(result);
-
-        init_result(result);
-		
-	if(getloadavg(load, 3))
-	{
-		SET_DBL_RESULT(result, load[1]);
-		return SYSINFO_RET_OK;
-	}
-	else
-	{
-		return SYSINFO_RET_FAIL;	
-	}
-#else
-#ifdef	HAVE_SYS_PSTAT_H
 	struct	pst_dynamic dyn;
 
 	assert(result);
 
         init_result(result);
 	
-	if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) == -1)
-	{
-		return SYSINFO_RET_FAIL;
-	}
-	else
+	if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) != -1)
 	{
 		SET_DBL_RESULT(result, dyn.psd_avg_5_min);
 		return SYSINFO_RET_OK;
 	}
-#else
-#ifdef	HAVE_PROC_LOADAVG
-	return	getPROC("/proc/loadavg",1,2, flags, result);
-#else
-#ifdef HAVE_KSTAT_H
-	static kstat_ctl_t *kc = NULL;
-	kstat_t *ks;
-	kstat_named_t *kn;
-
-	assert(result);
-
-        init_result(result);
-		
-	if (!kc && !(kc = kstat_open()))
-	{
-		return SYSINFO_RET_FAIL;
-	}
-	if (!(ks = kstat_lookup(kc, "unix", 0, "system_misc")) ||
-		kstat_read(kc, ks, 0) == -1 ||
-		!(kn = kstat_data_lookup(ks,"avenrun_5min")))
-	{
-		return SYSINFO_RET_FAIL;
-	}
-	SET_DBL_RESULT(result, ((double)kn->value.ul)/256.0);
-	return SYSINFO_RET_OK;
-#else
-#ifdef HAVE_KNLIST_H
-	double loadavg[3];
-
-	assert(result);
-
-        init_result(result);
-
-	if(getloadavg_kmem(loadavg,3) == FAIL)
-	{
-		return STSINFO_RET_FAIL;
-	}
-
-	SET_DBL_RESULT(result, loadavg[1]);
-	return SYSINFO_RET_OK;
-#else
-	assert(result);
-
-        init_result(result);
-	return	SYSINFO_RET_FAIL;
-#endif
-#endif
-#endif
-#endif
-#endif
+	return SYSINFO_RET_FAIL;
 }
 
 int	SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
-#ifdef HAVE_GETLOADAVG
-	double	load[3];
-
-	assert(result);
-
-        init_result(result);
-
-	if(getloadavg(load, 3))
-	{
-		SET_DBL_RESULT(result, load[2]);	
-		return SYSINFO_RET_OK;
-	}
-	else
-	{
-		return SYSINFO_RET_FAIL;	
-	}
-#else
-#ifdef	HAVE_SYS_PSTAT_H
 	struct	pst_dynamic dyn;
 
 	assert(result);
 
         init_result(result);
 		
-	if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) == -1)
-	{
-		return SYSINFO_RET_FAIL;
-	}
-	else
+	if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) != -1)
 	{
 		SET_DBL_RESULT(result, dyn.psd_avg_15_min);
 		return SYSINFO_RET_OK;
 	}
-#else
-#ifdef	HAVE_PROC_LOADAVG
-	return	getPROC("/proc/loadavg",1,3, flags, result);
-#else
-#ifdef HAVE_KSTAT_H
-	static kstat_ctl_t *kc = NULL;
-	kstat_t *ks;
-	kstat_named_t *kn;
-
-	assert(result);
-
-        init_result(result);
-		
-	if (!kc && !(kc = kstat_open()))
-	{
-		return SYSINFO_RET_FAIL;
-	}
-	if (!(ks = kstat_lookup(kc, "unix", 0, "system_misc")) ||
-		kstat_read(kc, ks, 0) == -1 ||
-		!(kn = kstat_data_lookup(ks,"avenrun_15min")))
-	{
-		return SYSINFO_RET_FAIL;
-	}
-	SET_DBL_RESULT(result, ((double)kn->value.ul)/256.0);
-	return SYSINFO_RET_OK;
-#else
-#ifdef HAVE_KNLIST_H
-	double loadavg[3];
-
-	assert(result);
-
-        init_result(result);
-	
-	if(getloadavg_kmem(loadavg,3) == FAIL)
-	{
-		return STSINFO_RET_FAIL;
-	}
-
-	SET_DBL_RESULT(result, loadavg[2]);
-	return SYSINFO_RET_OK;
-#else
-	assert(result);
-
-        init_result(result);
-	return	SYSINFO_RET_FAIL;
-#endif
-#endif
-#endif
-#endif
-#endif
+	return SYSINFO_RET_FAIL;
 }
 
 int	SYSTEM_CPU_LOAD(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
diff --git a/src/zabbix_agent/cpustat.c b/src/zabbix_agent/cpustat.c
index d733af46..862b9abb 100644
--- a/src/zabbix_agent/cpustat.c
+++ b/src/zabbix_agent/cpustat.c
@@ -284,45 +284,66 @@ void	add_values_cpustat(int now,float cpu_user,float cpu_system,float cpu_nice,f
 
 void	collect_stats_cpustat(FILE *outfile)
 {
-	FILE	*file;
-
-	char	*s;
-	char	line[MAX_STRING_LEN];
-	int	i;
-	int	now;
-	float	cpu_user, cpu_nice, cpu_system, cpu_idle;
-
 	/* Must be static */
-	static	int initialised=0;
+	static	int initialised = 0;
+	int	now = 0;
+	float	cpu_user, cpu_nice, cpu_system, cpu_idle;
 
-	if( 0 == initialised)
+#if defined(HAVE_PROC_STAT)
+	
+	FILE	*file;
+	char	line[MAX_STRING_LEN];
+	
+#elif defined(HAVE_SYS_PSTAT_H) /* HAVE_PROC_STAT */
+	
+	struct pst_dynamic stats;
+	
+#else /* HAVE_SYS_PSTAT_H */
+
+	return;
+	
+#endif
+
+	if(!initialised)
 	{
 		init_stats_cpustat();
-		initialised=1;
+		initialised = 1;
 	}
 
-	now=time(NULL);
+	now = time(NULL);
 
-	file=fopen("/proc/stat","r");
+#if defined(HAVE_PROC_STAT)
+	
+	file = fopen("/proc/stat","r");
 	if(NULL == file)
 	{
 		fprintf(stderr, "Cannot open [%s] [%s]\n","/proc/stat", strerror(errno));
 		return;
 	}
-	i=0;
+	cpu_user = cpu_nice = cpu_system = cpu_idle = -1;
 	while(fgets(line,1024,file) != NULL)
 	{
-		if( (s=strstr(line,"cpu ")) == NULL)
-			continue;
+		if(strstr(line,"cpu ") == NULL) continue;
 
-		s=line;
-
-		sscanf(s,"cpu %f %f %f %f",&cpu_user, &cpu_nice, &cpu_system, &cpu_idle);
-		add_values_cpustat(now,cpu_user, cpu_system, cpu_nice, cpu_idle);
+		sscanf(line, "cpu %f %f %f %f", &cpu_user, &cpu_nice, &cpu_system, &cpu_idle);
 		break;
 	}
-
 	fclose(file);
 
+	if(cpu_user < 0) 
+		return;
+	
+#elif defined(HAVE_SYS_PSTAT_H) /* HAVE_PROC_STAT */
+
+	pstat_getdynamic(&stats, sizeof( struct pst_dynamic ), 1, 0 );
+	cpu_user 	= (float)stats.psd_cpu_time[CP_USER];
+	cpu_nice 	= (float)stats.psd_cpu_time[CP_SYS];
+	cpu_system 	= (float)stats.psd_cpu_time[CP_NICE];
+	cpu_idle 	= (float)stats.psd_cpu_time[CP_IDLE];
+	
+#endif /* HAVE_SYS_PSTAT_H */
+
+	add_values_cpustat(now,cpu_user, cpu_system, cpu_nice, cpu_idle);
 	report_stats_cpustat(outfile, now);
+	
 }
diff --git a/src/zabbix_agent/diskdevices.c b/src/zabbix_agent/diskdevices.c
index cd2df187..8b2f91da 100644
--- a/src/zabbix_agent/diskdevices.c
+++ b/src/zabbix_agent/diskdevices.c
@@ -443,6 +443,8 @@ void	add_values_diskdevices(int now,int major,int diskno,float read_io_ops,float
 
 void	collect_stats_diskdevices(FILE *outfile)
 {
+#ifdef HAVE_PROC_STAT
+
 	FILE	*file;
 
 	char	*s,*s2;
@@ -506,4 +508,6 @@ void	collect_stats_diskdevices(FILE *outfile)
 	fclose(file);
 
 	report_stats_diskdevices(outfile, now);
+
+#endif /* HAVE_PROC_STAT */
 }
diff --git a/src/zabbix_agent/interfaces.c b/src/zabbix_agent/interfaces.c
index 7cb6c402..446d0ce0 100644
--- a/src/zabbix_agent/interfaces.c
+++ b/src/zabbix_agent/interfaces.c
@@ -320,6 +320,8 @@ void	add_values_interfaces(int now,char *interface,float value_sent,float value_
 
 void	collect_stats_interfaces(FILE *outfile)
 {
+#ifdef HAVE_PROC_NET_DEV
+	
 	FILE	*file;
 
 	char	*s;
@@ -389,4 +391,6 @@ void	collect_stats_interfaces(FILE *outfile)
 	fclose(file);
 
 	report_stats_interfaces(outfile, now);
+
+#endif /* HAVE_PROC_NET_DEV */
 }
diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c
index c6293e00..de3cc0bc 100644
--- a/src/zabbix_agent/zabbix_agentd.c
+++ b/src/zabbix_agent/zabbix_agentd.c
@@ -612,6 +612,9 @@ int	main(int argc, char **argv)
 	setproctitle("main process");
 #endif
 
+	collect_statistics();
+
+/*
 #ifdef HAVE_PROC_NET_DEV
 	collect_statistics();
 #else
@@ -620,6 +623,7 @@ int	main(int argc, char **argv)
 		pause();
 	}
 #endif
+*/
 
 	return SUCCEED;
 }