X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=804b8a8feb6e58c921134f33e2fffbd6a6b54115;hb=550caf1a40e8ad04a27bcbc6fbcd577b1945c1b4;hp=e9b10b2fcfb02632b95a7747acd4303f8fbadfd6;hpb=af8cae4e6ffd844fa32f28207cd1d5ce44593e4c;p=psensor.git

diff --git a/src/main.c b/src/main.c
index e9b10b2..804b8a8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,6 +31,7 @@
 #include "config.h"
 
 #include "cfg.h"
+#include <hdd.h>
 #include "psensor.h"
 #include "graph.h"
 #include "ui.h"
@@ -39,6 +40,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 +69,7 @@
 #endif
 
 #ifdef HAVE_GTOP
-#include "cpu.h"
+#include <pgtop2.h>
 #endif
 
 static const char *program_name;
@@ -102,9 +104,6 @@ static void print_help()
 "  -u, --url=URL       the URL of the psensor-server,\n"
 "                      example: http://hostname:3131"));
 	puts(_(
-"  --use-libatasmart   use atasmart library for disk monitoring instead of\n"
-"                      hddtemp daemon"));
-	puts(_(
 "  -n, --new-instance  force the creation of a new Psensor application"));
 	puts("");
 
@@ -156,6 +155,8 @@ static void *update_measures(void *data)
 		update_psensor_values_size(sensors, cfg);
 
 		psensor_list_update_measures(sensors);
+
+		lmsensor_psensor_list_update(sensors);
 #ifdef HAVE_REMOTE_SUPPORT
 		remote_psensor_list_update(sensors);
 #endif
@@ -165,6 +166,17 @@ 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
+#ifdef HAVE_ATASMART
+		atasmart_psensor_list_update(sensors);
+#endif
+
+		hddtemp_psensor_list_update(sensors);
 
 		psensor_log_measures(sensors);
 
@@ -283,6 +295,7 @@ static void
 associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 {
 	struct psensor **sensor_cur = sensors;
+
 	while (*sensor_cur) {
 		struct psensor *s = *sensor_cur;
 
@@ -294,13 +307,8 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 		s->alarm_low_threshold
 			= config_get_sensor_alarm_low_threshold(s->id);
 
-		if (is_temp_type(s->type) || is_fan_type(s->type)) {
-			s->alarm_enabled
+		s->alarm_enabled
 			    = config_get_sensor_alarm_enabled(s->id);
-		} else {
-			s->alarm_high_threshold = 0;
-			s->alarm_enabled = 0;
-		}
 
 		sensor_cur++;
 	}
@@ -309,6 +317,7 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 static void associate_preferences(struct psensor **sensors)
 {
 	struct psensor **sensor_cur = sensors;
+
 	while (*sensor_cur) {
 		char *n;
 		struct psensor *s = *sensor_cur;
@@ -336,7 +345,7 @@ static void log_init()
 	dir = get_psensor_user_dir();
 
 	if (!dir)
-		return ;
+		return;
 
 	path = malloc(strlen(dir)+1+strlen("log")+1);
 	sprintf(path, "%s/%s", dir, "log");
@@ -347,7 +356,6 @@ static void log_init()
 }
 
 static struct option long_options[] = {
-	{"use-libatasmart", no_argument, 0, 0},
 	{"version", no_argument, 0, 'v'},
 	{"help", no_argument, 0, 'h'},
 	{"url", required_argument, 0, 'u'},
@@ -438,10 +446,8 @@ static void cleanup(struct ui_psensor *ui)
  * Creates the list of sensors.
  *
  * 'url': remote psensor server url, null for local monitoring.
- * 'use_libatasmart': whether the libatasmart must be used.
  */
-static struct psensor **create_sensors_list(const char *url,
-					    unsigned int use_libatasmart)
+static struct psensor **create_sensors_list(const char *url)
 {
 	struct psensor **sensors;
 
@@ -455,15 +461,35 @@ static struct psensor **create_sensors_list(const char *url,
 		exit(EXIT_FAILURE);
 #endif
 	} else {
-		sensors = get_all_sensors(use_libatasmart, 600);
+		sensors = malloc(sizeof(struct psensor *));
+		*sensors = NULL;
+
+		if (config_is_lmsensor_enabled())
+			lmsensor_psensor_list_append(&sensors, 600);
+
+		if (config_is_hddtemp_enabled())
+			hddtemp_psensor_list_append(&sensors, 600);
+
+#ifdef HAVE_ATASMART
+		if (config_is_libatasmart_enabled())
+			atasmart_psensor_list_append(&sensors, 600);
+#endif
+
 #ifdef HAVE_NVIDIA
-		sensors = nvidia_psensor_list_add(sensors, 600);
+		if (config_is_nvctrl_enabled())
+			nvidia_psensor_list_append(&sensors, 600);
 #endif
 #ifdef HAVE_LIBATIADL
-		sensors = amd_psensor_list_add(sensors, 600);
+		if (config_is_atiadlsdk_enabled())
+			amd_psensor_list_append(&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
 	}
 
@@ -477,7 +503,7 @@ int main(int argc, char **argv)
 {
 	struct ui_psensor ui;
 	pthread_t thread;
-	int optc, cmdok, opti, use_libatasmart, new_instance, ret;
+	int optc, cmdok, opti, new_instance, ret;
 	char *url = NULL;
 	GApplication *app;
 
@@ -490,16 +516,12 @@ int main(int argc, char **argv)
 	textdomain(PACKAGE);
 #endif
 
-	use_libatasmart = new_instance = 0;
+	new_instance = 0;
 
 	cmdok = 1;
 	while ((optc = getopt_long(argc, argv, "vhd:u:n", long_options,
 				   &opti)) != -1) {
 		switch (optc) {
-		case 0:
-			if (!strcmp(long_options[opti].name, "use-libatasmart"))
-				use_libatasmart = 1;
-			break;
 		case 'u':
 			if (optarg)
 				url = strdup(optarg);
@@ -572,7 +594,7 @@ int main(int argc, char **argv)
 
 	psensor_init();
 
-	ui.sensors = create_sensors_list(url, use_libatasmart);
+	ui.sensors = create_sensors_list(url);
 	associate_cb_alarm_raised(ui.sensors, &ui);
 
 	if (ui.config->slog_enabled)
@@ -617,6 +639,8 @@ int main(int argc, char **argv)
 	else
 		initial_window_show(&ui);
 
+	log_debug("translators: %s\n", _("translator-credits"));
+
 	/* main loop */
 	gtk_main();