merged cpu and mem sensors code

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index a8e3f61..267aa43 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -39,6 +39,7 @@
 #include "lmsensor.h"
 #include "notify_cmd.h"
 #include <pmutex.h>
+#include <pudisks2.h>
 #include "slog.h"
 #include "ui_pref.h"
 #include "ui_graph.h"
@@ -67,7 +68,7 @@
 #endif
 
 #ifdef HAVE_GTOP
-#include "cpu.h"
+#include <pgtop2.h>
 #endif
 
 static const char *program_name;
@@ -165,6 +166,12 @@ static void *update_measures(void *data)
 #ifdef HAVE_LIBATIADL
                amd_psensor_list_update(sensors);
 #endif
+#ifdef HAVE_LIBUDISKS2
+               udisks2_psensor_list_update(sensors);
+#endif
+#ifdef HAVE_GTOP
+               gtop2_psensor_list_update(sensors);
+#endif
 
                psensor_log_measures(sensors);
 
@@ -453,14 +460,22 @@ static struct psensor **create_sensors_list(const char *url,
 #endif
        } else {
                sensors = get_all_sensors(use_libatasmart, 600);
+
 #ifdef HAVE_NVIDIA
-               sensors = nvidia_psensor_list_add(sensors, 600);
+               if (config_is_nvctrl_enabled())
+                       sensors = nvidia_psensor_list_add(sensors, 600);
 #endif
 #ifdef HAVE_LIBATIADL
-               sensors = amd_psensor_list_add(sensors, 600);
+               if (config_is_atiadlsdk_enabled())
+                       sensors = amd_psensor_list_add(sensors, 600);
 #endif
 #ifdef HAVE_GTOP
-               sensors = cpu_psensor_list_add(sensors, 600);
+               if (config_is_gtop2_enabled())
+                       gtop2_psensor_list_append(&sensors, 600);
+#endif
+#ifdef HAVE_LIBUDISKS2
+               if (config_is_udisks2_enabled())
+                       udisks2_psensor_list_append(&sensors, 600);
 #endif
        }