X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fload.c;h=5e1d9d30a0758fb362661dee1551f9557777b652;hb=42c56b58e385b7a45ab0d2287a4042e53ae22c07;hp=4b36221375245f6012cba5618df101743ca67f9c;hpb=2d897a731bd23f7a33b89e7b7e3004b6b26b5a94;p=collectd.git

diff --git a/src/load.c b/src/load.c
index 4b362213..5e1d9d30 100644
--- a/src/load.c
+++ b/src/load.c
@@ -23,8 +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
@@ -43,20 +41,8 @@
 #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;
@@ -66,12 +52,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_g);
 	strcpy (vl.plugin, "load");
-	strcpy (vl.plugin_instance, "");
-	strcpy (vl.type_instance, "");
 
 	plugin_dispatch_values ("load", &vl);
 }
@@ -84,11 +68,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];
 
@@ -97,19 +85,27 @@ static int load_read (void)
 	
 	if ((loadavg = fopen ("/proc/loadavg", "r")) == NULL)
 	{
-		syslog (LOG_WARNING, "load: fopen: %s", strerror (errno));
+		char errbuf[1024];
+		WARNING ("load: fopen: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
 		return;
 	}
 
 	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;
 	}
 
 	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);
 
@@ -124,7 +120,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)
@@ -143,10 +139,7 @@ static int load_read (void)
 
 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 */