X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Fmain.c;h=784048536c9ef09689be9477c5fa28d81454ef9e;hp=fb534d82cce211f902e723e8e85ba32afb39ff5d;hb=c3abbf72410200f22ee7a3b11bb17ae1836bf2b8;hpb=f055e7507526592d3a74c652f5f053701614c9c0 diff --git a/src/main.c b/src/main.c index fb534d8..7840485 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 @@ -31,12 +31,17 @@ #include "config.h" #include "cfg.h" +#include #include "psensor.h" #include "graph.h" #include "ui.h" #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" @@ -64,11 +69,9 @@ #endif #ifdef HAVE_GTOP -#include "cpu.h" +#include #endif -#include "compat.h" - static const char *program_name; static void print_version() @@ -77,17 +80,17 @@ static void print_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 " + "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 +100,11 @@ 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(_( +" -n, --new-instance force the creation of a new Psensor application")); puts(""); puts(_(" -d, --debug=LEVEL " @@ -113,52 +118,43 @@ 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(void *data) { - 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; + 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); + lmsensor_psensor_list_update(sensors); #ifdef HAVE_REMOTE_SUPPORT remote_psensor_list_update(sensors); #endif @@ -168,12 +164,25 @@ 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 +#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); - log_measures(sensors); + period = cfg->sensor_update_interval; - g_mutex_unlock(ui->sensors_mutex); + pmutex_unlock(&ui->sensors_mutex); - sleep(cfg->sensor_update_interval); + sleep(period); } } @@ -211,18 +220,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 (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) { @@ -230,7 +240,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, @@ -239,46 +249,61 @@ 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) { - /* 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 */ - - {0x7fff, 0x7fff, 0x7fff}, /* grey */ - {0x7fff, 0x0000, 0x0000}, /* dark red */ - {0x0000, 0x0000, 0x7fff}, /* dark blue */ - {0x0000, 0x7fff, 0x0000} /* dark green */ + GdkRGBA rgba; + /* copied from the default colors of the gtk color color + * chooser. */ + const char *default_colors[27] = { + "#ef2929", /* Scarlet Red */ + "#fcaf3e", /* Orange */ + "#fce94f", /* Butter */ + "#8ae234", /* Chameleon */ + "#729fcf", /* Sky Blue */ + "#ad7fa8", /* Plum */ + "#e9b96e", /* Chocolate */ + "#888a85", /* Aluminum 1 */ + "#eeeeec", /* Aluminum 2 */ + "#cc0000", + "#f57900", + "#edd400", + "#73d216", + "#3465a4", + "#75507b", + "#c17d11", + "#555753", + "#d3d7cf", + "#a40000", + "#ce5c00", + "#c4a000", + "#4e9a06", + "#204a87", + "#5c3566", + "#8f5902", + "#2e3436", + "#babdb6" }; + int i; + struct psensor **cur; + struct color c; - struct psensor **sensor_cur = sensors; - int i = 0; - while (*sensor_cur) { - struct color default_color; - color_set(&default_color, - 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); + for (cur = sensors, i = 0; *cur; cur++, i++) { + gdk_rgba_parse(&rgba, default_colors[i % 27]); + c.red = rgba.red; + c.green = rgba.green; + c.blue = rgba.blue; - sensor_cur++; - i++; + (*cur)->color = config_get_sensor_color((*cur)->id, &c); } } @@ -286,21 +311,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++; } @@ -309,16 +333,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++; } @@ -326,23 +355,19 @@ static void associate_preferences(struct psensor **sensors) static void log_init() { - char *home, *path, *dir; + const char *dir; + char *path; - home = getenv("HOME"); + dir = get_psensor_user_dir(); - if (!home) - return ; - - 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); } @@ -351,6 +376,7 @@ static struct option long_options[] = { {"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 +415,111 @@ 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) +{ + pmutex_lock(&ui->sensors_mutex); + + log_debug("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. + */ +static struct psensor **create_sensors_list(const char *url) +{ + 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 = 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 + if (config_is_nvctrl_enabled()) + nvidia_psensor_list_append(&sensors, 600); +#endif +#ifdef HAVE_LIBATIADL + if (config_is_atiadlsdk_enabled()) + amd_psensor_list_append(&sensors, 600); +#endif +#ifdef HAVE_GTOP + 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 + } + + 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; + pthread_t thread; + int optc, cmdok, opti, new_instance, ret; char *url = NULL; + GApplication *app; program_name = argv[0]; @@ -406,9 +530,11 @@ int main(int argc, char **argv) textdomain(PACKAGE); #endif + 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 'u': if (optarg) @@ -422,7 +548,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 +567,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)) /* @@ -448,63 +589,46 @@ int main(int argc, char **argv) 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 gtk_init(NULL, NULL); - ui.sensors_mutex = g_mutex_new(); - - 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); 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); + ui_enable_alpha_channel(&ui); - /* sensor list */ - ui_sensorlist_create(&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; @@ -514,47 +638,32 @@ int main(int argc, char **argv) ui_appindicator_init(&ui); #endif + gdk_notify_startup_complete(); + /* - * 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); + * 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); - gdk_notify_startup_complete(); + 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; }