/*
- 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)
#include "cpu.h"
-static glibtop_cpu *cpu;
static float last_used;
static float last_total;
-static struct psensor *create_sensor(int measures_len)
+struct psensor *create_cpu_usage_sensor(int measures_len)
{
char *label;
int type;
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;
}
{
struct psensor *s;
- s = create_sensor(measures_len);
+ s = create_cpu_usage_sensor(measures_len);
return psensor_list_add(sensors, s);
}
static double get_usage()
{
- unsigned long int used = 0;
+ glibtop_cpu cpu;
+ unsigned long int used;
unsigned long int dt;
- double cpu_rate = UNKNOWN_DBL_VALUE;
-
- if (!cpu)
- cpu = malloc(sizeof(glibtop_cpu));
+ double cpu_rate;
- 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;
+ else
+ cpu_rate = UNKNOWN_DBL_VALUE;
last_used = used;
- last_total = cpu->total;
+ last_total = cpu.total;
return cpu_rate;
}
+void cpu_usage_sensor_update(struct psensor *s)
+{
+ psensor_set_current_value(s, get_usage());
+}
+
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)
- psensor_set_current_value(s, get_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);
-}