projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
normalize code
[psensor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
80e912e
..
ba3eafb
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2010-201
2
jeanfi@gmail.com
+ * Copyright (C) 2010-201
4
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
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@
-37,6
+37,9
@@
#include "ui_sensorlist.h"
#include "ui_color.h"
#include "lmsensor.h"
#include "ui_sensorlist.h"
#include "ui_color.h"
#include "lmsensor.h"
+#include "notify_cmd.h"
+#include <pmutex.h>
+#include <pudisks2.h>
#include "slog.h"
#include "ui_pref.h"
#include "ui_graph.h"
#include "slog.h"
#include "ui_pref.h"
#include "ui_graph.h"
@@
-65,11
+68,9
@@
#endif
#ifdef HAVE_GTOP
#endif
#ifdef HAVE_GTOP
-#include
"cpu.h"
+#include
<pgtop2.h>
#endif
#endif
-#include "compat.h"
-
static const char *program_name;
static void print_version()
static const char *program_name;
static void print_version()
@@
-78,10
+79,10
@@
static void print_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"
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"),
" redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"),
- "2010-201
2
");
+ "2010-201
4
");
}
static void print_help()
}
static void print_help()
@@
-136,24
+137,28
@@
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 psensor **sensors;
struct config *cfg;
int period;
+ struct ui_psensor *ui;
+ ui = (struct ui_psensor *)data;
cfg = ui->config;
while (1) {
cfg = ui->config;
while (1) {
- p
thread_
mutex_lock(&ui->sensors_mutex);
+ pmutex_lock(&ui->sensors_mutex);
sensors = ui->sensors;
if (!sensors)
sensors = ui->sensors;
if (!sensors)
-
return
;
+
pthread_exit(NULL)
;
update_psensor_values_size(sensors, cfg);
psensor_list_update_measures(sensors);
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
#ifdef HAVE_REMOTE_SUPPORT
remote_psensor_list_update(sensors);
#endif
@@
-163,12
+168,18
@@
static void update_measures(struct ui_psensor *ui)
#ifdef HAVE_LIBATIADL
amd_psensor_list_update(sensors);
#endif
#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;
psensor_log_measures(sensors);
period = cfg->sensor_update_interval;
- p
thread_
mutex_unlock(&ui->sensors_mutex);
+ pmutex_unlock(&ui->sensors_mutex);
sleep(period);
}
sleep(period);
}
@@
-208,11
+219,11
@@
gboolean ui_refresh_thread(gpointer data)
ret = TRUE;
cfg = ui->config;
ret = TRUE;
cfg = ui->config;
- p
thread_
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->w_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);
if (is_appindicator_supported() || is_status_supported())
indicators_update(ui);
@@
-220,7
+231,7
@@
gboolean ui_refresh_thread(gpointer data)
#ifdef HAVE_UNITY
ui_unity_launcher_entry_update(ui->sensors,
!cfg->unity_launcher_count_disabled,
#ifdef HAVE_UNITY
ui_unity_launcher_entry_update(ui->sensors,
!cfg->unity_launcher_count_disabled,
- cfg->temperature_unit == CEL
C
IUS);
+ cfg->temperature_unit == CEL
S
IUS);
#endif
if (ui->graph_update_interval != cfg->graph_update_interval) {
#endif
if (ui->graph_update_interval != cfg->graph_update_interval) {
@@
-228,7
+239,7
@@
gboolean ui_refresh_thread(gpointer data)
ret = FALSE;
}
ret = FALSE;
}
- p
thread_
mutex_unlock(&ui->sensors_mutex);
+ pmutex_unlock(&ui->sensors_mutex);
if (ret == FALSE)
g_timeout_add(1000 * ui->graph_update_interval,
if (ret == FALSE)
g_timeout_add(1000 * ui->graph_update_interval,
@@
-243,6
+254,8
@@
static void cb_alarm_raised(struct psensor *sensor, void *data)
if (sensor->alarm_enabled)
ui_notify(sensor, (struct ui_psensor *)data);
#endif
if (sensor->alarm_enabled)
ui_notify(sensor, (struct ui_psensor *)data);
#endif
+
+ notify_cmd(sensor);
}
static void associate_colors(struct psensor **sensors)
}
static void associate_colors(struct psensor **sensors)
@@
-250,33
+263,28
@@
static void associate_colors(struct psensor **sensors)
/* number of uniq colors */
#define COLORS_COUNT 8
/* number of uniq colors */
#define COLORS_COUNT 8
-
unsigned int
colors[COLORS_COUNT][3] = {
- {0
x0000, 0x0000, 0x0000},
/* black */
- {
0xffff, 0x0000, 0x0000},
/* red */
- {0
x0000, 0x0000, 0xffff},
/* blue */
- {0
x0000, 0xffff, 0x0000},
/* green */
+
double
colors[COLORS_COUNT][3] = {
+ {0
, 0, 0},
/* black */
+ {
1, 0, 0},
/* red */
+ {0
, 0, 1},
/* blue */
+ {0
, 1, 0},
/* green */
- {0
x7fff, 0x7fff, 0x7fff},
/* grey */
- {0
x7fff, 0x0000, 0x0000},
/* dark red */
- {0
x0000, 0x0000, 0x7fff},
/* dark blue */
- {0
x0000, 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;
- struct psensor **sensor_cur = sensors;
- int i = 0;
- while (*sensor_cur) {
- struct color default_color;
- color_set(&default_color,
+ 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]);
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++;
+ (*cur)->color = config_get_sensor_color((*cur)->id, &c);
}
}
}
}
@@
-284,6
+292,7
@@
static void
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
{
struct psensor **sensor_cur = sensors;
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
{
struct psensor **sensor_cur = sensors;
+
while (*sensor_cur) {
struct psensor *s = *sensor_cur;
while (*sensor_cur) {
struct psensor *s = *sensor_cur;
@@
-295,13
+304,8
@@
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
s->alarm_low_threshold
= config_get_sensor_alarm_low_threshold(s->id);
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);
= config_get_sensor_alarm_enabled(s->id);
- } else {
- s->alarm_high_threshold = 0;
- s->alarm_enabled = 0;
- }
sensor_cur++;
}
sensor_cur++;
}
@@
-310,11
+314,12
@@
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
static void associate_preferences(struct psensor **sensors)
{
struct psensor **sensor_cur = sensors;
static void associate_preferences(struct psensor **sensors)
{
struct psensor **sensor_cur = sensors;
+
while (*sensor_cur) {
char *n;
struct psensor *s = *sensor_cur;
while (*sensor_cur) {
char *n;
struct psensor *s = *sensor_cur;
- s->
enabled = config_is_sensor
_enabled(s->id);
+ s->
graph_enabled = config_is_sensor_graph
_enabled(s->id);
n = config_get_sensor_name(s->id);
n = config_get_sensor_name(s->id);
@@
-331,23
+336,19
@@
static void associate_preferences(struct psensor **sensors)
static void log_init()
{
static void log_init()
{
- char *home, *path, *dir;
+ const char *dir;
+ char *path;
-
home = getenv("HOME"
);
+
dir = get_psensor_user_dir(
);
- if (!home)
- return ;
-
- 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);
path = malloc(strlen(dir)+1+strlen("log")+1);
sprintf(path, "%s/%s", dir, "log");
log_open(path);
- free(dir);
free(path);
}
free(path);
}
@@
-407,7
+408,7
@@
static void cb_activate(GApplication *application,
*/
static void cleanup(struct ui_psensor *ui)
{
*/
static void cleanup(struct ui_psensor *ui)
{
- p
thread_
mutex_lock(&ui->sensors_mutex);
+ pmutex_lock(&ui->sensors_mutex);
log_debug("Cleanup...");
log_debug("Cleanup...");
@@
-432,7
+433,7
@@
static void cleanup(struct ui_psensor *ui)
ui_status_cleanup();
ui_status_cleanup();
- p
thread_
mutex_unlock(&ui->sensors_mutex);
+ pmutex_unlock(&ui->sensors_mutex);
config_cleanup();
config_cleanup();
@@
-461,14
+462,25
@@
static struct psensor **create_sensors_list(const char *url,
#endif
} else {
sensors = get_all_sensors(use_libatasmart, 600);
#endif
} else {
sensors = get_all_sensors(use_libatasmart, 600);
+
+ if (config_is_lmsensor_enabled())
+ lmsensor_psensor_list_append(&sensors, 600);
+
#ifdef HAVE_NVIDIA
#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
#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
#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
}
#endif
}
@@
-481,9
+493,8
@@
static struct psensor **create_sensors_list(const char *url,
int main(int argc, char **argv)
{
struct ui_psensor ui;
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;
char *url = NULL;
GApplication *app;
@@
-559,11
+570,20
@@
int main(int argc, char **argv)
g_thread_init(NULL);
#endif
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();
gdk_threads_init();
+#endif
gtk_init(NULL, NULL);
gtk_init(NULL, NULL);
- p
thread_mutex_init(&ui.sensors_mutex, NULL
);
+ p
mutex_init(&ui.sensors_mutex
);
ui.config = config_load();
ui.config = config_load();
@@
-585,21
+605,13
@@
int main(int argc, char **argv)
/* main window */
ui_window_create(&ui);
/* main window */
ui_window_create(&ui);
- ui.sensor_box = NULL;
-
- /* drawing box */
- ui.w_graph = ui_graph_create(&ui);
ui_enable_alpha_channel(&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;
ui.graph_update_interval = ui.config->graph_update_interval;
@@
-613,11
+625,16
@@
int main(int argc, char **argv)
/*
* hack, did not find a cleaner solution.
/*
* hack, did not find a cleaner solution.
- * wait
2
s to ensure that the status icon is attempted to be
+ * wait
30
s to ensure that the status icon is attempted to be
* drawn before determining whether the main window must be
* show.
*/
* drawn before determining whether the main window must be
* show.
*/
- g_timeout_add(2000, (GSourceFunc)initial_window_show, &ui);
+ if (ui.config->hide_on_startup)
+ g_timeout_add(30000, (GSourceFunc)initial_window_show, &ui);
+ else
+ initial_window_show(&ui);
+
+ log_debug("translators: %s\n", _("translator-credits"));
/* main loop */
gtk_main();
/* main loop */
gtk_main();