projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed atasmart option from help
[psensor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
258b58b
..
804b8a8
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-31,6
+31,7
@@
#include "config.h"
#include "cfg.h"
#include "config.h"
#include "cfg.h"
+#include <hdd.h>
#include "psensor.h"
#include "graph.h"
#include "ui.h"
#include "psensor.h"
#include "graph.h"
#include "ui.h"
@@
-39,6
+40,7
@@
#include "lmsensor.h"
#include "notify_cmd.h"
#include <pmutex.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"
@@
-67,7
+69,7
@@
#endif
#ifdef HAVE_GTOP
#endif
#ifdef HAVE_GTOP
-#include
"cpu.h"
+#include
<pgtop2.h>
#endif
static const char *program_name;
#endif
static const char *program_name;
@@
-102,9
+104,6
@@
static void print_help()
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"));
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("");
" -n, --new-instance force the creation of a new Psensor application"));
puts("");
@@
-156,6
+155,8
@@
static void *update_measures(void *data)
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
@@
-165,6
+166,17
@@
static void *update_measures(void *data)
#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
+#ifdef HAVE_ATASMART
+ atasmart_psensor_list_update(sensors);
+#endif
+
+ hddtemp_psensor_list_update(sensors);
psensor_log_measures(sensors);
psensor_log_measures(sensors);
@@
-254,16
+266,16
@@
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 psensor **cur;
int i;
@@
-283,6
+295,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;
@@
-294,13
+307,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++;
}
@@
-309,6
+317,7
@@
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;
@@
-336,7
+345,7
@@
static void log_init()
dir = get_psensor_user_dir();
if (!dir)
dir = get_psensor_user_dir();
if (!dir)
- return
;
+ return;
path = malloc(strlen(dir)+1+strlen("log")+1);
sprintf(path, "%s/%s", dir, "log");
path = malloc(strlen(dir)+1+strlen("log")+1);
sprintf(path, "%s/%s", dir, "log");
@@
-347,7
+356,6
@@
static void log_init()
}
static struct option long_options[] = {
}
static struct option long_options[] = {
- {"use-libatasmart", no_argument, 0, 0},
{"version", no_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
{"url", required_argument, 0, 'u'},
{"version", no_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
{"url", required_argument, 0, 'u'},
@@
-438,10
+446,8
@@
static void cleanup(struct ui_psensor *ui)
* Creates the list of sensors.
*
* 'url': remote psensor server url, null for local monitoring.
* Creates the list of sensors.
*
* 'url': remote psensor server url, null for local monitoring.
- * 'use_libatasmart': whether the libatasmart must be used.
*/
*/
-static struct psensor **create_sensors_list(const char *url,
- unsigned int use_libatasmart)
+static struct psensor **create_sensors_list(const char *url)
{
struct psensor **sensors;
{
struct psensor **sensors;
@@
-455,15
+461,35
@@
static struct psensor **create_sensors_list(const char *url,
exit(EXIT_FAILURE);
#endif
} else {
exit(EXIT_FAILURE);
#endif
} else {
- sensors = get_all_sensors(use_libatasmart, 600);
+ sensors = malloc(sizeof(struct psensor *));
+ *sensors = NULL;
+
+ if (config_is_lmsensor_enabled())
+ lmsensor_psensor_list_append(&sensors, 600);
+
+ if (config_is_hddtemp_enabled())
+ hddtemp_psensor_list_append(&sensors, 600);
+
+#ifdef HAVE_ATASMART
+ if (config_is_libatasmart_enabled())
+ atasmart_psensor_list_append(&sensors, 600);
+#endif
+
#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
}
@@
-477,7
+503,7
@@
int main(int argc, char **argv)
{
struct ui_psensor ui;
pthread_t thread;
{
struct ui_psensor ui;
pthread_t thread;
- int optc, cmdok, opti,
use_libatasmart,
new_instance, ret;
+ int optc, cmdok, opti, new_instance, ret;
char *url = NULL;
GApplication *app;
char *url = NULL;
GApplication *app;
@@
-490,16
+516,12
@@
int main(int argc, char **argv)
textdomain(PACKAGE);
#endif
textdomain(PACKAGE);
#endif
-
use_libatasmart =
new_instance = 0;
+ new_instance = 0;
cmdok = 1;
while ((optc = getopt_long(argc, argv, "vhd:u:n", long_options,
&opti)) != -1) {
switch (optc) {
cmdok = 1;
while ((optc = getopt_long(argc, argv, "vhd:u:n", long_options,
&opti)) != -1) {
switch (optc) {
- case 0:
- if (!strcmp(long_options[opti].name, "use-libatasmart"))
- use_libatasmart = 1;
- break;
case 'u':
if (optarg)
url = strdup(optarg);
case 'u':
if (optarg)
url = strdup(optarg);
@@
-572,7
+594,7
@@
int main(int argc, char **argv)
psensor_init();
psensor_init();
- ui.sensors = create_sensors_list(url
, use_libatasmart
);
+ ui.sensors = create_sensors_list(url);
associate_cb_alarm_raised(ui.sensors, &ui);
if (ui.config->slog_enabled)
associate_cb_alarm_raised(ui.sensors, &ui);
if (ui.config->slog_enabled)
@@
-617,6
+639,8
@@
int main(int argc, char **argv)
else
initial_window_show(&ui);
else
initial_window_show(&ui);
+ log_debug("translators: %s\n", _("translator-credits"));
+
/* main loop */
gtk_main();
/* main loop */
gtk_main();