projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed psensor does not start: Attempt to unlock mutex that was not locked during...
[psensor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
9b6de9a
..
6ac4846
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,8
@@
#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 "slog.h"
#include "ui_pref.h"
#include "ui_graph.h"
#include "ui_status.h"
#include "ui_pref.h"
#include "ui_graph.h"
#include "ui_status.h"
@@
-67,8
+69,6
@@
#include "cpu.h"
#endif
#include "cpu.h"
#endif
-#include "compat.h"
-
static const char *program_name;
static void print_version()
static const char *program_name;
static void print_version()
@@
-77,17
+77,17
@@
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()
{
printf(_("Usage: %s [OPTION]...\n"), program_name);
}
static void print_help()
{
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("");
"including temperatures and fan speeds."));
puts("");
@@
-97,11
+97,14
@@
static void print_help()
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(_(
+" --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("");
puts(_(" -d, --debug=LEVEL "
puts("");
puts(_(" -d, --debug=LEVEL "
@@
-115,23
+118,20
@@
static void print_help()
}
/*
}
/*
- 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)
{
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);
if (s->values_max_length != cfg->sensor_values_max_length)
psensor_values_resize(s,
cfg->sensor_values_max_length);
-
- cur++;
}
}
}
}
@@
-144,7
+144,7
@@
static void update_measures(struct ui_psensor *ui)
cfg = ui->config;
while (1) {
cfg = ui->config;
while (1) {
-
g_mutex_lock(
ui->sensors_mutex);
+
pthread_mutex_lock(&
ui->sensors_mutex);
sensors = ui->sensors;
if (!sensors)
sensors = ui->sensors;
if (!sensors)
@@
-167,7
+167,7
@@
static void update_measures(struct ui_psensor *ui)
period = cfg->sensor_update_interval;
period = cfg->sensor_update_interval;
-
g_mutex_unlock(
ui->sensors_mutex);
+
pthread_mutex_unlock(&
ui->sensors_mutex);
sleep(period);
}
sleep(period);
}
@@
-207,11
+207,11
@@
gboolean ui_refresh_thread(gpointer data)
ret = TRUE;
cfg = ui->config;
ret = TRUE;
cfg = ui->config;
-
g_mutex_lock(
ui->sensors_mutex);
+
pthread_mutex_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);
@@
-219,7
+219,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) {
@@
-227,7
+227,7
@@
gboolean ui_refresh_thread(gpointer data)
ret = FALSE;
}
ret = FALSE;
}
-
g_mutex_unlock(
ui->sensors_mutex);
+
pthread_mutex_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,
@@
-239,9
+239,11
@@
gboolean ui_refresh_thread(gpointer data)
static void cb_alarm_raised(struct psensor *sensor, void *data)
{
#ifdef HAVE_LIBNOTIFY
static void cb_alarm_raised(struct psensor *sensor, void *data)
{
#ifdef HAVE_LIBNOTIFY
- if (sensor->enabled)
+ if (sensor->
alarm_
enabled)
ui_notify(sensor, (struct ui_psensor *)data);
#endif
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)
@@
-252,7
+254,7
@@
static void associate_colors(struct psensor **sensors)
unsigned int colors[COLORS_COUNT][3] = {
{0x0000, 0x0000, 0x0000}, /* black */
{0xffff, 0x0000, 0x0000}, /* red */
unsigned int colors[COLORS_COUNT][3] = {
{0x0000, 0x0000, 0x0000}, /* black */
{0xffff, 0x0000, 0x0000}, /* red */
- {0x0000, 0
.
0000, 0xffff}, /* blue */
+ {0x0000, 0
x
0000, 0xffff}, /* blue */
{0x0000, 0xffff, 0x0000}, /* green */
{0x7fff, 0x7fff, 0x7fff}, /* grey */
{0x0000, 0xffff, 0x0000}, /* green */
{0x7fff, 0x7fff, 0x7fff}, /* grey */
@@
-260,22
+262,17
@@
static void associate_colors(struct psensor **sensors)
{0x0000, 0x0000, 0x7fff}, /* dark blue */
{0x0000, 0x7fff, 0x0000} /* dark green */
};
{0x0000, 0x0000, 0x7fff}, /* dark blue */
{0x0000, 0x7fff, 0x0000} /* 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);
}
}
}
}
@@
-289,13
+286,16
@@
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
s->cb_alarm_raised = cb_alarm_raised;
s->cb_alarm_raised_data = ui;
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_high_threshold
+ = config_get_sensor_alarm_high_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
= config_get_sensor_alarm_enabled(s->id);
} else {
s->alarm_enabled
= config_get_sensor_alarm_enabled(s->id);
} else {
- s->alarm_
limit
= 0;
+ s->alarm_
high_threshold
= 0;
s->alarm_enabled = 0;
}
s->alarm_enabled = 0;
}
@@
-310,7
+310,7
@@
static void associate_preferences(struct psensor **sensors)
char *n;
struct psensor *s = *sensor_cur;
char *n;
struct psensor *s = *sensor_cur;
- s->enabled = config_is_sensor_enabled(s->id);
+ s->
graph_
enabled = config_is_sensor_enabled(s->id);
n = config_get_sensor_name(s->id);
n = config_get_sensor_name(s->id);
@@
-319,29
+319,27
@@
static void associate_preferences(struct psensor **sensors)
s->name = n;
}
s->name = n;
}
+ s->appindicator_enabled = config_is_appindicator_enabled(s->id);
+
sensor_cur++;
}
}
static void log_init()
{
sensor_cur++;
}
}
static void log_init()
{
- char *home, *path, *dir;
+ const char *dir;
+ char *path;
-
home = getenv("HOME"
);
+
dir = get_psensor_user_dir(
);
- if (!
home
)
+ if (!
dir
)
return ;
return ;
- dir = malloc(strlen(home)+1+strlen(".psensor")+1);
- sprintf(dir, "%s/%s", home, ".psensor");
- mkdir(dir, 0777);
-
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);
}
@@
-351,6
+349,7
@@
static struct option long_options[] = {
{"help", no_argument, 0, 'h'},
{"url", required_argument, 0, 'u'},
{"debug", required_argument, 0, 'd'},
{"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}
};
{0, 0, 0, 0}
};
@@
-389,8
+388,8
@@
static void log_glib_info()
glib_micro_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);
}
{
ui_window_show((struct ui_psensor *)data);
}
@@
-400,7
+399,9
@@
static void activate(GApplication *application,
*/
static void cleanup(struct ui_psensor *ui)
{
*/
static void cleanup(struct ui_psensor *ui)
{
- g_mutex_lock(ui->sensors_mutex);
+ pthread_mutex_lock(&ui->sensors_mutex);
+
+ log_debug("Cleanup...");
psensor_cleanup();
psensor_cleanup();
@@
-423,13
+424,11
@@
static void cleanup(struct ui_psensor *ui)
ui_status_cleanup();
ui_status_cleanup();
-
g_mutex_unlock(
ui->sensors_mutex);
+
pthread_mutex_unlock(&
ui->sensors_mutex);
config_cleanup();
log_debug("Cleanup done, closing log");
config_cleanup();
log_debug("Cleanup done, closing log");
-
- log_close();
}
/*
}
/*
@@
-448,8
+447,8
@@
static struct psensor **create_sensors_list(const char *url,
rsensor_init();
sensors = get_remote_sensors(url, 600);
#else
rsensor_init();
sensors = get_remote_sensors(url, 600);
#else
- fprintf(stderr,
-
_("ERROR: Not compiled with remote sensor support.\n
"));
+ log_err(_("Psensor has not been compiled with remote "
+
"sensor support.
"));
exit(EXIT_FAILURE);
#endif
} else {
exit(EXIT_FAILURE);
#endif
} else {
@@
-465,6
+464,9
@@
static struct psensor **create_sensors_list(const char *url,
#endif
}
#endif
}
+ associate_preferences(sensors);
+ associate_colors(sensors);
+
return sensors;
}
return sensors;
}
@@
-473,7
+475,7
@@
int main(int argc, char **argv)
struct ui_psensor ui;
GError *error;
GThread *thread;
struct ui_psensor ui;
GError *error;
GThread *thread;
- int optc, cmdok, opti, use_libatasmart;
+ int optc, cmdok, opti, use_libatasmart
, new_instance
;
char *url = NULL;
GApplication *app;
char *url = NULL;
GApplication *app;
@@
-486,10
+488,10
@@
int main(int argc, char **argv)
textdomain(PACKAGE);
#endif
textdomain(PACKAGE);
#endif
- use_libatasmart = 0;
+ use_libatasmart =
new_instance =
0;
cmdok = 1;
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:
&opti)) != -1) {
switch (optc) {
case 0:
@@
-508,7
+510,10
@@
int main(int argc, char **argv)
exit(EXIT_SUCCESS);
case 'd':
log_level = atoi(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;
break;
default:
cmdok = 0;
@@
-525,15
+530,16
@@
int main(int argc, char **argv)
log_init();
app = g_application_new("wpitchoune.psensor", 0);
log_init();
app = g_application_new("wpitchoune.psensor", 0);
+
g_application_register(app, NULL, NULL);
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);
g_application_activate(app);
- log_
debug(_("Psensor instance already exists
"));
+ log_
warn(_("A Psensor instance already exists.
"));
exit(EXIT_SUCCESS);
}
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))
log_glib_info();
#if !(GLIB_CHECK_VERSION(2, 31, 0))
@@
-545,21
+551,34
@@
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);
-
ui.sensors_mutex = g_mutex_new(
);
+
pthread_mutex_init(&ui.sensors_mutex, NULL
);
ui.config = config_load();
psensor_init();
ui.sensors = create_sensors_list(url, use_libatasmart);
ui.config = config_load();
psensor_init();
ui.sensors = create_sensors_list(url, use_libatasmart);
- associate_preferences(ui.sensors);
- associate_colors(ui.sensors);
associate_cb_alarm_raised(ui.sensors, &ui);
associate_cb_alarm_raised(ui.sensors, &ui);
+ if (ui.config->slog_enabled)
+ slog_activate(NULL,
+ ui.sensors,
+ &ui.sensors_mutex,
+ config_get_slog_interval());
+
#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
ui_status_init(&ui);
ui_status_set_visible(1);
#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
ui_status_init(&ui);
ui_status_set_visible(1);
@@
-567,16
+586,9
@@
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);
thread = g_thread_create((GThreadFunc) update_measures,
&ui, TRUE, &error);
@@
-591,21
+603,30
@@
int main(int argc, char **argv)
ui_appindicator_init(&ui);
#endif
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);
-
gdk_notify_startup_complete();
gdk_notify_startup_complete();
+ /*
+ * hack, did not find a cleaner solution.
+ * wait 30s to ensure that the status icon is attempted to be
+ * drawn before determining whether the main window must be
+ * show.
+ */
+ if (ui.config->hide_on_startup)
+ g_timeout_add(30000, (GSourceFunc)initial_window_show, &ui);
+ else
+ initial_window_show(&ui);
+
/* main loop */
gtk_main();
/* main loop */
gtk_main();
-
log_debug("Quitting..."
);
+
g_object_unref(app
);
cleanup(&ui);
cleanup(&ui);
+ log_debug("Quitting...");
+ log_close();
+
+ if (url)
+ free(url);
+
return 0;
}
return 0;
}