X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcpufreq.c;h=80f586db640e55937d4de7bedf889d888c6a0e4c;hb=d25dc3518776ed93b2f1e2ca469cf874b24df8b1;hp=ba0149ad1f390298af4049690cc56c9458f4c8b7;hpb=56f1b53ff9d854740201b1070d3cd2637be56b6e;p=collectd.git

diff --git a/src/cpufreq.c b/src/cpufreq.c
index ba0149ad..80f586db 100644
--- a/src/cpufreq.c
+++ b/src/cpufreq.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/cpufreq.c
- * Copyright (C) 2005,2006  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
@@ -21,132 +21,102 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
 #define MODULE_NAME "cpufreq"
 
-#if defined(KERNEL_LINUX)
-# define CPUFREQ_HAVE_READ 1
-#else
-# define CPUFREQ_HAVE_READ 0
-#endif
-
-static char *cpufreq_file = "cpufreq-%s.rrd";
-
-static char *ds_def[] =
-{
-	"DS:value:GAUGE:"COLLECTD_HEARTBEAT":0:U",
-	NULL
-};
-static int ds_num = 1;
-
-#ifdef KERNEL_LINUX
 static int num_cpu = 0;
-#endif
-
-#define BUFSIZE 256
 
-static void cpufreq_init (void)
-{
-#ifdef KERNEL_LINUX
-        int status;
-	char filename[BUFSIZE];
+static int cpufreq_init(void) {
+  int status;
+  char filename[256];
 
-	num_cpu = 0;
+  num_cpu = 0;
 
-	while (1)
-	{
-		status = snprintf (filename, BUFSIZE, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_cur_freq", num_cpu);
-    		if (status < 1 || status >= BUFSIZE)
-			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++;
+  }
 
-	syslog (LOG_INFO, MODULE_NAME" found %d cpu(s)", num_cpu);
-#endif /* defined(KERNEL_LINUX) */
+  INFO("cpufreq plugin: Found %d CPU%s", num_cpu, (num_cpu == 1) ? "" : "s");
 
-	return;
-}
-
-static void cpufreq_write (char *host, char *inst, char *val)
-{
-        int status;
-        char file[BUFSIZE];
+  if (num_cpu == 0)
+    plugin_unregister_read("cpufreq");
 
-        status = snprintf (file, BUFSIZE, cpufreq_file, inst);
-        if (status < 1 || status >= BUFSIZE)
-                return;
+  return (0);
+} /* int cpufreq_init */
 
-	rrd_update_file (host, file, val, ds_def, ds_num);
-}
+static void cpufreq_submit(int cpu_num, double value) {
+  value_t values[1];
+  value_list_t vl = VALUE_LIST_INIT;
 
-#if CPUFREQ_HAVE_READ
-static void cpufreq_submit (int cpu_num, unsigned long long val)
-{
-	char buf[BUFSIZE];
-	char cpu[16];
+  values[0].gauge = value;
 
-	if (snprintf (buf, BUFSIZE, "%u:%llu", (unsigned int) curtime, val) >= BUFSIZE)
-		return;
-        snprintf (cpu, 16, "%i", cpu_num);
+  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);
 
-	plugin_submit (MODULE_NAME, cpu, buf);
+  plugin_dispatch_values(&vl);
 }
 
-static void cpufreq_read (void)
-{
-#ifdef KERNEL_LINUX
-        int status;
-	unsigned long long val;
-	int i = 0;
-	FILE *fp;
-	char filename[BUFSIZE];
-	char buffer[16];
-
-	for (i = 0; i < num_cpu; i++)
-	{
-		status = snprintf (filename, BUFSIZE, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_cur_freq", i);
-    		if (status < 1 || status >= BUFSIZE)
-			return;
-
-		if ((fp = fopen (filename, "r")) == NULL)
-		{
-			syslog (LOG_WARNING, "cpufreq: fopen: %s", strerror (errno));
-			return;
-		}
-
-		if (fgets (buffer, 16, fp) == NULL)
-		{
-			syslog (LOG_WARNING, "cpufreq: fgets: %s", strerror (errno));
-			fclose (fp);
-			return;
-		}
-
-		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);
-	}
-#endif /* defined(KERNEL_LINUX) */
-
-	return;
+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);
+} /* int cpufreq_read */
+
+void module_register(void) {
+  plugin_register_init("cpufreq", cpufreq_init);
+  plugin_register_read("cpufreq", cpufreq_read);
 }
-#else
-#define cpufreq_read NULL
-#endif
-#undef BUFSIZE
-
-void module_register (void)
-{
-	plugin_register (MODULE_NAME, cpufreq_init, cpufreq_read, cpufreq_write);
-}
-
-#undef MODULE_NAME