X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Fmain.c;h=89a217780d3977904e7c905bd0bf95e01ca19f49;hp=fb534d82cce211f902e723e8e85ba32afb39ff5d;hb=a7fffa1286f846beec472a1d011e615d2e99419f;hpb=f055e7507526592d3a74c652f5f053701614c9c0

diff --git a/src/main.c b/src/main.c
index fb534d8..89a2177 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * 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
@@ -37,6 +37,8 @@
 #include "ui_sensorlist.h"
 #include "ui_color.h"
 #include "lmsensor.h"
+#include "notify_cmd.h"
+#include "slog.h"
 #include "ui_pref.h"
 #include "ui_graph.h"
 #include "ui_status.h"
@@ -67,8 +69,6 @@
 #include "cpu.h"
 #endif
 
-#include "compat.h"
-
 static const char *program_name;
 
 static void print_version()
@@ -80,14 +80,14 @@ static void print_version()
 		 "This is free software: you are free to change and "
 		 " redistribute it.\n"
 		 "There is NO WARRANTY, to the extent permitted by law.\n"),
-	       "2010-2012");
+	       "2010-2014");
 }
 
 static void print_help()
 {
 	printf(_("Usage: %s [OPTION]...\n"), program_name);
 
-	puts(_("psensor is a GTK application for monitoring hardware sensors, "
+	puts(_("Psensor is a GTK+ application for monitoring hardware sensors, "
 	       "including temperatures and fan speeds."));
 
 	puts("");
@@ -97,9 +97,14 @@ static void print_help()
 
 	puts("");
 
-	puts(_("  -u, --url=URL       "
-	       "the URL of the psensor-server, example: http://hostname:3131"));
-
+	puts(_(
+"  -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("");
 
 	puts(_("  -d, --debug=LEVEL   "
@@ -113,50 +118,39 @@ static void print_help()
 }
 
 /*
-  Updates the size of the sensor values if different than the
-  configuration.
+ * Updates the size of the sensor values if different than the
+ * configuration.
  */
-void
+static void
 update_psensor_values_size(struct psensor **sensors, struct config *cfg)
 {
-	struct psensor **cur;
+	struct psensor **cur, *s;
 
-	cur = sensors;
-	while (*cur) {
-		struct psensor *s = *cur;
+	for (cur = sensors; *cur; cur++) {
+		s = *cur;
 
 		if (s->values_max_length != cfg->sensor_values_max_length)
 			psensor_values_resize(s,
 					      cfg->sensor_values_max_length);
-
-		cur++;
 	}
 }
 
-static void log_measures(struct psensor **sensors)
+static void update_measures(struct ui_psensor *ui)
 {
-	if (log_level == LOG_DEBUG)
-		while (*sensors) {
-			log_debug("Measure: %s %.2f",
-				   (*sensors)->name,
-				   psensor_get_current_value(*sensors));
-
-			sensors++;
-		}
-}
+	struct psensor **sensors;
+	struct config *cfg;
+	int period;
 
-void update_psensor_measures(struct ui_psensor *ui)
-{
-	struct psensor **sensors = ui->sensors;
-	struct config *cfg = ui->config;
+	cfg = ui->config;
 
 	while (1) {
-		g_mutex_lock(ui->sensors_mutex);
+		pthread_mutex_lock(&ui->sensors_mutex);
 
+		sensors = ui->sensors;
 		if (!sensors)
 			return;
 
-		update_psensor_values_size(sensors, ui->config);
+		update_psensor_values_size(sensors, cfg);
 
 		psensor_list_update_measures(sensors);
 #ifdef HAVE_REMOTE_SUPPORT
@@ -169,11 +163,13 @@ void update_psensor_measures(struct ui_psensor *ui)
 		amd_psensor_list_update(sensors);
 #endif
 
-		log_measures(sensors);
+		psensor_log_measures(sensors);
 
-		g_mutex_unlock(ui->sensors_mutex);
+		period = cfg->sensor_update_interval;
 
-		sleep(cfg->sensor_update_interval);
+		pthread_mutex_unlock(&ui->sensors_mutex);
+
+		sleep(period);
 	}
 }
 
@@ -211,18 +207,19 @@ gboolean ui_refresh_thread(gpointer data)
 	ret = TRUE;
 	cfg = ui->config;
 
-	g_mutex_lock(ui->sensors_mutex);
+	pthread_mutex_lock(&ui->sensors_mutex);
 
-	graph_update(ui->sensors, ui->w_graph, ui->config);
+	graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window);
 
-	ui_sensorlist_update(ui);
+	ui_sensorlist_update(ui, 0);
 
 	if (is_appindicator_supported() || is_status_supported())
 		indicators_update(ui);
 
 #ifdef HAVE_UNITY
 	ui_unity_launcher_entry_update(ui->sensors,
-				       !cfg->unity_launcher_count_disabled);
+				       !cfg->unity_launcher_count_disabled,
+				       cfg->temperature_unit == CELCIUS);
 #endif
 
 	if (ui->graph_update_interval != cfg->graph_update_interval) {
@@ -230,7 +227,7 @@ gboolean ui_refresh_thread(gpointer data)
 		ret = FALSE;
 	}
 
-	g_mutex_unlock(ui->sensors_mutex);
+	pthread_mutex_unlock(&ui->sensors_mutex);
 
 	if (ret == FALSE)
 		g_timeout_add(1000 * ui->graph_update_interval,
@@ -239,12 +236,14 @@ gboolean ui_refresh_thread(gpointer data)
 	return ret;
 }
 
-void cb_alarm_raised(struct psensor *sensor, void *data)
+static void cb_alarm_raised(struct psensor *sensor, void *data)
 {
 #ifdef HAVE_LIBNOTIFY
-	if (sensor->enabled)
+	if (sensor->alarm_enabled)
 		ui_notify(sensor, (struct ui_psensor *)data);
 #endif
+
+	notify_cmd(sensor);
 }
 
 static void associate_colors(struct psensor **sensors)
@@ -255,7 +254,7 @@ static void associate_colors(struct psensor **sensors)
 	unsigned int colors[COLORS_COUNT][3] = {
 		{0x0000, 0x0000, 0x0000},	/* black */
 		{0xffff, 0x0000, 0x0000},	/* red */
-		{0x0000, 0.0000, 0xffff},	/* blue */
+		{0x0000, 0x0000, 0xffff},	/* blue */
 		{0x0000, 0xffff, 0x0000},	/* green */
 
 		{0x7fff, 0x7fff, 0x7fff},	/* grey */
@@ -263,22 +262,17 @@ static void associate_colors(struct psensor **sensors)
 		{0x0000, 0x0000, 0x7fff},	/* dark blue */
 		{0x0000, 0x7fff, 0x0000}	/* dark green */
 	};
+	struct psensor **cur;
+	int i;
+	struct color c;
 
-	struct psensor **sensor_cur = sensors;
-	int i = 0;
-	while (*sensor_cur) {
-		struct color default_color;
-		color_set(&default_color,
+	for (cur = sensors, i = 0; *cur; cur++) {
+		color_set(&c,
 			  colors[i % COLORS_COUNT][0],
 			  colors[i % COLORS_COUNT][1],
 			  colors[i % COLORS_COUNT][2]);
 
-		(*sensor_cur)->color
-		    = config_get_sensor_color((*sensor_cur)->id,
-					      &default_color);
-
-		sensor_cur++;
-		i++;
+		(*cur)->color = config_get_sensor_color((*cur)->id, &c);
 	}
 }
 
@@ -292,13 +286,16 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 		s->cb_alarm_raised = cb_alarm_raised;
 		s->cb_alarm_raised_data = ui;
 
-		if (is_temp_type(s->type)) {
-			s->alarm_limit
-			    = config_get_sensor_alarm_limit(s->id, 60);
+		s->alarm_high_threshold
+			= config_get_sensor_alarm_high_threshold(s->id);
+		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
 			    = config_get_sensor_alarm_enabled(s->id);
 		} else {
-			s->alarm_limit = 0;
+			s->alarm_high_threshold = 0;
 			s->alarm_enabled = 0;
 		}
 
@@ -313,12 +310,16 @@ static void associate_preferences(struct psensor **sensors)
 		char *n;
 		struct psensor *s = *sensor_cur;
 
-		s->enabled = config_is_sensor_enabled(s->id);
+		s->graph_enabled = config_is_sensor_enabled(s->id);
 
 		n = config_get_sensor_name(s->id);
 
-		if (n)
+		if (n) {
+			free(s->name);
 			s->name = n;
+		}
+
+		s->appindicator_enabled = config_is_appindicator_enabled(s->id);
 
 		sensor_cur++;
 	}
@@ -347,10 +348,12 @@ 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'},
 	{"debug", required_argument, 0, 'd'},
+	{"new-instance", no_argument, 0, 'n'},
 	{0, 0, 0, 0}
 };
 
@@ -389,13 +392,96 @@ static void log_glib_info()
 		  glib_micro_version);
 }
 
+static void cb_activate(GApplication *application,
+			gpointer data)
+{
+	ui_window_show((struct ui_psensor *)data);
+}
+
+/*
+ * Release memory for Valgrind.
+ */
+static void cleanup(struct ui_psensor *ui)
+{
+	pthread_mutex_lock(&ui->sensors_mutex);
+
+	log_debug("Cleanup...");
+
+	psensor_cleanup();
+
+#ifdef HAVE_NVIDIA
+	nvidia_cleanup();
+#endif
+#ifdef HAVE_LIBATIADL
+	amd_cleanup();
+#endif
+#ifdef HAVE_REMOTE_SUPPORT
+	rsensor_cleanup();
+#endif
+
+	psensor_list_free(ui->sensors);
+	ui->sensors = NULL;
+
+#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+	ui_appindicator_cleanup();
+#endif
+
+	ui_status_cleanup();
+
+	pthread_mutex_unlock(&ui->sensors_mutex);
+
+	config_cleanup();
+
+	log_debug("Cleanup done, closing log");
+}
+
+/*
+ * 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)
+{
+	struct psensor **sensors;
+
+	if (url) {
+#ifdef HAVE_REMOTE_SUPPORT
+		rsensor_init();
+		sensors = get_remote_sensors(url, 600);
+#else
+		log_err(_("Psensor has not been compiled with remote "
+			  "sensor support."));
+		exit(EXIT_FAILURE);
+#endif
+	} else {
+		sensors = get_all_sensors(use_libatasmart, 600);
+#ifdef HAVE_NVIDIA
+		sensors = nvidia_psensor_list_add(sensors, 600);
+#endif
+#ifdef HAVE_LIBATIADL
+		sensors = amd_psensor_list_add(sensors, 600);
+#endif
+#ifdef HAVE_GTOP
+		sensors = cpu_psensor_list_add(sensors, 600);
+#endif
+	}
+
+	associate_preferences(sensors);
+	associate_colors(sensors);
+
+	return sensors;
+}
+
 int main(int argc, char **argv)
 {
 	struct ui_psensor ui;
 	GError *error;
 	GThread *thread;
-	int optc, cmdok;
+	int optc, cmdok, opti, use_libatasmart, new_instance;
 	char *url = NULL;
+	GApplication *app;
 
 	program_name = argv[0];
 
@@ -406,10 +492,16 @@ int main(int argc, char **argv)
 	textdomain(PACKAGE);
 #endif
 
+	use_libatasmart = new_instance = 0;
+
 	cmdok = 1;
-	while ((optc = getopt_long(argc, argv, "vhd:u:", long_options,
-				   NULL)) != -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);
@@ -422,7 +514,10 @@ int main(int argc, char **argv)
 			exit(EXIT_SUCCESS);
 		case 'd':
 			log_level = atoi(optarg);
-			log_printf(LOG_INFO, _("Enables debug mode."));
+			log_info(_("Enables debug mode."));
+			break;
+		case 'n':
+			new_instance = 1;
 			break;
 		default:
 			cmdok = 0;
@@ -438,6 +533,18 @@ int main(int argc, char **argv)
 
 	log_init();
 
+	app = g_application_new("wpitchoune.psensor", 0);
+
+	g_application_register(app, NULL, NULL);
+
+	if (!new_instance && g_application_get_is_remote(app)) {
+		g_application_activate(app);
+		log_warn(_("A Psensor instance already exists."));
+		exit(EXIT_SUCCESS);
+	}
+
+	g_signal_connect(app, "activate", G_CALLBACK(cb_activate), &ui);
+
 	log_glib_info();
 #if !(GLIB_CHECK_VERSION(2, 31, 0))
 	/*
@@ -452,55 +559,32 @@ int main(int argc, char **argv)
 
 	gtk_init(NULL, NULL);
 
-	ui.sensors_mutex = g_mutex_new();
-
-	config_init();
+	pthread_mutex_init(&ui.sensors_mutex, NULL);
 
 	ui.config = config_load();
 
 	psensor_init();
 
-	if (url) {
-#ifdef HAVE_REMOTE_SUPPORT
-		rsensor_init();
-		ui.sensors = get_remote_sensors(url, 600);
-#else
-		fprintf(stderr,
-			_("ERROR: Not compiled with remote sensor support.\n"));
-		exit(EXIT_FAILURE);
-#endif
-	} 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
-	}
-
-	associate_preferences(ui.sensors);
-	associate_colors(ui.sensors);
+	ui.sensors = create_sensors_list(url, use_libatasmart);
 	associate_cb_alarm_raised(ui.sensors, &ui);
 
+	if (ui.config->slog_enabled)
+		slog_activate(NULL,
+			      ui.sensors,
+			      &ui.sensors_mutex,
+			      config_get_slog_interval());
+
 #if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
 	ui_status_init(&ui);
+	ui_status_set_visible(1);
 #endif
 
 	/* main window */
 	ui_window_create(&ui);
-	ui.sensor_box = NULL;
-
-	/* drawing box */
-	ui.w_graph = ui_graph_create(&ui);
 
-	/* sensor list */
-	ui_sensorlist_create(&ui);
+	ui_enable_alpha_channel(&ui);
 
-	thread = g_thread_create((GThreadFunc) update_psensor_measures,
+	thread = g_thread_create((GThreadFunc) update_measures,
 				 &ui, TRUE, &error);
 
 	if (!thread)
@@ -514,47 +598,30 @@ int main(int argc, char **argv)
 	ui_appindicator_init(&ui);
 #endif
 
-	/*
-	 * show the window as soon as all gtk events have been processed
-	 * in order to ensure that the status icon is attempted to be
-	 * drawn before. If not, there is no way to detect that it is
-	 * visible.
-	*/
-	g_idle_add((GSourceFunc)initial_window_show, &ui);
-
 	gdk_notify_startup_complete();
 
+	/*
+	 * hack, did not find a cleaner solution.
+	 * wait 30s to ensure that the status icon is attempted to be
+	 * drawn before determining whether the main window must be
+	 * show.
+	 */
+	if  (ui.config->hide_on_startup)
+		g_timeout_add(30000, (GSourceFunc)initial_window_show, &ui);
+	else
+		initial_window_show(&ui);
+
 	/* main loop */
 	gtk_main();
 
-	g_mutex_lock(ui.sensors_mutex);
-
-	psensor_cleanup();
-
-#ifdef HAVE_NVIDIA
-	nvidia_cleanup();
-#endif
-#ifdef HAVE_LIBATIADL
-	amd_cleanup();
-#endif
-#ifdef HAVE_REMOTE_SUPPORT
-	rsensor_cleanup();
-#endif
-
-	psensor_list_free(ui.sensors);
-	ui.sensors = NULL;
-
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
-	ui_appindicator_cleanup();
-#endif
-
-	ui_status_cleanup();
-
-	g_mutex_unlock(ui.sensors_mutex);
-
-	config_cleanup();
+	g_object_unref(app);
+	cleanup(&ui);
 
+	log_debug("Quitting...");
 	log_close();
 
+	if (url)
+		free(url);
+
 	return 0;
 }