X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcpufreq.c;h=285ee6c6819931b8635aca06d1ac088dff67601b;hb=f46301fdc32e9cd13a757dbc005d2b66d5188193;hp=001ccec2c580972f9aad03a8a702c1d289624415;hpb=f9ee71b22e47eec32ceedd8d85afc99949a084a6;p=collectd.git

diff --git a/src/cpufreq.c b/src/cpufreq.c
index 001ccec2..285ee6c6 100644
--- a/src/cpufreq.c
+++ b/src/cpufreq.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/cpufreq.c
- * Copyright (C) 2005  Peter Holik
+ * Copyright (C) 2005-2007  Peter Holik
  *
  * 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
@@ -20,119 +20,82 @@
  *   Peter Holik <peter at holik.at>
  **/
 
-#include "cpufreq.h"
+#include "collectd.h"
 
-/*
- * Originally written by Peter Holik
- */
-
-#if COLLECT_CPUFREQ
-#define MODULE_NAME "cpufreq"
-
-#include "plugin.h"
 #include "common.h"
+#include "plugin.h"
 
 static int num_cpu = 0;
 
-static char *cpufreq_file = "cpufreq-%s.rrd";
-
-static char *ds_def[] =
-{
-	"DS:value:GAUGE:25:0:U",
-	NULL
-};
-static int ds_num = 1;
-
-#define BUFSIZE 256
-
-void cpufreq_init (void)
+static int cpufreq_init (void)
 {
         int status;
-	char filename[BUFSIZE];
+	char filename[256];
 
 	num_cpu = 0;
 
 	while (1)
 	{
-		status = snprintf (filename, BUFSIZE, "/sys/devices/system/cpu/cpu%d/cpufreq/cpuinfo_cur_freq", num_cpu);
-    		if (status < 1 || status >= BUFSIZE)
+		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))
+		if (access (filename, R_OK))
 			break;
 
 		num_cpu++;
 	}
 
-	syslog (LOG_INFO, MODULE_NAME" found %d cpu(s)", num_cpu);
-}
-
-void cpufreq_write (char *host, char *inst, char *val)
-{
-        int status;
-        char file[BUFSIZE];
+	INFO ("cpufreq plugin: Found %d CPU%s", num_cpu,
+			(num_cpu == 1) ? "" : "s");
 
-        status = snprintf (file, BUFSIZE, cpufreq_file, inst);
-        if (status < 1 || status >= BUFSIZE)
-                return;
+	if (num_cpu == 0)
+		plugin_unregister_read ("cpufreq");
 
-	rrd_update_file (host, file, val, ds_def, ds_num);
-}
+	return (0);
+} /* int cpufreq_init */
 
-void cpufreq_submit (int cpu_num, unsigned long long val)
+static void cpufreq_submit (int cpu_num, value_t value)
 {
-	char buf[BUFSIZE];
-	char cpu[16];
+	value_list_t vl = VALUE_LIST_INIT;
 
-	if (snprintf (buf, BUFSIZE, "%u:%llu", (unsigned int) curtime, val) >= BUFSIZE)
-		return;
-        snprintf (cpu, 16, "%i", cpu_num);
+	vl.values = &value;
+	vl.values_len = 1;
+	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);
 
-	plugin_submit (MODULE_NAME, cpu, buf);
+	plugin_dispatch_values (&vl);
 }
 
-void cpufreq_read (void)
+static int cpufreq_read (void)
 {
-        int status;
-	unsigned long long val;
-	int i = 0;
-	FILE *fp;
-	char filename[BUFSIZE];
-	char buffer[16];
-
-	for (i = 0; i < num_cpu; i++)
+	for (int i = 0; i < num_cpu; i++)
 	{
-		status = snprintf (filename, BUFSIZE, "/sys/devices/system/cpu/cpu%d/cpufreq/cpuinfo_cur_freq", i);
-    		if (status < 1 || status >= BUFSIZE)
-			return;
+		char filename[PATH_MAX];
+		ssnprintf (filename, sizeof (filename),
+				"/sys/devices/system/cpu/cpu%d/cpufreq/scaling_cur_freq", i);
 
-		if ((fp = fopen (filename, "r")) == NULL)
+		value_t v;
+		if (parse_value_file (filename, &v, DS_TYPE_GAUGE) != 0)
 		{
-			syslog (LOG_WARNING, "cpufreq: fopen: %s", strerror (errno));
-			return;
+			WARNING ("cpufreq plugin: Reading \"%s\" failed.", filename);
+			continue;
 		}
 
-		if (fgets (buffer, 16, fp) == NULL)
-		{
-			syslog (LOG_WARNING, "cpufreq: fgets: %s", strerror (errno));
-			return;
-		}
+		/* convert kHz to Hz */
+		v.gauge *= 1000.0;
 
-		if (fclose (fp))
-			syslog (LOG_WARNING, "cpufreq: fclose: %s", strerror (errno));
-
-		/* You're seeing correctly: The file is reporting kHz values.. */
-		val = atoll (buffer) * 1000;
-
-		cpufreq_submit (i, val);
+		cpufreq_submit (i, v);
 	}
-}
-#undef BUFSIZE
+
+	return (0);
+} /* int cpufreq_read */
 
 void module_register (void)
 {
-	plugin_register (MODULE_NAME, cpufreq_init, cpufreq_read, cpufreq_write);
+	plugin_register_init ("cpufreq", cpufreq_init);
+	plugin_register_read ("cpufreq", cpufreq_read);
 }
-
-#undef MODULE_NAME
-#endif /* COLLECT_CPUFREQ */