#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
#include <gtk/gtk.h>
-#include <sensors/sensors.h>
-#include <sensors/error.h>
-
#include "config.h"
#include "cfg.h"
-#include "hdd.h"
#include "psensor.h"
#include "graph.h"
#include "ui.h"
#include "nvidia.h"
#endif
+#ifdef HAVE_LIBATIADL
+#include "amd.h"
+#endif
+
#ifdef HAVE_REMOTE_SUPPORT
#include "rsensor.h"
#endif
#include "ui_notify.h"
#endif
+#ifdef HAVE_GTOP
+#include "cpu.h"
+#endif
+
#include "compat.h"
static const char *program_name;
-void print_version()
+static void print_version()
{
printf("psensor %s\n", VERSION);
printf(_("Copyright (C) %s jeanfi@gmail.com\n\
"2010-2011");
}
-void print_help()
+static void print_help()
{
printf(_("Usage: %s [OPTION]...\n"), program_name);
}
}
+static void log_measures(struct psensor **sensors)
+{
+ if (log_level == LOG_DEBUG)
+ while (*sensors) {
+ log_printf(LOG_DEBUG, "%s %.2f",
+ (*sensors)->name,
+ psensor_get_current_value(*sensors));
+
+ sensors++;
+ }
+}
+
void update_psensor_measures(struct ui_psensor *ui)
{
struct psensor **sensors = ui->sensors;
struct config *cfg = ui->config;
while (1) {
- /*gdk_threads_enter();*/
g_mutex_lock(ui->sensors_mutex);
if (!sensors)
#ifdef HAVE_NVIDIA
nvidia_psensor_list_update(sensors);
#endif
+#ifdef HAVE_LIBATIADL
+ amd_psensor_list_update(sensors);
+#endif
+
+ log_measures(sensors);
- /*gdk_threads_leave();*/
g_mutex_unlock(ui->sensors_mutex);
sleep(cfg->sensor_update_interval);
cfg = ui->config;
g_mutex_lock(ui->sensors_mutex);
- /*gdk_threads_enter();*/
graph_update(ui->sensors, ui->w_graph, ui->config);
- ui_sensorlist_update(ui->ui_sensorlist);
+ ui_sensorlist_update(ui);
#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
ui_appindicator_update(ui);
#endif
#ifdef HAVE_UNITY
- ui_unity_launcher_entry_update(ui->sensors);
+ ui_unity_launcher_entry_update(ui->sensors,
+ !cfg->unity_launcher_count_disabled);
#endif
if (ui->graph_update_interval != cfg->graph_update_interval) {
}
g_mutex_unlock(ui->sensors_mutex);
- /*gdk_threads_leave();*/
if (ret == FALSE)
g_timeout_add(1000 * ui->graph_update_interval,
#endif
}
-void associate_colors(struct psensor **sensors)
+static void associate_colors(struct psensor **sensors)
{
/* number of uniq colors */
#define COLORS_COUNT 8
}
}
-void
+static void
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
{
struct psensor **sensor_cur = sensors;
}
}
-void associate_preferences(struct psensor **sensors)
+static void associate_preferences(struct psensor **sensors)
{
struct psensor **sensor_cur = sensors;
while (*sensor_cur) {
}
}
+static void log_init()
+{
+ char *home, *path, *dir;
+
+ home = getenv("HOME");
+
+ if (!home)
+ 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);
+}
static struct option long_options[] = {
{"version", no_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
{"url", required_argument, 0, 'u'},
+ {"debug", no_argument, 0, 'd'},
{0, 0, 0, 0}
};
struct ui_psensor ui;
GError *error;
GThread *thread;
- int err, optc;
+ int optc;
char *url = NULL;
int cmdok = 1;
textdomain(PACKAGE);
#endif
- while ((optc = getopt_long(argc, argv, "vhu:", long_options,
+ while ((optc = getopt_long(argc, argv, "vhdu:", long_options,
NULL)) != -1) {
switch (optc) {
case 'u':
case 'v':
print_version();
exit(EXIT_SUCCESS);
+ case 'd':
+ printf(_("Enables debug mode.\n"));
+ log_level = LOG_DEBUG;
+ break;
default:
cmdok = 0;
break;
exit(EXIT_FAILURE);
}
+ log_init();
+
g_thread_init(NULL);
gdk_threads_init();
/* gdk_threads_enter(); */
- gtk_init(&argc, &argv);
+ gtk_init(NULL, NULL);
#ifdef HAVE_LIBNOTIFY
ui.notification_last_time = NULL;
ui.config = config_load();
- err = lmsensor_init();
- if (!err) {
- fprintf(stderr, _("ERROR: lmsensor init failure: %s\n"),
- sensors_strerror(err));
- exit(EXIT_FAILURE);
- }
+ psensor_init();
if (url) {
#ifdef HAVE_REMOTE_SUPPORT
exit(EXIT_FAILURE);
#endif
} else {
-#ifdef HAVE_NVIDIA
- struct psensor **tmp;
-
- tmp = get_all_sensors(600);
- ui.sensors = nvidia_psensor_list_add(tmp, 600);
-
- if (tmp != ui.sensors)
- free(tmp);
-#else
ui.sensors = get_all_sensors(600);
+#ifdef HAVE_NVIDIA
+ ui.sensors = nvidia_psensor_list_add(ui.sensors, 600);
+#endif
+#ifdef HAVE_LIBATIADL
+ ui.sensors = amd_psensor_list_add(ui.sensors, 600);
+#endif
+#ifdef HAVE_GTOP
+ ui.sensors = cpu_psensor_list_add(ui.sensors, 600);
#endif
}
ui.w_graph = ui_graph_create(&ui);
/* sensor list */
- ui.ui_sensorlist = ui_sensorlist_create(ui.sensors);
-
- ui_sensor_box_create(&ui);
+ ui_sensorlist_create(&ui);
- gtk_widget_show_all(ui.main_window);
+ ui_window_update(&ui);
thread = g_thread_create((GThreadFunc) update_psensor_measures,
&ui, TRUE, &error);
ui_appindicator_init(&ui);
#endif
+ gdk_notify_startup_complete();
+
/* main loop */
gtk_main();
- sensors_cleanup();
+ g_mutex_lock(ui.sensors_mutex);
+
+ psensor_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;
+
+ g_mutex_unlock(ui.sensors_mutex);
+
+ config_cleanup();
- /* gdk_threads_leave(); */
+ log_close();
return 0;
}