added support of cpu usage monitoring

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 933784a..5ee6c96 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -27,9 +27,6 @@
 
 #include <gtk/gtk.h>
 
-#include <sensors/sensors.h>
-#include <sensors/error.h>
-
 #include "config.h"
 
 #include "cfg.h"
@@ -50,6 +47,10 @@
 #include "nvidia.h"
 #endif
 
+#ifdef HAVE_LIBATIADL
+#include "amd.h"
+#endif
+
 #ifdef HAVE_REMOTE_SUPPORT
 #include "rsensor.h"
 #endif
@@ -62,6 +63,10 @@
 #include "ui_notify.h"
 #endif
 
+#ifdef HAVE_GTOP
+#include "cpu.h"
+#endif
+
 #include "compat.h"
 
 static const char *program_name;
@@ -144,7 +149,9 @@ void update_psensor_measures(struct ui_psensor *ui)
 #ifdef HAVE_NVIDIA
                nvidia_psensor_list_update(sensors);
 #endif
-
+#ifdef HAVE_LIBATIADL
+               amd_psensor_list_update(sensors);
+#endif
                g_mutex_unlock(ui->sensors_mutex);
 
                sleep(cfg->sensor_update_interval);
@@ -287,7 +294,7 @@ int main(int argc, char **argv)
        struct ui_psensor ui;
        GError *error;
        GThread *thread;
-       int err, optc;
+       int optc;
        char *url = NULL;
        int cmdok = 1;
 
@@ -341,12 +348,7 @@ int main(int argc, char **argv)
 
        ui.config = config_load();
 
-       err = lmsensor_init();
-       if (!err) {
-               fprintf(stderr, _("ERROR: lmsensor init failure: %s\n"),
-                       sensors_strerror(err));
-               exit(EXIT_FAILURE);
-       }
+       psensor_init();
 
        if (url) {
 #ifdef HAVE_REMOTE_SUPPORT
@@ -358,16 +360,15 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
 #endif
        } else {
-#ifdef HAVE_NVIDIA
-               struct psensor **tmp;
-
-               tmp = get_all_sensors(600);
-               ui.sensors = nvidia_psensor_list_add(tmp, 600);
-
-               if (tmp != ui.sensors)
-                       free(tmp);
-#else
                ui.sensors = get_all_sensors(600);
+#ifdef HAVE_NVIDIA
+               ui.sensors = nvidia_psensor_list_add(ui.sensors, 600);
+#endif
+#ifdef HAVE_LIBATIADL
+               ui.sensors = amd_psensor_list_add(ui.sensors, 600);
+#endif
+#ifdef HAVE_GTOP
+               ui.sensors = cpu_psensor_list_add(ui.sensors, 600);
 #endif
        }
 
@@ -404,9 +405,15 @@ int main(int argc, char **argv)
        /* main loop */
        gtk_main();
 
-       sensors_cleanup();
+       psensor_cleanup();
 
        psensor_list_free(ui.sensors);
 
+#ifdef HAVE_NVIDIA
+       nvidia_cleanup();
+#endif
+#ifdef HAVE_LIBATIADL
+       amd_cleanup();
+#endif
        return 0;
 }