X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=267aa4307961fa8615505bd560a3b6e4e098307f;hb=b352229bd4526b1193080397ebb8136420d33c7e;hp=ede84e6f104b94a551ebc64658c61d6296c68045;hpb=c2a9b90f809d55a0a771abcbeb451774ff04085a;p=psensor.git diff --git a/src/main.c b/src/main.c index ede84e6..267aa43 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 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 @@ -38,6 +38,8 @@ #include "ui_color.h" #include "lmsensor.h" #include "notify_cmd.h" +#include +#include #include "slog.h" #include "ui_pref.h" #include "ui_graph.h" @@ -66,7 +68,7 @@ #endif #ifdef HAVE_GTOP -#include "cpu.h" +#include #endif static const char *program_name; @@ -77,10 +79,10 @@ 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-2013"); + "2010-2014"); } static void print_help() @@ -135,20 +137,22 @@ 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) { - pthread_mutex_lock(&ui->sensors_mutex); + pmutex_lock(&ui->sensors_mutex); sensors = ui->sensors; if (!sensors) - return; + pthread_exit(NULL); update_psensor_values_size(sensors, cfg); @@ -162,12 +166,18 @@ 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 psensor_log_measures(sensors); period = cfg->sensor_update_interval; - pthread_mutex_unlock(&ui->sensors_mutex); + pmutex_unlock(&ui->sensors_mutex); sleep(period); } @@ -207,7 +217,7 @@ gboolean ui_refresh_thread(gpointer data) ret = TRUE; cfg = ui->config; - pthread_mutex_lock(&ui->sensors_mutex); + pmutex_lock(&ui->sensors_mutex); graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window); @@ -219,7 +229,7 @@ gboolean ui_refresh_thread(gpointer data) #ifdef HAVE_UNITY ui_unity_launcher_entry_update(ui->sensors, !cfg->unity_launcher_count_disabled, - cfg->temperature_unit == CELCIUS); + cfg->temperature_unit == CELSIUS); #endif if (ui->graph_update_interval != cfg->graph_update_interval) { @@ -227,7 +237,7 @@ gboolean ui_refresh_thread(gpointer data) ret = FALSE; } - pthread_mutex_unlock(&ui->sensors_mutex); + pmutex_unlock(&ui->sensors_mutex); if (ret == FALSE) g_timeout_add(1000 * ui->graph_update_interval, @@ -251,22 +261,22 @@ 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 */ + 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; - for (cur = sensors, i = 0; *cur; cur++) { + for (cur = sensors, i = 0; *cur; cur++, i++) { color_set(&c, colors[i % COLORS_COUNT][0], colors[i % COLORS_COUNT][1], @@ -280,6 +290,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; @@ -291,13 +302,8 @@ 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 + s->alarm_enabled = config_get_sensor_alarm_enabled(s->id); - } else { - s->alarm_high_threshold = 0; - s->alarm_enabled = 0; - } sensor_cur++; } @@ -306,11 +312,12 @@ 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_enabled(s->id); + s->graph_enabled = config_is_sensor_graph_enabled(s->id); n = config_get_sensor_name(s->id); @@ -327,23 +334,19 @@ 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); } @@ -403,7 +406,7 @@ static void cb_activate(GApplication *application, */ static void cleanup(struct ui_psensor *ui) { - pthread_mutex_lock(&ui->sensors_mutex); + pmutex_lock(&ui->sensors_mutex); log_debug("Cleanup..."); @@ -428,7 +431,7 @@ static void cleanup(struct ui_psensor *ui) ui_status_cleanup(); - pthread_mutex_unlock(&ui->sensors_mutex); + pmutex_unlock(&ui->sensors_mutex); config_cleanup(); @@ -457,14 +460,22 @@ static struct psensor **create_sensors_list(const char *url, #endif } else { sensors = get_all_sensors(use_libatasmart, 600); + #ifdef HAVE_NVIDIA - sensors = nvidia_psensor_list_add(sensors, 600); + if (config_is_nvctrl_enabled()) + sensors = nvidia_psensor_list_add(sensors, 600); #endif #ifdef HAVE_LIBATIADL - sensors = amd_psensor_list_add(sensors, 600); + if (config_is_atiadlsdk_enabled()) + sensors = amd_psensor_list_add(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 } @@ -477,9 +488,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, use_libatasmart, new_instance, ret; char *url = NULL; GApplication *app; @@ -555,11 +565,20 @@ 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); - pthread_mutex_init(&ui.sensors_mutex, NULL); + pmutex_init(&ui.sensors_mutex); ui.config = config_load(); @@ -584,11 +603,10 @@ 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; @@ -611,6 +629,8 @@ int main(int argc, char **argv) else initial_window_show(&ui); + log_debug("translators: %s\n", _("translator-credits")); + /* main loop */ gtk_main();