unixsock plugin: Use `format_name' rather than the local `cache_alloc_name'.

[collectd.git] / src / load.c

diff --git a/src/load.c b/src/load.c
index e8dabaa..b92e54f 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -4,8 +4,7 @@
  *
  * 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
@@ -44,34 +43,33 @@
 #endif
 #endif /* defined(HAVE_GETLOADAVG) */
 
-data_source_t dsrc[3] =
+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}
 };
 
-data_set_t ds =
+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_t vl = VALUE_LIST_INIT;
 
        values[0].gauge = snum;
        values[1].gauge = mnum;
        values[2].gauge = lnum;
 
        vl.values = values;
-       vl.values_len = 3;
-       strcpy (vl.host, "localhost"); /* FIXME */
+       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 +82,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 +99,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 +134,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)