Imported Upstream version 1.1.1

[psensor-pkg-ubuntu.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 89a2177..e9b10b2 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -38,6 +38,7 @@
 #include "ui_color.h"
 #include "lmsensor.h"
 #include "notify_cmd.h"
+#include <pmutex.h>
 #include "slog.h"
 #include "ui_pref.h"
 #include "ui_graph.h"
@@ -77,7 +78,7 @@ 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"
-                "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-2014");
@@ -135,20 +136,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);
 
@@ -167,7 +170,7 @@ static void update_measures(struct ui_psensor *ui)
 
                period = cfg->sensor_update_interval;
 
-               pthread_mutex_unlock(&ui->sensors_mutex);
+               pmutex_unlock(&ui->sensors_mutex);
 
                sleep(period);
        }
@@ -207,7 +210,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 +222,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 +230,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 +254,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],
@@ -310,7 +313,7 @@ static void associate_preferences(struct psensor **sensors)
                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 +330,19 @@ static void associate_preferences(struct psensor **sensors)
 
 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 ;
 
-       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);
 
-       free(dir);
        free(path);
 }
 
@@ -403,7 +402,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 +427,7 @@ static void cleanup(struct ui_psensor *ui)
 
        ui_status_cleanup();
 
-       pthread_mutex_unlock(&ui->sensors_mutex);
+       pmutex_unlock(&ui->sensors_mutex);
 
        config_cleanup();
 
@@ -477,9 +476,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 +553,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 +591,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;