X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fcpufreq.c;h=851aad420ba9eca17f3ccb729b3e7d718ffd98f2;hp=1e9e857980c68c3ebcb19af9e9b8c15d3f83ddcc;hb=06a86a60a7dabc685bdbd81ce3d36ea5f7e2c2d4;hpb=02f8dbc0985310574ea2837cd5e3c06cccda203d

diff --git a/src/cpufreq.c b/src/cpufreq.c
index 1e9e8579..851aad42 100644
--- a/src/cpufreq.c
+++ b/src/cpufreq.c
@@ -25,113 +25,70 @@
 #include "common.h"
 #include "plugin.h"
 
-#define MODULE_NAME "cpufreq"
+static int num_cpu;
 
-static int num_cpu = 0;
+static int cpufreq_init(void) {
+  int status;
+  char filename[256];
 
-static int cpufreq_init (void)
-{
-        int status;
-	char filename[256];
+  num_cpu = 0;
 
-	num_cpu = 0;
+  while (1) {
+    status = snprintf(filename, sizeof(filename),
+                      "/sys/devices/system/cpu/cpu%d/cpufreq/"
+                      "scaling_cur_freq",
+                      num_cpu);
+    if ((status < 1) || ((unsigned int)status >= sizeof(filename)))
+      break;
 
-	while (1)
-	{
-		status = ssnprintf (filename, sizeof (filename),
-				"/sys/devices/system/cpu/cpu%d/cpufreq/"
-				"scaling_cur_freq", num_cpu);
-		if ((status < 1) || ((unsigned int)status >= sizeof (filename)))
-			break;
+    if (access(filename, R_OK))
+      break;
 
-		if (access (filename, R_OK))
-			break;
+    num_cpu++;
+  }
 
-		num_cpu++;
-	}
+  INFO("cpufreq plugin: Found %d CPU%s", num_cpu, (num_cpu == 1) ? "" : "s");
 
-	INFO ("cpufreq plugin: Found %d CPU%s", num_cpu,
-			(num_cpu == 1) ? "" : "s");
+  if (num_cpu == 0)
+    plugin_unregister_read("cpufreq");
 
-	if (num_cpu == 0)
-		plugin_unregister_read ("cpufreq");
-
-	return (0);
+  return 0;
 } /* int cpufreq_init */
 
-static void cpufreq_submit (int cpu_num, double value)
-{
-	value_t values[1];
-	value_list_t vl = VALUE_LIST_INIT;
-
-	values[0].gauge = value;
+static void cpufreq_submit(int cpu_num, value_t value) {
+  value_list_t vl = VALUE_LIST_INIT;
 
-	vl.values = values;
-	vl.values_len = 1;
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
-	sstrncpy (vl.plugin, "cpufreq", sizeof (vl.plugin));
-	sstrncpy (vl.type, "cpufreq", sizeof (vl.type));
-	ssnprintf (vl.type_instance, sizeof (vl.type_instance),
-			"%i", cpu_num);
+  vl.values = &value;
+  vl.values_len = 1;
+  sstrncpy(vl.plugin, "cpufreq", sizeof(vl.plugin));
+  sstrncpy(vl.type, "cpufreq", sizeof(vl.type));
+  snprintf(vl.type_instance, sizeof(vl.type_instance), "%i", cpu_num);
 
-	plugin_dispatch_values (&vl);
+  plugin_dispatch_values(&vl);
 }
 
-static int cpufreq_read (void)
-{
-        int status;
-	unsigned long long val;
-	FILE *fp;
-	char filename[256];
-	char buffer[16];
-
-	for (int i = 0; i < num_cpu; i++)
-	{
-		status = ssnprintf (filename, sizeof (filename),
-				"/sys/devices/system/cpu/cpu%d/cpufreq/"
-				"scaling_cur_freq", i);
-		if ((status < 1) || ((unsigned int)status >= sizeof (filename)))
-			return (-1);
-
-		if ((fp = fopen (filename, "r")) == NULL)
-		{
-			char errbuf[1024];
-			WARNING ("cpufreq: fopen (%s): %s", filename,
-					sstrerror (errno, errbuf,
-						sizeof (errbuf)));
-			return (-1);
-		}
-
-		if (fgets (buffer, 16, fp) == NULL)
-		{
-			char errbuf[1024];
-			WARNING ("cpufreq: fgets: %s",
-					sstrerror (errno, errbuf,
-						sizeof (errbuf)));
-			fclose (fp);
-			return (-1);
-		}
-
-		if (fclose (fp))
-		{
-			char errbuf[1024];
-			WARNING ("cpufreq: fclose: %s",
-					sstrerror (errno, errbuf,
-						sizeof (errbuf)));
-		}
-
-
-		/* You're seeing correctly: The file is reporting kHz values.. */
-		val = atoll (buffer) * 1000;
-
-		cpufreq_submit (i, val);
-	}
-
-	return (0);
+static int cpufreq_read(void) {
+  for (int i = 0; i < num_cpu; i++) {
+    char filename[PATH_MAX];
+    snprintf(filename, sizeof(filename),
+             "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_cur_freq", i);
+
+    value_t v;
+    if (parse_value_file(filename, &v, DS_TYPE_GAUGE) != 0) {
+      WARNING("cpufreq plugin: Reading \"%s\" failed.", filename);
+      continue;
+    }
+
+    /* convert kHz to Hz */
+    v.gauge *= 1000.0;
+
+    cpufreq_submit(i, v);
+  }
+
+  return 0;
 } /* int cpufreq_read */
 
-void module_register (void)
-{
-	plugin_register_init ("cpufreq", cpufreq_init);
-	plugin_register_read ("cpufreq", cpufreq_read);
+void module_register(void) {
+  plugin_register_init("cpufreq", cpufreq_init);
+  plugin_register_read("cpufreq", cpufreq_read);
 }