/*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2017 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
#include <gtk/gtk.h>
-#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 "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 "compat.h"
+#include <config.h>
+
+#include <amd.h>
+#include <bcm2835.h>
+#include <cfg.h>
+#include <graph.h>
+#include <hdd.h>
+#include <lmsensor.h>
+#include <notify_cmd.h>
+#include <nvidia.h>
+#include <pgtop2.h>
+#include <pmutex.h>
+#include <psensor.h>
+#include <pudisks2.h>
+#include <rsensor.h>
+#include <slog.h>
+#include <ui.h>
+#include <ui_appindicator.h>
+#include <ui_color.h>
+#include <ui_graph.h>
+#include <ui_notify.h>
+#include <ui_pref.h>
+#include <ui_sensorlist.h>
+#include <ui_status.h>
+#include <ui_unity.h>
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"
"License GPLv2: GNU GPL version 2 or later "
"<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\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()
+static void print_help(void)
{
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("");
puts("");
- puts(_(" -u, --url=URL "
- "the URL of the psensor-server, example: http://hostname:3131"));
- puts(_(" --use-libatasmart "
- "use atasmart library for disk monitoring "
- "instead of hddtemp daemon"));
+ 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 "
}
/*
- 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 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) {
- 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, 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);
+ bcm2835_psensor_list_update(sensors);
psensor_log_measures(sensors);
period = cfg->sensor_update_interval;
- g_mutex_unlock(ui->sensors_mutex);
+ pmutex_unlock(&ui->sensors_mutex);
sleep(period);
}
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;
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, ui->main_window);
+ graph_update(ui->sensors, ui_get_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->temperature_unit == CELCIUS);
-#endif
+ ui_unity_launcher_entry_update(ui->sensors);
if (ui->graph_update_interval != cfg->graph_update_interval) {
ui->graph_update_interval = cfg->graph_update_interval;
ret = FALSE;
}
- g_mutex_unlock(ui->sensors_mutex);
+ pmutex_unlock(&ui->sensors_mutex);
if (ret == FALSE)
g_timeout_add(1000 * ui->graph_update_interval,
static void cb_alarm_raised(struct psensor *sensor, void *data)
{
-#ifdef HAVE_LIBNOTIFY
- if (sensor->enabled)
+ if (config_get_sensor_alarm_enabled(sensor->id)) {
ui_notify(sensor, (struct ui_psensor *)data);
-#endif
-}
-
-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 **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);
-
- sensor_cur++;
- i++;
+ 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;
+ double high_temp, high_default, low_default;
+
+ high_temp = config_get_default_high_threshold_temperature();
+
+ while (*sensors) {
+ s = *sensors;
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
- = config_get_sensor_alarm_enabled(s->id);
+ if (s->max == UNKNOWN_DBL_VALUE) {
+ if (s->type & SENSOR_TYPE_TEMP)
+ high_default = high_temp;
+ else
+ high_default = UNKNOWN_DBL_VALUE;
} else {
- s->alarm_limit = 0;
- s->alarm_enabled = 0;
+ high_default = s->max;
}
- sensor_cur++;
+ ret = config_get_sensor_alarm_high_threshold
+ (s->id, &s->alarm_high_threshold, high_default);
+
+ if (!ret)
+ s->alarm_high_threshold = high_default;
+
+ if (s->min == UNKNOWN_DBL_VALUE)
+ low_default = 0;
+ else
+ low_default = s->min;
+
+ ret = config_get_sensor_alarm_low_threshold
+ (s->id, &s->alarm_low_threshold, low_default);
+
+ if (!ret)
+ s->alarm_low_threshold = low_default;
+
+ sensors++;
}
}
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);
-
n = config_get_sensor_name(s->id);
if (n) {
}
}
-static void log_init()
+static void log_init(void)
{
- 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);
}
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'},
- {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)
+/*
+ * show the main window if there will be no way for the user to show
+ * it (no appindicator, no status icon).
+ */
+static gboolean check_ui_visible(gpointer data)
{
struct ui_psensor *ui;
- log_debug("initial_window_show()");
+ log_debug("check_ui_visible()");
ui = (struct ui_psensor *)data;
log_debug("is_status_supported: %d", is_status_supported());
log_debug("is_appindicator_supported: %d",
is_appindicator_supported());
- log_debug("hide_on_startup: %d", ui->config->hide_on_startup);
- if (!ui->config->hide_on_startup
- || (!is_appindicator_supported() && !is_status_supported()))
+ if (!is_appindicator_supported() && !is_status_supported())
ui_window_show(ui);
- ui_window_update(ui);
-
return FALSE;
}
-static void log_glib_info()
+static void log_glib_info(void)
{
log_debug("Compiled with GLib %d.%d.%d",
GLIB_MAJOR_VERSION,
glib_micro_version);
}
-static void activate(GApplication *application,
- gpointer data)
+static void cb_activate(GApplication *application,
+ gpointer data)
{
ui_window_show((struct ui_psensor *)data);
}
*/
static void cleanup(struct ui_psensor *ui)
{
- g_mutex_lock(ui->sensors_mutex);
+ pmutex_lock(&ui->sensors_mutex);
- psensor_cleanup();
+ 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();
- g_mutex_unlock(ui->sensors_mutex);
+ pmutex_unlock(&ui->sensors_mutex);
config_cleanup();
log_debug("Cleanup done, closing log");
-
- log_close();
}
/*
* 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
- fprintf(stderr,
- _("ERROR: Not compiled with remote sensor support.\n"));
- 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);
+
+ bcm2835_psensor_list_append(&sensors, 600);
}
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, opti, use_libatasmart;
+ pthread_t thread;
+ int optc, cmdok, opti, new_instance, ret;
char *url = NULL;
GApplication *app;
textdomain(PACKAGE);
#endif
- use_libatasmart = 0;
+ new_instance = 0;
cmdok = 1;
- while ((optc = getopt_long(argc, argv, "vhd:u:", long_options,
+ 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);
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;
log_init();
app = g_application_new("wpitchoune.psensor", 0);
+
g_application_register(app, NULL, NULL);
- if (g_application_get_is_remote(app)) {
+ if (!new_instance && g_application_get_is_remote(app)) {
g_application_activate(app);
- log_debug(_("Psensor instance already exists"));
+ log_warn(_("A Psensor instance already exists."));
exit(EXIT_SUCCESS);
}
- g_signal_connect(app, "activate", G_CALLBACK(activate), &ui);
+ g_signal_connect(app, "activate", G_CALLBACK(cb_activate), &ui);
log_glib_info();
#if !(GLIB_CHECK_VERSION(2, 31, 0))
g_thread_init(NULL);
#endif
- gdk_threads_init();
-
gtk_init(NULL, NULL);
- ui.sensors_mutex = g_mutex_new();
+ 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 !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
+ if (ui.config->slog_enabled)
+ slog_activate(NULL,
+ ui.sensors,
+ &ui.sensors_mutex,
+ config_get_slog_interval());
+
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);
-
- 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
-
- /*
- * 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);
+ ui_unity_init();
gdk_notify_startup_complete();
+ log_debug("hide_on_startup: %d", ui.config->hide_on_startup);
+ if (ui.config->hide_on_startup)
+ /* Wait 30s to allow attempt to show status icon or other UI,
+ * then check whether any UI is accessible. If not, then main
+ * window must be shown despite hide_on_startup preference.
+ * There may be a cleaner way to deal with this.
+ */
+ g_timeout_add(30000, (GSourceFunc)check_ui_visible, &ui);
+ else
+ ui_window_show(&ui);
+
/* main loop */
gtk_main();
- log_debug("Quitting...");
+ g_object_unref(app);
cleanup(&ui);
+ log_debug("Quitting...");
+ log_close();
+
+ if (url)
+ free(url);
+
return 0;
}
projects / psensor.git / blobdiff