merged cpu and mem sensors code

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

diff --git a/src/lib/cpu.c b/src/lib/cpu.c
deleted file mode 100644 (file)
index 975757c..0000000
--- a/src/lib/cpu.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * 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 <string.h>
-
-#include <glibtop/cpu.h>
-
-#include "cpu.h"
-
-static float last_used;
-static float last_total;
-
-static const char *PROVIDER_NAME = "gtop2";
-
-struct psensor *create_cpu_usage_sensor(int measures_len)
-{
-       char *label, *id;
-       int type;
-       struct psensor *psensor;
-
-       id = g_strdup_printf("%s cpu usage", PROVIDER_NAME);
-       label = strdup(_("CPU usage"));
-       type = SENSOR_TYPE_GTOP | SENSOR_TYPE_CPU_USAGE;
-
-       psensor = psensor_create(id,
-                                label,
-                                strdup(_("CPU")),
-                                type,
-                                measures_len);
-
-       return psensor;
-}
-
-void cpu_psensor_list_append(struct psensor ***sensors, int measures_len)
-{
-       struct psensor *s;
-
-       s = create_cpu_usage_sensor(measures_len);
-
-       psensor_list_append(sensors, s);
-}
-
-static double get_usage()
-{
-       glibtop_cpu cpu;
-       unsigned long int used, dt;
-       double cpu_rate;
-
-       glibtop_get_cpu(&cpu);
-
-       used = cpu.user + cpu.nice + cpu.sys;
-
-       dt = cpu.total - last_total;
-
-       if (dt)
-               cpu_rate = 100.0 * (used - last_used) / dt;
-       else
-               cpu_rate = UNKNOWN_DBL_VALUE;
-
-       last_used = used;
-       last_total = cpu.total;
-
-       return cpu_rate;
-}
-
-void cpu_usage_sensor_update(struct psensor *s)
-{
-       double v;
-
-       v = get_usage();
-
-       if (v != UNKNOWN_DBL_VALUE)
-               psensor_set_current_value(s, v);
-}
-
-void cpu_psensor_list_update(struct psensor **sensors)
-{
-       struct psensor *s;
-
-       while (*sensors) {
-               s = *sensors;
-
-               if (s->type & SENSOR_TYPE_GTOP
-                   && s->type & SENSOR_TYPE_CPU_USAGE)
-                       cpu_usage_sensor_update(s);
-
-               sensors++;
-       }
-}