X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=7c68b64aa8545d628837d7557ca6546cf3f715ba;hb=13ac463095f0e58190acfd777f0d4626433d72b9;hp=8c2790273c2d1590ba43dcb4b461eb7c43b4158a;hpb=7455357fec8cb68e67eca0632dc17d8fea5a145a;p=psensor.git diff --git a/src/main.c b/src/main.c index 8c27902..7c68b64 100644 --- a/src/main.c +++ b/src/main.c @@ -1,22 +1,21 @@ /* - Copyright (C) 2010-2011 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 published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - + * 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 + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ #include #include @@ -38,6 +37,10 @@ #include "ui_sensorlist.h" #include "ui_color.h" #include "lmsensor.h" +#include "notify_cmd.h" +#include +#include +#include "slog.h" #include "ui_pref.h" #include "ui_graph.h" #include "ui_status.h" @@ -68,39 +71,46 @@ #include "cpu.h" #endif -#include "compat.h" - static const char *program_name; static void print_version() { printf("psensor %s\n", VERSION); - printf(_("Copyright (C) %s jeanfi@gmail.com\n\ -License GPLv2: GNU GPL version 2 or later \ -\n\ -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-2011"); + printf(_("Copyright (C) %s jeanfi@gmail.com\n" + "License GPLv2: GNU GPL version 2 or later " + "\n" + "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-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(""); puts(_("Options:")); - puts(_("\ - -h, --help display this help and exit\n\ - -v, --version display version information and exit")); + puts(_(" -h, --help display this help and exit\n" + " -v, --version display version information and exit")); 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 " + "set the debug level, integer between 0 and 3")); puts(""); @@ -110,50 +120,41 @@ the URL of the psensor-server, example: http://hostname:3131")); } /* - 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(void *data) { - if (log_level == LOG_DEBUG) - while (*sensors) { - log_printf(LOG_DEBUG, "%s %.2f", - (*sensors)->name, - psensor_get_current_value(*sensors)); - - sensors++; - } -} + struct psensor **sensors; + struct config *cfg; + int period; + struct ui_psensor *ui; -void update_psensor_measures(struct ui_psensor *ui) -{ - struct psensor **sensors = ui->sensors; - struct config *cfg = ui->config; + ui = (struct ui_psensor *)data; + cfg = ui->config; while (1) { - g_mutex_lock(ui->sensors_mutex); + pmutex_lock(&ui->sensors_mutex); + sensors = ui->sensors; if (!sensors) - return; + pthread_exit(NULL); - update_psensor_values_size(sensors, ui->config); + update_psensor_values_size(sensors, cfg); psensor_list_update_measures(sensors); #ifdef HAVE_REMOTE_SUPPORT @@ -165,13 +166,43 @@ void update_psensor_measures(struct ui_psensor *ui) #ifdef HAVE_LIBATIADL amd_psensor_list_update(sensors); #endif +#ifdef HAVE_LIBUDISKS2 + udisks2_psensor_list_update(sensors); +#endif + + psensor_log_measures(sensors); + + period = cfg->sensor_update_interval; - log_measures(sensors); + pmutex_unlock(&ui->sensors_mutex); - g_mutex_unlock(ui->sensors_mutex); + sleep(period); + } +} + +static void indicators_update(struct ui_psensor *ui) +{ + struct psensor **sensor_cur = ui->sensors; + unsigned int attention = 0; - sleep(cfg->sensor_update_interval); + while (*sensor_cur) { + struct psensor *s = *sensor_cur; + + if (s->alarm_enabled && s->alarm_raised) { + attention = 1; + break; + } + + sensor_cur++; } + +#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) + if (is_appindicator_supported()) + ui_appindicator_update(ui, attention); +#endif + + if (is_status_supported()) + ui_status_update(ui, attention); } gboolean ui_refresh_thread(gpointer data) @@ -183,19 +214,19 @@ gboolean ui_refresh_thread(gpointer data) ret = TRUE; cfg = ui->config; - g_mutex_lock(ui->sensors_mutex); + pmutex_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 defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) - ui_appindicator_update(ui); -#endif + 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 == CELSIUS); #endif if (ui->graph_update_interval != cfg->graph_update_interval) { @@ -203,7 +234,7 @@ gboolean ui_refresh_thread(gpointer data) ret = FALSE; } - g_mutex_unlock(ui->sensors_mutex); + pmutex_unlock(&ui->sensors_mutex); if (ret == FALSE) g_timeout_add(1000 * ui->graph_update_interval, @@ -212,12 +243,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) @@ -225,33 +258,28 @@ static void associate_colors(struct psensor **sensors) /* number of uniq colors */ #define COLORS_COUNT 8 - unsigned int colors[COLORS_COUNT][3] = { - {0x0000, 0x0000, 0x0000}, /* black */ - {0xffff, 0x0000, 0x0000}, /* red */ - {0x0000, 0.0000, 0xffff}, /* blue */ - {0x0000, 0xffff, 0x0000}, /* green */ + double colors[COLORS_COUNT][3] = { + {0, 0, 0}, /* black */ + {1, 0, 0}, /* red */ + {0, 0, 1}, /* blue */ + {0, 1, 0}, /* green */ - {0x7fff, 0x7fff, 0x7fff}, /* grey */ - {0x7fff, 0x0000, 0x0000}, /* dark red */ - {0x0000, 0x0000, 0x7fff}, /* dark blue */ - {0x0000, 0x7fff, 0x0000} /* dark green */ + {0.5, 0.5, 0.5},/* grey */ + {0.5, 0, 0}, /* dark red */ + {0, 0, 0.5}, /* dark blue */ + {0, 0.5, 0} /* 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++, i++) { + 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); } } @@ -259,21 +287,20 @@ 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; 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_enabled + s->alarm_high_threshold + = config_get_sensor_alarm_high_threshold(s->id); + s->alarm_low_threshold + = config_get_sensor_alarm_low_threshold(s->id); + + s->alarm_enabled = config_get_sensor_alarm_enabled(s->id); - } else { - s->alarm_limit = 0; - s->alarm_enabled = 0; - } sensor_cur++; } @@ -282,16 +309,21 @@ 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; - s->enabled = config_is_sensor_enabled(s->id); + s->graph_enabled = config_is_sensor_graph_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++; } @@ -299,31 +331,29 @@ static void associate_preferences(struct psensor **sensors) static void log_init() { - char *home, *path, *dir; - - home = getenv("HOME"); + const char *dir; + char *path; - if (!home) - return ; + dir = get_psensor_user_dir(); - dir = malloc(strlen(home)+1+strlen(".psensor")+1); - sprintf(dir, "%s/%s", home, ".psensor"); - mkdir(dir, 0777); + if (!dir) + return; path = malloc(strlen(dir)+1+strlen("log")+1); sprintf(path, "%s/%s", dir, "log"); log_open(path); - free(dir); free(path); } 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", no_argument, 0, 'd'}, + {"debug", required_argument, 0, 'd'}, + {"new-instance", no_argument, 0, 'n'}, {0, 0, 0, 0} }; @@ -331,10 +361,14 @@ static gboolean initial_window_show(gpointer data) { struct ui_psensor *ui; + log_debug("initial_window_show()"); + ui = (struct ui_psensor *)data; - log_printf(LOG_DEBUG, - "is_status_supported: %d\n", is_status_supported()); + log_debug("is_status_supported: %d", is_status_supported()); + log_debug("is_appindicator_supported: %d", + is_appindicator_supported()); + log_debug("hide_on_startup: %d", ui->config->hide_on_startup); if (!ui->config->hide_on_startup || (!is_appindicator_supported() && !is_status_supported())) @@ -345,14 +379,116 @@ static gboolean initial_window_show(gpointer data) return FALSE; } +static void log_glib_info() +{ + log_debug("Compiled with GLib %d.%d.%d", + GLIB_MAJOR_VERSION, + GLIB_MINOR_VERSION, + GLIB_MICRO_VERSION); + + log_debug("Running with GLib %d.%d.%d", + glib_major_version, + glib_minor_version, + 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) +{ + pmutex_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(); + + pmutex_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 + if (config_is_nvctrl_enabled()) + sensors = nvidia_psensor_list_add(sensors, 600); +#endif +#ifdef HAVE_LIBATIADL + if (config_is_atiadlsdk_enabled()) + sensors = amd_psensor_list_add(sensors, 600); +#endif +#ifdef HAVE_GTOP + if (config_is_gtop2_enabled()) + cpu_psensor_list_append(&sensors, 600); +#endif +#ifdef HAVE_LIBUDISKS2 + if (config_is_udisks2_enabled()) + udisks2_psensor_list_append(&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; + pthread_t thread; + int optc, cmdok, opti, use_libatasmart, new_instance, ret; char *url = NULL; - int cmdok = 1; + GApplication *app; program_name = argv[0]; @@ -363,9 +499,16 @@ int main(int argc, char **argv) textdomain(PACKAGE); #endif - while ((optc = getopt_long(argc, argv, "vhdu:", long_options, - NULL)) != -1) { + use_libatasmart = 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); @@ -377,8 +520,11 @@ int main(int argc, char **argv) print_version(); exit(EXIT_SUCCESS); case 'd': - printf(_("Enables debug mode.\n")); - log_level = LOG_DEBUG; + log_level = atoi(optarg); + log_info(_("Enables debug mode.")); + break; + case 'n': + new_instance = 1; break; default: cmdok = 0; @@ -394,75 +540,70 @@ int main(int argc, char **argv) log_init(); - g_thread_init(NULL); - gdk_threads_init(); - /* gdk_threads_enter(); */ + app = g_application_new("wpitchoune.psensor", 0); - gtk_init(NULL, NULL); + g_application_register(app, NULL, NULL); -#ifdef HAVE_LIBNOTIFY - ui.notification_last_time = 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)) + /* + * Since GLib 2.31 g_thread_init call is deprecated and not + * needed. + */ + log_debug("Calling g_thread_init(NULL)"); + g_thread_init(NULL); +#endif + +#ifdef HAVE_APPINDICATOR_029 + /* gdk_thread_enter/leave only used to workaround mutex bug + * of appindicator < 0.2.9, so do not call gdk_threads_init + * if useless. Calling this function leads to + * crash "Attempt to unlock mutex that was not locked" with + * GLib 2.41.2 (new checking) probably due to bugs in GTK + * itself. + */ + gdk_threads_init(); #endif - ui.sensors_mutex = g_mutex_new(); + gtk_init(NULL, NULL); - config_init(); + pmutex_init(&ui.sensors_mutex); 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); - /* - * show the window as soon as all gtk event has 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); + ret = pthread_create(&thread, NULL, update_measures, &ui); - thread = g_thread_create((GThreadFunc) update_psensor_measures, - &ui, TRUE, &error); - - if (!thread) - g_error_free(error); + if (ret) + log_err(_("Failed to create thread for monitoring sensors")); ui.graph_update_interval = ui.config->graph_update_interval; @@ -474,37 +615,30 @@ int main(int argc, char **argv) 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); + + log_debug("translators: %s\n", _("translator-credits")); + /* 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; }