Let plugin_dispatch_values() set value_list.time in case of 'now'.

[collectd.git] / src / thermal.c

diff --git a/src/thermal.c b/src/thermal.c
index 4af63bc..79033b1 100644 (file)
--- a/src/thermal.c
+++ b/src/thermal.c
@@ -51,7 +51,6 @@ static void thermal_submit (const char *plugin_instance, enum dev_type dt,
        vt.gauge = value;
 
        vl.values = &vt;
-       vl.time = time (NULL);
        sstrncpy (vl.plugin, "thermal", sizeof(vl.plugin));
        sstrncpy (vl.plugin_instance, plugin_instance,
                        sizeof(vl.plugin_instance));
@@ -61,27 +60,17 @@ static void thermal_submit (const char *plugin_instance, enum dev_type dt,
        plugin_dispatch_values (&vl);
 }
 
-static int read_file_contents (const char *filename, char *buf, int bufsize)
-{
-       FILE *fh;
-       int n;
-
-       if ((fh = fopen (filename, "r")) == NULL)
-               return -1;
-
-       n = fread(buf, 1, bufsize, fh);
-       fclose(fh);
-
-       return n;
-}
-
-static int thermal_sysfs_device_read (const char *name)
+static int thermal_sysfs_device_read (const char *dir, const char *name,
+               void *user_data)
 {
        char filename[256];
        char data[1024];
        int len;
        int ok = 0;
 
+       if (device_list && ignorelist_match (device_list, name))
+               return -1;
+
        len = snprintf (filename, sizeof (filename), "%s/%s/temp", dirname_sysfs, name);
        if ((len < 0) || ((unsigned int)len >= sizeof (filename)))
                return -1;
@@ -123,13 +112,17 @@ static int thermal_sysfs_device_read (const char *name)
        return ok ? 0 : -1;
 }
 
-static int thermal_procfs_device_read (const char *name)
+static int thermal_procfs_device_read (const char *dir, const char *name,
+               void *user_data)
 {
        const char str_temp[] = "temperature:";
        char filename[256];
        char data[1024];
        int len;
 
+       if (device_list && ignorelist_match (device_list, name))
+               return -1;
+
        /**
         * rechot ~ # cat /proc/acpi/thermal_zone/THRM/temperature
         * temperature:             55 C
@@ -221,48 +214,16 @@ static int thermal_config (const char *key, const char *value)
        return 0;
 }
 
-static int walk_directory (const char *dir, int (*callback)(const char *dev))
-{
-       struct dirent *ent;
-       DIR *dh;
-       int ok = 0;
-
-       if ((dh = opendir (dir)) == NULL)
-       {
-               char errbuf[1024];
-               ERROR ("Cannot open '%s': %s", dir,
-                               sstrerror (errno, errbuf, sizeof (errbuf)));
-               return -1;
-       }
-
-       while ((ent = readdir (dh)) != NULL)
-       {
-               if (ent->d_name[0] == '.')
-                       continue;
-
-               if (device_list) {
-                       DEBUG ("thermal plugin: Checking ignorelist for '%s'", ent->d_name);
-                       if (ignorelist_match (device_list, ent->d_name))
-                               continue;
-               }
-
-               if (!callback(ent->d_name))
-                       ++ok;
-       }
-
-       closedir (dh);
-
-       return ok ? 0 : -1;
-}
-
 static int thermal_sysfs_read (void)
 {
-       return walk_directory (dirname_sysfs, thermal_sysfs_device_read);
+       return walk_directory (dirname_sysfs, thermal_sysfs_device_read,
+                       /* user_data = */ NULL);
 }
 
 static int thermal_procfs_read (void)
 {
-       return walk_directory (dirname_procfs, thermal_procfs_device_read);
+       return walk_directory (dirname_procfs, thermal_procfs_device_read,
+                       /* user_data = */ NULL);
 }
 
 static int thermal_init (void)