#include "lmsensor.h"
#include "ui_pref.h"
#include "ui_graph.h"
+#include "ui_status.h"
#ifdef HAVE_UNITY
#include "ui_unity.h"
#include "rsensor.h"
#endif
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
#include "ui_appindicator.h"
-#endif
#ifdef HAVE_LIBNOTIFY
#include "ui_notify.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;
#ifdef HAVE_LIBATIADL
amd_psensor_list_update(sensors);
#endif
+
+ log_measures(sensors);
+
g_mutex_unlock(ui->sensors_mutex);
sleep(cfg->sensor_update_interval);
path = malloc(strlen(dir)+1+strlen("log")+1);
sprintf(path, "%s/%s", dir, "log");
- log_open(path, LOG_INFO);
+ log_open(path);
free(dir);
free(path);
{"version", no_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
{"url", required_argument, 0, 'u'},
+ {"debug", no_argument, 0, 'd'},
{0, 0, 0, 0}
};
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;
associate_colors(ui.sensors);
associate_cb_alarm_raised(ui.sensors, &ui);
+ ui_status_init(&ui);
+
/* main window */
ui_window_create(&ui);
ui.sensor_box = NULL;
ui_appindicator_init(&ui);
#endif
+ gdk_notify_startup_complete();
+
/* main loop */
gtk_main();
#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);
config_cleanup();