X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=f3a0ae08ff1722b22960ce662306f1c5d1e04ad8;hb=9d77e6ab0ca102b9d42072df4fd9d2378897a5ca;hp=db4353d53f70310395f322d51f925198f92868fc;hpb=06cdff9b631cde561591aaf225bc03e2e19a4db7;p=psensor.git diff --git a/src/main.c b/src/main.c index db4353d..f3a0ae0 100644 --- a/src/main.c +++ b/src/main.c @@ -31,6 +31,7 @@ #include "config.h" #include "cfg.h" +#include #include "psensor.h" #include "graph.h" #include "ui.h" @@ -39,9 +40,11 @@ #include "lmsensor.h" #include "notify_cmd.h" #include +#include #include "slog.h" #include "ui_pref.h" #include "ui_graph.h" +#include #include "ui_status.h" #ifdef HAVE_UNITY @@ -62,17 +65,13 @@ #include "ui_appindicator.h" -#ifdef HAVE_LIBNOTIFY -#include "ui_notify.h" -#endif - #ifdef HAVE_GTOP -#include "cpu.h" +#include #endif static const char *program_name; -static void print_version() +static void print_version(void) { printf("psensor %s\n", VERSION); printf(_("Copyright (C) %s jeanfi@gmail.com\n" @@ -84,7 +83,7 @@ static void print_version() "2010-2014"); } -static void print_help() +static void print_help(void) { printf(_("Usage: %s [OPTION]...\n"), program_name); @@ -102,9 +101,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(""); @@ -136,12 +132,14 @@ update_psensor_values_size(struct psensor **sensors, struct config *cfg) } } -static void update_measures(struct ui_psensor *ui) +static void *update_measures(void *data) { struct psensor **sensors; struct config *cfg; int period; + struct ui_psensor *ui; + ui = (struct ui_psensor *)data; cfg = ui->config; while (1) { @@ -149,11 +147,11 @@ static void update_measures(struct ui_psensor *ui) sensors = ui->sensors; if (!sensors) - return; + pthread_exit(NULL); 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 @@ -163,6 +161,17 @@ static void update_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); @@ -176,21 +185,23 @@ static void update_measures(struct ui_psensor *ui) static void indicators_update(struct ui_psensor *ui) { - struct psensor **sensor_cur = ui->sensors; - unsigned int attention = 0; + struct psensor **ss, *s; + bool attention; - while (*sensor_cur) { - struct psensor *s = *sensor_cur; + attention = false; + ss = ui->sensors; + while (*ss) { + s = *ss; - if (s->alarm_enabled && s->alarm_raised) { - attention = 1; + if (s->alarm_raised && config_get_sensor_alarm_enabled(s->id)) { + attention = true; break; } - sensor_cur++; + ss++; } -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) +#if defined(HAVE_APPINDICATOR) if (is_appindicator_supported()) ui_appindicator_update(ui, attention); #endif @@ -199,7 +210,7 @@ static void indicators_update(struct ui_psensor *ui) ui_status_update(ui, attention); } -gboolean ui_refresh_thread(gpointer data) +static gboolean ui_refresh_thread(gpointer data) { struct config *cfg; gboolean ret; @@ -239,39 +250,55 @@ gboolean ui_refresh_thread(gpointer data) static void cb_alarm_raised(struct psensor *sensor, void *data) { -#ifdef HAVE_LIBNOTIFY - if (sensor->alarm_enabled) + if (config_get_sensor_alarm_enabled(sensor->id)) { ui_notify(sensor, (struct ui_psensor *)data); -#endif - - notify_cmd(sensor); + 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, 0x0000, 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" }; - struct psensor **cur; int i; + struct psensor **cur; struct color c; 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]); + gdk_rgba_parse(&rgba, default_colors[i % 27]); + c.red = rgba.red; + c.green = rgba.green; + c.blue = rgba.blue; (*cur)->color = config_get_sensor_color((*cur)->id, &c); } @@ -281,6 +308,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; @@ -292,14 +320,6 @@ 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 - = config_get_sensor_alarm_enabled(s->id); - } else { - s->alarm_high_threshold = 0; - s->alarm_enabled = 0; - } - sensor_cur++; } } @@ -307,12 +327,11 @@ 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->graph_enabled = config_is_sensor_graph_enabled(s->id); - n = config_get_sensor_name(s->id); if (n) { @@ -320,13 +339,11 @@ static void associate_preferences(struct psensor **sensors) s->name = n; } - s->appindicator_enabled = config_is_appindicator_enabled(s->id); - sensor_cur++; } } -static void log_init() +static void log_init(void) { const char *dir; char *path; @@ -334,7 +351,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"); @@ -345,13 +362,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} + {"version", no_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, + {"url", required_argument, NULL, 'u'}, + {"debug", required_argument, NULL, 'd'}, + {"new-instance", no_argument, NULL, 'n'}, + {NULL, 0, NULL, 0} }; static gboolean initial_window_show(gpointer data) @@ -376,7 +392,7 @@ static gboolean initial_window_show(gpointer data) return FALSE; } -static void log_glib_info() +static void log_glib_info(void) { log_debug("Compiled with GLib %d.%d.%d", GLIB_MAJOR_VERSION, @@ -404,8 +420,6 @@ static void cleanup(struct ui_psensor *ui) log_debug("Cleanup..."); - psensor_cleanup(); - #ifdef HAVE_NVIDIA nvidia_cleanup(); #endif @@ -419,7 +433,7 @@ static void cleanup(struct ui_psensor *ui) psensor_list_free(ui->sensors); ui->sensors = NULL; -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) +#if defined(HAVE_APPINDICATOR) ui_appindicator_cleanup(); #endif @@ -436,10 +450,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; @@ -453,15 +465,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 } @@ -474,9 +506,8 @@ static struct psensor **create_sensors_list(const char *url, int main(int argc, char **argv) { struct ui_psensor ui; - GError *error; - GThread *thread; - int optc, cmdok, opti, use_libatasmart, new_instance; + pthread_t thread; + int optc, cmdok, opti, new_instance, ret; char *url = NULL; GApplication *app; @@ -489,16 +520,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); @@ -552,26 +579,13 @@ 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); pmutex_init(&ui.sensors_mutex); ui.config = config_load(); - 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) @@ -580,7 +594,7 @@ int main(int argc, char **argv) &ui.sensors_mutex, config_get_slog_interval()); -#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029) +#if !defined(HAVE_APPINDICATOR) ui_status_init(&ui); ui_status_set_visible(1); #endif @@ -590,17 +604,16 @@ int main(int argc, char **argv) ui_enable_alpha_channel(&ui); - thread = g_thread_create((GThreadFunc) update_measures, - &ui, TRUE, &error); + ret = pthread_create(&thread, NULL, update_measures, &ui); - 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; g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui); -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) +#if defined(HAVE_APPINDICATOR) ui_appindicator_init(&ui); #endif @@ -617,6 +630,8 @@ int main(int argc, char **argv) else initial_window_show(&ui); + log_debug("translators: %s\n", _("translator-credits")); + /* main loop */ gtk_main();