merged cpu and mem sensors code

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 7c68b64..267aa43 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -68,7 +68,7 @@
 #endif
 
 #ifdef HAVE_GTOP
-#include "cpu.h"
+#include <pgtop2.h>
 #endif
 
 static const char *program_name;
@@ -169,6 +169,9 @@ static void *update_measures(void *data)
 #ifdef HAVE_LIBUDISKS2
                udisks2_psensor_list_update(sensors);
 #endif
+#ifdef HAVE_GTOP
+               gtop2_psensor_list_update(sensors);
+#endif
 
                psensor_log_measures(sensors);
 
@@ -468,7 +471,7 @@ static struct psensor **create_sensors_list(const char *url,
 #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())