X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fload.c;h=c9f130b7864609bf31b68aad4dfc4b4508a7e2e6;hb=e4b274ed754af52196d3390b8ce101a7f94e318a;hp=3e60a43c021c423bcfdc4502cd979ea071c1fe59;hpb=1f1da34268a497dfeba6502084bb51ec2875b032;p=collectd.git

diff --git a/src/load.c b/src/load.c
index 3e60a43c..c9f130b7 100644
--- a/src/load.c
+++ b/src/load.c
@@ -1,11 +1,10 @@
 /**
  * collectd - src/load.c
- * Copyright (C) 2005,2006  Florian octo Forster
+ * Copyright (C) 2005-2007  Florian octo Forster
  *
  * 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
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * Free Software Foundation; only version 2 of the License is applicable.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,14 +23,6 @@
 #include "common.h"
 #include "plugin.h"
 
-#define MODULE_NAME "load"
-
-#if defined(HAVE_GETLOADAVG) || defined(KERNEL_LINUX) || defined(HAVE_LIBSTATGRAB)
-# define LOAD_HAVE_READ 1
-#else
-# define LOAD_HAVE_READ 0
-#endif
-
 #ifdef HAVE_SYS_LOADAVG_H
 #include <sys/loadavg.h>
 #endif
@@ -44,20 +35,7 @@
 #endif
 #endif /* defined(HAVE_GETLOADAVG) */
 
-static data_source_t dsrc[3] =
-{
-	{"shortterm", DS_TYPE_GAUGE, 0.0, 100.0},
-	{"midterm",   DS_TYPE_GAUGE, 0.0, 100.0},
-	{"longterm",  DS_TYPE_GAUGE, 0.0, 100.0}
-};
-
-static data_set_t ds =
-{
-	"load", 3, dsrc
-};
-
-#if LOAD_HAVE_READ
-static void load_submit (double snum, double mnum, double lnum)
+static void load_submit (gauge_t snum, gauge_t mnum, gauge_t lnum)
 {
 	value_t values[3];
 	value_list_t vl = VALUE_LIST_INIT;
@@ -67,12 +45,10 @@ static void load_submit (double snum, double mnum, double lnum)
 	values[2].gauge = lnum;
 
 	vl.values = values;
-	vl.values_len = 3;
+	vl.values_len = STATIC_ARRAY_SIZE (values);
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname);
+	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "load");
-	strcpy (vl.plugin_instance, "");
-	strcpy (vl.type_instance, "");
 
 	plugin_dispatch_values ("load", &vl);
 }
@@ -85,11 +61,15 @@ static int load_read (void)
 	if (getloadavg (load, 3) == 3)
 		load_submit (load[LOADAVG_1MIN], load[LOADAVG_5MIN], load[LOADAVG_15MIN]);
 	else
-		syslog (LOG_WARNING, "load: getloadavg failed: %s", strerror (errno));
+	{
+		char errbuf[1024];
+		WARNING ("load: getloadavg failed: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+	}
 /* #endif HAVE_GETLOADAVG */
 
 #elif defined(KERNEL_LINUX)
-	double snum, mnum, lnum;
+	gauge_t snum, mnum, lnum;
 	FILE *loadavg;
 	char buffer[16];
 
@@ -98,24 +78,32 @@ static int load_read (void)
 	
 	if ((loadavg = fopen ("/proc/loadavg", "r")) == NULL)
 	{
-		syslog (LOG_WARNING, "load: fopen: %s", strerror (errno));
-		return;
+		char errbuf[1024];
+		WARNING ("load: fopen: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		return (-1);
 	}
 
 	if (fgets (buffer, 16, loadavg) == NULL)
 	{
-		syslog (LOG_WARNING, "load: fgets: %s", strerror (errno));
+		char errbuf[1024];
+		WARNING ("load: fgets: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
 		fclose (loadavg);
-		return;
+		return (-1);
 	}
 
 	if (fclose (loadavg))
-		syslog (LOG_WARNING, "load: fclose: %s", strerror (errno));
+	{
+		char errbuf[1024];
+		WARNING ("load: fclose: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+	}
 
 	numfields = strsplit (buffer, fields, 8);
 
 	if (numfields < 3)
-		return;
+		return (-1);
 
 	snum = atof (fields[0]);
 	mnum = atof (fields[1]);
@@ -125,7 +113,7 @@ static int load_read (void)
 /* #endif KERNEL_LINUX */
 
 #elif defined(HAVE_LIBSTATGRAB)
-	double snum, mnum, lnum;
+	gauge_t snum, mnum, lnum;
 	sg_load_stats *ls;
 
 	if ((ls = sg_get_load_stats ()) == NULL)
@@ -136,18 +124,16 @@ static int load_read (void)
 	lnum = ls->min15;
 
 	load_submit (snum, mnum, lnum);
-#endif /* HAVE_LIBSTATGRAB */
+/* #endif HAVE_LIBSTATGRAB */
+
+#else
+# error "No applicable input method."
+#endif
 
 	return (0);
 }
-#endif /* LOAD_HAVE_READ */
 
 void module_register (void)
 {
-	plugin_register_data_set (&ds);
-#if LOAD_HAVE_READ
 	plugin_register_read ("load", load_read);
-#endif
-}
-
-#undef MODULE_NAME
+} /* void module_register */