X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Fmain.c;h=dce457346015c55b6691af0d54ba279559f55a50;hp=8d57f5820d3692b2d3aece3025dc337bc359511f;hb=ff659df2cbe866aa79243d60a7d6d01df8df4ec3;hpb=c41fe74cb87e9a6d1c265d9d7605bc158509b7a9 diff --git a/src/main.c b/src/main.c index 8d57f58..dce4573 100644 --- a/src/main.c +++ b/src/main.c @@ -28,51 +28,34 @@ #include -#include "config.h" - -#include "cfg.h" -#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 +#include +#include +#include +#include +#include +#include #include -#include "slog.h" -#include "ui_pref.h" -#include "ui_graph.h" -#include "ui_status.h" - -#ifdef HAVE_UNITY -#include "ui_unity.h" -#endif - -#ifdef HAVE_NVIDIA -#include "nvidia.h" -#endif - -#ifdef HAVE_LIBATIADL -#include "amd.h" -#endif - -#ifdef HAVE_REMOTE_SUPPORT -#include "rsensor.h" -#endif - -#include "ui_appindicator.h" - -#ifdef HAVE_LIBNOTIFY -#include "ui_notify.h" -#endif - -#ifdef HAVE_GTOP -#include "cpu.h" -#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include 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 +67,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 +85,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 +116,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,20 +131,19 @@ 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); -#ifdef HAVE_REMOTE_SUPPORT + lmsensor_psensor_list_update(sensors); + remote_psensor_list_update(sensors); -#endif -#ifdef HAVE_NVIDIA nvidia_psensor_list_update(sensors); -#endif -#ifdef HAVE_LIBATIADL amd_psensor_list_update(sensors); -#endif + udisks2_psensor_list_update(sensors); + gtop2_psensor_list_update(sensors); + atasmart_psensor_list_update(sensors); + hddtemp_psensor_list_update(sensors); psensor_log_measures(sensors); @@ -176,30 +157,30 @@ 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 (is_appindicator_supported()) ui_appindicator_update(ui, attention); -#endif if (is_status_supported()) ui_status_update(ui, attention); } -gboolean ui_refresh_thread(gpointer data) +static gboolean ui_refresh_thread(gpointer data) { struct config *cfg; gboolean ret; @@ -217,11 +198,9 @@ gboolean ui_refresh_thread(gpointer data) 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->temperature_unit == CELSIUS); -#endif if (ui->graph_update_interval != cfg->graph_update_interval) { ui->graph_update_interval = cfg->graph_update_interval; @@ -239,80 +218,48 @@ 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); -} - -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 */ - }; - struct psensor **cur; - int i; - 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]); - - (*cur)->color = config_get_sensor_color((*cur)->id, &c); + notify_cmd(sensor); } } 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; + bool ret; + struct psensor *s; + + while (*sensors) { + s = *sensors; s->cb_alarm_raised = cb_alarm_raised; s->cb_alarm_raised_data = ui; - s->alarm_high_threshold - = config_get_sensor_alarm_high_threshold(s->id); - s->alarm_low_threshold - = config_get_sensor_alarm_low_threshold(s->id); + ret = config_get_sensor_alarm_high_threshold + (s->id, &s->alarm_high_threshold); - 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; - } + if (!ret && s->max != UNKNOWN_DBL_VALUE) + s->alarm_high_threshold = s->max; - sensor_cur++; + ret = config_get_sensor_alarm_low_threshold + (s->id, &s->alarm_low_threshold); + + if (!ret && s->min != UNKNOWN_DBL_VALUE) + s->alarm_low_threshold = s->min; + + sensors++; } } 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_enabled(s->id); - n = config_get_sensor_name(s->id); if (n) { @@ -320,13 +267,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 +279,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 +290,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 +320,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,24 +348,14 @@ static void cleanup(struct ui_psensor *ui) 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(); @@ -436,37 +370,47 @@ 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; 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 + if (rsensor_is_supported()) { + rsensor_init(); + sensors = get_remote_sensors(url, 600); + } else { + log_err(_("Psensor has not been compiled with remote " + "sensor support.")); + exit(EXIT_FAILURE); + } } 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 + 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); + + if (config_is_libatasmart_enabled()) + atasmart_psensor_list_append(&sensors, 600); + + if (config_is_nvctrl_enabled()) + nvidia_psensor_list_append(&sensors, 600); + + if (config_is_atiadlsdk_enabled()) + amd_psensor_list_append(&sensors, 600); + + if (config_is_gtop2_enabled()) + gtop2_psensor_list_append(&sensors, 600); + + if (config_is_udisks2_enabled()) + udisks2_psensor_list_append(&sensors, 600); } associate_preferences(sensors); - associate_colors(sensors); return sensors; } @@ -474,9 +418,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 +432,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 +491,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,29 +506,24 @@ int main(int argc, char **argv) &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_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) ui_appindicator_init(&ui); -#endif gdk_notify_startup_complete();