amd.h\
bool.h\
color.h color.c\
- cpu.h\
hdd.h hdd_hddtemp.c\
lmsensor.h lmsensor.c\
measure.h measure.c \
endif
if GTOP
-libpsensor_a_SOURCES += cpu.c pmem.c pmem.h
+libpsensor_a_SOURCES += pgtop2.c pgtop2.h
LIBS += $(GTOP_LIBS)
AM_CPPFLAGS += $(GTOP_CFLAGS)
endif
EXTRA_DIST=$(libpsensor_a_SOURCES) \
amd.c \
- cpu.c \
+ pgtop2.c pgtop2.h \
nvidia.c \
- pmem.c pmem.h \
pudisks2.c pudisks2.h
@LIBATIADL_TRUE@am__append_5 = $(LIBATIADL_LIBS)
@LIBATIADL_TRUE@am__append_6 = $(LIBATIADL_CFLAGS)
@LIBATIADL_TRUE@am__append_7 = amd.c
-@GTOP_TRUE@am__append_8 = cpu.c pmem.c pmem.h
+@GTOP_TRUE@am__append_8 = pgtop2.c pgtop2.h
@GTOP_TRUE@am__append_9 = $(GTOP_LIBS)
@GTOP_TRUE@am__append_10 = $(GTOP_CFLAGS)
@JSON_TRUE@am__append_11 = psensor_json.h psensor_json.c
am__v_AR_1 =
libpsensor_a_AR = $(AR) $(ARFLAGS)
libpsensor_a_LIBADD =
-am__libpsensor_a_SOURCES_DIST = amd.h bool.h color.h color.c cpu.h \
- hdd.h hdd_hddtemp.c lmsensor.h lmsensor.c measure.h measure.c \
+am__libpsensor_a_SOURCES_DIST = amd.h bool.h color.h color.c hdd.h \
+ hdd_hddtemp.c lmsensor.h lmsensor.c measure.h measure.c \
nvidia.h plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c \
ptime.h ptime.c pio.h pio.c slog.c slog.h temperature.c \
- temperature.h url.c url.h hdd_atasmart.c nvidia.c amd.c cpu.c \
- pmem.c pmem.h psensor_json.h psensor_json.c pudisks2.c \
+ temperature.h url.c url.h hdd_atasmart.c nvidia.c amd.c \
+ pgtop2.c pgtop2.h psensor_json.h psensor_json.c pudisks2.c \
pudisks2.h
@ATASMART_TRUE@am__objects_1 = hdd_atasmart.$(OBJEXT)
@NVIDIA_TRUE@am__objects_2 = nvidia.$(OBJEXT)
@LIBATIADL_TRUE@am__objects_3 = amd.$(OBJEXT)
-@GTOP_TRUE@am__objects_4 = cpu.$(OBJEXT) pmem.$(OBJEXT)
+@GTOP_TRUE@am__objects_4 = pgtop2.$(OBJEXT)
@JSON_TRUE@am__objects_5 = psensor_json.$(OBJEXT)
@LIBUDISKS2_TRUE@am__objects_6 = pudisks2.$(OBJEXT)
am_libpsensor_a_OBJECTS = color.$(OBJEXT) hdd_hddtemp.$(OBJEXT) \
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libpsensor.a
-libpsensor_a_SOURCES = amd.h bool.h color.h color.c cpu.h hdd.h \
+libpsensor_a_SOURCES = amd.h bool.h color.h color.c hdd.h \
hdd_hddtemp.c lmsensor.h lmsensor.c measure.h measure.c \
nvidia.h plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c \
ptime.h ptime.c pio.h pio.c slog.c slog.h temperature.c \
$(am__append_10) $(am__append_13) $(am__append_16)
EXTRA_DIST = $(libpsensor_a_SOURCES) \
amd.c \
- cpu.c \
+ pgtop2.c pgtop2.h \
nvidia.c \
- pmem.c pmem.h \
pudisks2.c pudisks2.h
all: all-am
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdd_atasmart.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdd_hddtemp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmsensor.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/measure.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nvidia.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgtop2.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pio.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmem.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmutex.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor_json.Po@am__quote@
+++ /dev/null
-/*
- * 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++;
- }
-}
+++ /dev/null
-/*
- * 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
- */
-#ifndef _PSENSOR_CPU_H_
-#define _PSENSOR_CPU_H_
-
-#include "psensor.h"
-
-struct psensor *create_cpu_usage_sensor(int measures_len);
-
-void cpu_usage_sensor_update(struct psensor *);
-void cpu_psensor_list_update(struct psensor **);
-
-void cpu_psensor_list_append(struct psensor ***sensors, int values_max_len);
-
-#endif
--- /dev/null
+/*
+ * 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 <glibtop/mem.h>
+
+#include <pgtop2.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;
+}
+
+static struct psensor *create_mem_free_sensor(int measures_len)
+{
+ char *id;
+ int type;
+
+ id = g_strdup_printf("%s mem free", PROVIDER_NAME);
+ type = SENSOR_TYPE_GTOP | SENSOR_TYPE_MEMORY | SENSOR_TYPE_PERCENT;
+
+ return psensor_create(id,
+ strdup(_("free memory")),
+ strdup(_("memory")),
+ type,
+ measures_len);
+}
+
+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;
+}
+
+static double get_mem_free()
+{
+ glibtop_mem mem;
+ double v;
+
+ glibtop_get_mem(&mem);
+ v = ((double)mem.free) * 100.0 / mem.total;
+
+ return v;
+}
+
+void gtop2_psensor_list_append(struct psensor ***sensors, int measures_len)
+{
+ psensor_list_append(sensors, create_cpu_usage_sensor(measures_len));
+ psensor_list_append(sensors, create_mem_free_sensor(measures_len));
+}
+
+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 mem_free_sensor_update(struct psensor *s)
+{
+ double v;
+
+ v = get_mem_free();
+
+ if (v != UNKNOWN_DBL_VALUE)
+ psensor_set_current_value(s, v);
+}
+
+void gtop2_psensor_list_update(struct psensor **sensors)
+{
+ struct psensor *s;
+
+ while (*sensors) {
+ s = *sensors;
+
+ if (s->type & SENSOR_TYPE_GTOP) {
+ if (s->type & SENSOR_TYPE_CPU)
+ cpu_usage_sensor_update(s);
+ else if (s->type & SENSOR_TYPE_MEMORY)
+ mem_free_sensor_update(s);
+ }
+
+ sensors++;
+ }
+}
--- /dev/null
+/*
+ * 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
+ */
+#ifndef _PSENSOR_PGTOP2_H_
+#define _PSENSOR_PGTOP2_H_
+
+#include <psensor.h>
+
+struct psensor *create_cpu_usage_sensor(int measures_len);
+void cpu_usage_sensor_update(struct psensor *);
+
+void gtop2_psensor_list_update(struct psensor **);
+
+void gtop2_psensor_list_append(struct psensor ***sensors, int values_max_len);
+
+#endif
+++ /dev/null
-/*
- * 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 <glibtop/mem.h>
-
-#include <pmem.h>
-
-static const char *ID_MEM_FREE = "sys memory free";
-
-void mem_psensor_list_update(struct psensor **sensors)
-{
- struct psensor *s;
- glibtop_mem mem;
- double v;
-
- while (*sensors) {
- s = *sensors;
-
- if (!strcmp(s->id, ID_MEM_FREE)) {
- glibtop_get_mem(&mem);
- v = mem.free * 100 / mem.total;
-
- psensor_set_current_value(s, v);
- }
-
- sensors++;
- }
-}
-
-void mem_psensor_list_add(struct psensor ***sensors, int values_max_len)
-{
- struct psensor *s;
-
- s = psensor_create(strdup(ID_MEM_FREE),
- strdup(_("free memory")),
- strdup(_("memory")),
- SENSOR_TYPE_MEMORY | SENSOR_TYPE_PERCENT,
- values_max_len);
-
- psensor_list_append(sensors, s);
-}
+++ /dev/null
-/*
- * 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
- */
-#ifndef _PSENSOR_MEM_H_
-#define _PSENSOR_MEM_H_
-
-#include <psensor.h>
-
-void mem_psensor_list_add(struct psensor ***, int values_max_len);
-void mem_psensor_list_update(struct psensor **);
-
-#endif
#include <lmsensor.h>
#include <temperature.h>
-#ifdef HAVE_GTOP
-#include <cpu.h>
-#include <pmem.h>
-#endif
-
struct psensor *psensor_create(char *id,
char *name,
char *chip,
}
#endif
-#ifdef HAVE_GTOP
- mem_psensor_list_add(&psensors, values_max_length);
-#endif
-
if (!psensors) { /* there is no detected sensors */
psensors = malloc(sizeof(struct psensor *));
*psensors = NULL;
{
lmsensor_psensor_list_update(sensors);
-#ifdef HAVE_GTOP
- cpu_psensor_list_update(sensors);
- mem_psensor_list_update(sensors);
-#endif
-
if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDDTEMP))
hddtemp_psensor_list_update(sensors);
#endif
#ifdef HAVE_GTOP
-#include "cpu.h"
+#include <pgtop2.h>
#endif
static const char *program_name;
#ifdef HAVE_LIBUDISKS2
udisks2_psensor_list_update(sensors);
#endif
+#ifdef HAVE_GTOP
+ gtop2_psensor_list_update(sensors);
+#endif
psensor_log_measures(sensors);
#endif
#ifdef HAVE_GTOP
if (config_is_gtop2_enabled())
- cpu_psensor_list_append(&sensors, 600);
+ gtop2_psensor_list_append(&sensors, 600);
#endif
#ifdef HAVE_LIBUDISKS2
if (config_is_udisks2_enabled())
#ifdef HAVE_GTOP
#include "sysinfo.h"
-#include "cpu.h"
+#include <pgtop2.h>
#endif
#include <plog.h>
projects / psensor.git / commitdiff