X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=f5c0f2a8451519a2345834f06a21a3f24fbb126e;hb=bb4e19d49b0d2f608b73e96e6c6d10daed6c161a;hp=db4353d53f70310395f322d51f925198f92868fc;hpb=06cdff9b631cde561591aaf225bc03e2e19a4db7;p=psensor.git diff --git a/src/main.c b/src/main.c index db4353d..f5c0f2a 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,6 +40,7 @@ #include "lmsensor.h" #include "notify_cmd.h" #include +#include #include "slog.h" #include "ui_pref.h" #include "ui_graph.h" @@ -67,7 +69,7 @@ #endif #ifdef HAVE_GTOP -#include "cpu.h" +#include #endif static const char *program_name; @@ -136,12 +138,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 +153,13 @@ 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 +169,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); @@ -252,16 +269,16 @@ 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; @@ -281,6 +298,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,13 +310,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++; } @@ -307,6 +320,7 @@ 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; @@ -334,7 +348,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"); @@ -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); @@ -571,7 +598,7 @@ int main(int argc, char **argv) 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) @@ -590,11 +617,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; @@ -617,6 +643,8 @@ int main(int argc, char **argv) else initial_window_show(&ui); + log_debug("translators: %s\n", _("translator-credits")); + /* main loop */ gtk_main();