cleanup

[psensor.git] / src / lib / cpu.c

diff --git a/src/lib/cpu.c b/src/lib/cpu.c
index 4ec77ea..df6b963 100644 (file)
--- a/src/lib/cpu.c
+++ b/src/lib/cpu.c
@@ -1,22 +1,21 @@
 /*
-    Copyright (C) 2010-2011 jeanfi@gmail.com
-
-    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 Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
-
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
+ *
+ * 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 Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 #include <locale.h>
 #include <libintl.h>
 #define _(str) gettext(str)
@@ -27,7 +26,6 @@
 
 #include "cpu.h"
 
-static glibtop_cpu *cpu;
 static float last_used;
 static float last_total;
 
@@ -40,9 +38,13 @@ struct psensor *create_cpu_usage_sensor(int measures_len)
 
        id = strdup("cpu usage");
        label = strdup("cpu usage");
-       type = SENSOR_TYPE_CPU_USAGE;
+       type = SENSOR_TYPE_GTOP | SENSOR_TYPE_CPU_USAGE;
 
-       psensor = psensor_create(id, label, type, measures_len);
+       psensor = psensor_create(id,
+                                label,
+                                strdup(_("CPU")),
+                                type,
+                                measures_len);
 
        return psensor;
 }
@@ -59,24 +61,22 @@ cpu_psensor_list_add(struct psensor **sensors, int measures_len)
 
 static double get_usage()
 {
+       glibtop_cpu cpu;
        unsigned long int used = 0;
        unsigned long int dt;
        double cpu_rate = UNKNOWN_DBL_VALUE;
 
-       if (!cpu)
-               cpu = malloc(sizeof(glibtop_cpu));
-
-       glibtop_get_cpu(cpu);
+       glibtop_get_cpu(&cpu);
 
-       used = cpu->user + cpu->nice + cpu->sys;
+       used = cpu.user + cpu.nice + cpu.sys;
 
-       dt = cpu->total - last_total;
+       dt = cpu.total - last_total;
 
        if (dt)
                cpu_rate = 100 * (used - last_used) / dt;
 
        last_used = used;
-       last_total = cpu->total;
+       last_total = cpu.total;
 
        return cpu_rate;
 }
@@ -88,21 +88,15 @@ void cpu_usage_sensor_update(struct psensor *s)
 
 void cpu_psensor_list_update(struct psensor **sensors)
 {
-       struct psensor **ss, *s;
+       struct psensor *s;
 
-       ss = sensors;
-       while (*ss) {
-               s = *ss;
+       while (*sensors) {
+               s = *sensors;
 
-               if (s->type == SENSOR_TYPE_CPU_USAGE)
+               if (s->type & SENSOR_TYPE_GTOP
+                   && s->type & SENSOR_TYPE_CPU_USAGE)
                        cpu_usage_sensor_update(s);
 
-               ss++;
+               sensors++;
        }
 }
-
-void cpu_cleanup()
-{
-       if (cpu)
-               free(cpu);
-}