X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcpufreq.c;h=ba0149ad1f390298af4049690cc56c9458f4c8b7;hb=86090b3d409634d016da7bbb0cbe43ed5a851d30;hp=9d74c57680b22f423659e3d4f27b43bb45a4f251;hpb=55b439475d492599de5134536710180b39dac593;p=collectd.git

diff --git a/src/cpufreq.c b/src/cpufreq.c
index 9d74c576..ba0149ad 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,2006  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
@@ -36,7 +36,7 @@ static char *cpufreq_file = "cpufreq-%s.rrd";
 
 static char *ds_def[] =
 {
-	"DS:value:GAUGE:25:0:U",
+	"DS:value:GAUGE:"COLLECTD_HEARTBEAT":0:U",
 	NULL
 };
 static int ds_num = 1;
@@ -57,7 +57,7 @@ static void cpufreq_init (void)
 
 	while (1)
 	{
-		status = snprintf (filename, BUFSIZE, "/sys/devices/system/cpu/cpu%d/cpufreq/cpuinfo_cur_freq", num_cpu);
+		status = snprintf (filename, BUFSIZE, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_cur_freq", num_cpu);
     		if (status < 1 || status >= BUFSIZE)
 			break;
 
@@ -110,7 +110,7 @@ static void cpufreq_read (void)
 
 	for (i = 0; i < num_cpu; i++)
 	{
-		status = snprintf (filename, BUFSIZE, "/sys/devices/system/cpu/cpu%d/cpufreq/cpuinfo_cur_freq", i);
+		status = snprintf (filename, BUFSIZE, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_cur_freq", i);
     		if (status < 1 || status >= BUFSIZE)
 			return;
 
@@ -123,6 +123,7 @@ static void cpufreq_read (void)
 		if (fgets (buffer, 16, fp) == NULL)
 		{
 			syslog (LOG_WARNING, "cpufreq: fgets: %s", strerror (errno));
+			fclose (fp);
 			return;
 		}