/*
- Copyright (C) 2010-2011 wpitchoune@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 published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA
-*/
-
+ * Copyright (C) 2010-2014 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
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
#include <locale.h>
#include <libintl.h>
#define _(str) gettext(str)
#include "psensor.h"
-double
-lmsensor_get_value(const sensors_chip_name *name,
- const sensors_subfeature *sub)
+static int init_done;
+
+static double get_value(const sensors_chip_name *name,
+ const sensors_subfeature *sub)
{
double val;
int err;
err = sensors_get_value(name, sub->number, &val);
if (err) {
- fprintf(stderr,
- _("ERROR: Can't get value of subfeature %s: %s\n"),
+ log_err(_("lmsensor: cannot get value of subfeature %s: %s."),
sub->name, sensors_strerror(err));
- val = UNKNOWN_VALUE;
+ val = UNKNOWN_DBL_VALUE;
}
return val;
}
-double lmsensor_get_temp_input(struct psensor *sensor)
+static double get_temp_input(struct psensor *sensor)
{
const sensors_chip_name *chip = sensor->iname;
const sensors_feature *feature = sensor->feature;
sf = sensors_get_subfeature(chip,
feature, SENSORS_SUBFEATURE_TEMP_INPUT);
if (sf)
- return lmsensor_get_value(chip, sf);
+ return get_value(chip, sf);
else
- return UNKNOWN_VALUE;
+ return UNKNOWN_DBL_VALUE;
}
-double lmsensor_get_fan_input(struct psensor *sensor)
+static double get_fan_input(struct psensor *sensor)
{
const sensors_chip_name *chip = sensor->iname;
const sensors_feature *feature = sensor->feature;
sf = sensors_get_subfeature(chip,
feature, SENSORS_SUBFEATURE_FAN_INPUT);
if (sf)
- return lmsensor_get_value(chip, sf);
+ return get_value(chip, sf);
else
- return UNKNOWN_VALUE;
+ return UNKNOWN_DBL_VALUE;
}
void lmsensor_psensor_list_update(struct psensor **sensors)
{
struct psensor **s_ptr = sensors;
+ if (!init_done)
+ return ;
+
while (*s_ptr) {
- struct psensor *sensor = *s_ptr;
+ struct psensor *s = *s_ptr;
- if (sensor->type == SENSOR_TYPE_LMSENSOR_TEMP)
- psensor_set_current_value
- (sensor, lmsensor_get_temp_input(sensor));
- else if (sensor->type == SENSOR_TYPE_LMSENSOR_FAN)
- psensor_set_current_value
- (sensor, lmsensor_get_fan_input(sensor));
+ if (!(s->type & SENSOR_TYPE_REMOTE)
+ && s->type & SENSOR_TYPE_LMSENSOR) {
+ if (s->type & SENSOR_TYPE_TEMP)
+ psensor_set_current_value(s,
+ get_temp_input(s));
+ else if (s->type & SENSOR_TYPE_RPM)
+ psensor_set_current_value(s, get_fan_input(s));
+ }
s_ptr++;
}
}
-struct psensor *
+static struct psensor *
lmsensor_psensor_create(const sensors_chip_name *chip,
const sensors_feature *feature,
int values_max_length)
{
char name[200];
const sensors_subfeature *sf;
- char *label;
int type;
- char *id;
+ char *id, *label, *cname;
struct psensor *psensor;
sensors_subfeature_type fault_subfeature;
if (feature->type == SENSORS_FEATURE_TEMP) {
fault_subfeature = SENSORS_SUBFEATURE_TEMP_FAULT;
-
} else if (feature->type == SENSORS_FEATURE_FAN) {
fault_subfeature = SENSORS_SUBFEATURE_FAN_FAULT;
-
} else {
- fprintf(stderr,
- _("ERROR: create_sensor, wrong feature type\n"));
+ log_err(_(
+"lmsensor: lmsensor_psensor_create failure: wrong feature type."));
return NULL;
}
sf = sensors_get_subfeature(chip, feature, fault_subfeature);
- if (sf && lmsensor_get_value(chip, sf))
+ if (sf && get_value(chip, sf))
return NULL;
label = sensors_get_label(chip, feature);
if (!label)
return NULL;
- type = 0;
+ type = SENSOR_TYPE_LMSENSOR;
if (feature->type == SENSORS_FEATURE_TEMP)
- type = SENSOR_TYPE_LMSENSOR_TEMP;
+ type |= SENSOR_TYPE_TEMP;
else if (feature->type == SENSORS_FEATURE_FAN)
- type = SENSOR_TYPE_LMSENSOR_FAN;
+ type |= (SENSOR_TYPE_RPM|SENSOR_TYPE_FAN);
else
return NULL;
1);
sprintf(id, "lmsensor %s %s", name, label);
- psensor = psensor_create(id, label, type, values_max_length);
+ if (!strcmp(chip->prefix, "coretemp"))
+ cname = strdup(_("Intel CPU"));
+ else if (!strcmp(chip->prefix, "k10temp")
+ || !strcmp(chip->prefix, "k8temp")
+ || !strcmp(chip->prefix, "fam15h_power"))
+ cname = strdup(_("AMD CPU"));
+ else if (!strcmp(chip->prefix, "nouveau"))
+ cname = strdup(_("NVIDIA GPU"));
+ else if (!strcmp(chip->prefix, "via-cputemp"))
+ cname = strdup(_("VIA CPU"));
+ else
+ cname = strdup(chip->prefix);
+
+ psensor = psensor_create(id, label, cname, type, values_max_length);
psensor->iname = chip;
psensor->feature = feature;
if (feature->type == SENSORS_FEATURE_TEMP
- && (lmsensor_get_temp_input(psensor) == UNKNOWN_VALUE)) {
+ && (get_temp_input(psensor) == UNKNOWN_DBL_VALUE)) {
free(psensor);
return NULL;
}
return psensor;
}
-int lmsensor_init()
+struct psensor **lmsensor_psensor_list_add(struct psensor **sensors,
+ int vn)
+{
+ const sensors_chip_name *chip;
+ int chip_nr = 0;
+ struct psensor **tmp, **result;
+ const sensors_feature *feature;
+ struct psensor *s;
+ int i;
+
+ if (!init_done)
+ return NULL;
+
+ result = sensors;
+ while ((chip = sensors_get_detected_chips(NULL, &chip_nr))) {
+
+ i = 0;
+ while ((feature = sensors_get_features(chip, &i))) {
+
+ if (feature->type == SENSORS_FEATURE_TEMP
+ || feature->type == SENSORS_FEATURE_FAN) {
+
+ s = lmsensor_psensor_create(chip, feature, vn);
+
+ if (s) {
+ tmp = psensor_list_add(result, s);
+
+ if (tmp != sensors)
+ free(result);
+
+ result = tmp;
+ }
+ }
+ }
+ }
+
+ return result;
+}
+
+void lmsensor_init()
{
int err = sensors_init(NULL);
if (err) {
- fprintf(stderr,
- _("ERROR: lm-sensors initialization failure: %s\n"),
+ log_err(_("lmsensor: initialization failure: %s."),
sensors_strerror(err));
- return 0;
+ init_done = 0;
} else {
- return 1;
+ init_done = 1;
}
}
+
+void lmsensor_cleanup()
+{
+ if (init_done)
+ sensors_cleanup();
+}
projects / psensor.git / blobdiff