X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fload.c;h=0188da7ef38407972f5570f47fabcf622db41b4b;hb=5f4c4a17072395bb8d54ab7b9e2d43ef05894c4d;hp=c9f130b7864609bf31b68aad4dfc4b4508a7e2e6;hpb=7e4b7b46592718cafa5f21ce03bd10dcf919a26d;p=collectd.git

diff --git a/src/load.c b/src/load.c
index c9f130b7..0188da7e 100644
--- a/src/load.c
+++ b/src/load.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/load.c
- * Copyright (C) 2005-2007  Florian octo Forster
+ * Copyright (C) 2005-2008  Florian octo Forster
+ * Copyright (C) 2009       Manuel Sanmartin
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,8 +18,11 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Manuel Sanmartin
  **/
 
+#define _BSD_SOURCE
+
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
@@ -27,6 +31,10 @@
 #include <sys/loadavg.h>
 #endif
 
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif
+
 #ifdef HAVE_GETLOADAVG
 #if !defined(LOADAVG_1MIN) || !defined(LOADAVG_5MIN) || !defined(LOADAVG_15MIN)
 #define LOADAVG_1MIN  0
@@ -35,6 +43,12 @@
 #endif
 #endif /* defined(HAVE_GETLOADAVG) */
 
+#ifdef HAVE_PERFSTAT
+# include <sys/proc.h> /* AIX 5 */
+# include <sys/protosw.h>
+# include <libperfstat.h>
+#endif /* HAVE_PERFSTAT */
+
 static void load_submit (gauge_t snum, gauge_t mnum, gauge_t lnum)
 {
 	value_t values[3];
@@ -46,11 +60,11 @@ static void load_submit (gauge_t snum, gauge_t mnum, gauge_t lnum)
 
 	vl.values = values;
 	vl.values_len = STATIC_ARRAY_SIZE (values);
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "load");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "load", sizeof (vl.plugin));
+	sstrncpy (vl.type, "load", sizeof (vl.type));
 
-	plugin_dispatch_values ("load", &vl);
+	plugin_dispatch_values (&vl);
 }
 
 static int load_read (void)
@@ -75,7 +89,7 @@ static int load_read (void)
 
 	char *fields[8];
 	int numfields;
-	
+
 	if ((loadavg = fopen ("/proc/loadavg", "r")) == NULL)
 	{
 		char errbuf[1024];
@@ -112,7 +126,7 @@ static int load_read (void)
 	load_submit (snum, mnum, lnum);
 /* #endif KERNEL_LINUX */
 
-#elif defined(HAVE_LIBSTATGRAB)
+#elif HAVE_LIBSTATGRAB
 	gauge_t snum, mnum, lnum;
 	sg_load_stats *ls;
 
@@ -126,6 +140,25 @@ static int load_read (void)
 	load_submit (snum, mnum, lnum);
 /* #endif HAVE_LIBSTATGRAB */
 
+#elif HAVE_PERFSTAT
+	gauge_t snum, mnum, lnum;
+	perfstat_cpu_total_t cputotal;
+
+	if (perfstat_cpu_total(NULL,  &cputotal, sizeof(perfstat_cpu_total_t), 1) < 0)
+	{
+		char errbuf[1024];
+		WARNING ("load: perfstat_cpu : %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		return (-1);
+	}
+
+	snum = (float)cputotal.loadavg[0]/(float)(1<<SBITS);
+	mnum = (float)cputotal.loadavg[1]/(float)(1<<SBITS);
+	lnum = (float)cputotal.loadavg[2]/(float)(1<<SBITS);
+
+	load_submit (snum, mnum, lnum);
+/* #endif HAVE_PERFSTAT */
+
 #else
 # error "No applicable input method."
 #endif