X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=1ab82bd62a913eb96a32d7c0379e41fe0791129b;hb=633311cbd5621fefdc0373c5ee967a87925e5221;hp=f735a5e73f24a70db337e89371bb8f64946bd6a3;hpb=609664bb77874990e10f8073e54bb7f1645c8d72;p=psensor.git diff --git a/src/lib/psensor.c b/src/lib/psensor.c index f735a5e..1ab82bd 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -1,32 +1,37 @@ /* - 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-2012 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 #include -#include -#include +#include +#include +#define _(str) gettext(str) #include "hdd.h" #include "psensor.h" #include "lmsensor.h" +#ifdef HAVE_GTOP +#include "cpu.h" +#endif + + struct psensor *psensor_create(char *id, char *name, unsigned int type, int values_max_length) { @@ -36,22 +41,22 @@ struct psensor *psensor_create(char *id, char *name, psensor->id = id; psensor->name = name; psensor->enabled = 1; - psensor->min = UNKNOWN_VALUE; - psensor->max = UNKNOWN_VALUE; + psensor->min = UNKNOWN_DBL_VALUE; + psensor->max = UNKNOWN_DBL_VALUE; psensor->type = type; psensor->values_max_length = values_max_length; - psensor->measures = measures_create(values_max_length); + psensor->measures = measures_dbl_create(values_max_length); - psensor->alarm_limit = 0; + psensor->alarm_enabled = 0; + psensor->alarm_high_threshold = 0; + psensor->alarm_low_threshold = 0; psensor->cb_alarm_raised = NULL; psensor->cb_alarm_raised_data = NULL; psensor->alarm_raised = 0; - psensor->alarm_enabled = 0; - psensor->url = NULL; psensor->color = NULL; @@ -66,7 +71,7 @@ void psensor_values_resize(struct psensor *s, int new_size) cur_size = s->values_max_length; cur_ms = s->measures; - new_ms = measures_create(new_size); + new_ms = measures_dbl_create(new_size); if (cur_ms) { int i; @@ -84,6 +89,8 @@ void psensor_values_resize(struct psensor *s, int new_size) void psensor_free(struct psensor *sensor) { if (sensor) { + log_debug("Cleanup %s", sensor->id); + free(sensor->name); free(sensor->id); @@ -193,7 +200,18 @@ int is_fan_type(unsigned int type) return type & SENSOR_TYPE_FAN; } -char *psensor_value_to_string(unsigned int type, double value) +double celcius_to_fahrenheit(double c) +{ + return c * (9.0/5.0) + 32; +} + +double fahrenheit_to_celcius(double f) +{ + return (f - 32) * (5.0/9.0); +} + +char * +psensor_value_to_str(unsigned int type, double value, int use_celcius) { /* should not be possible to exceed 20 characters with temp or rpm values the .x part is never displayed */ @@ -202,15 +220,32 @@ char *psensor_value_to_string(unsigned int type, double value) char *unit; if (is_temp_type(type)) - unit = "C"; + if (use_celcius) { + unit = "°C"; + } else { + unit = "°F"; + value = celcius_to_fahrenheit(value); + } + else if (is_fan_type(type)) + unit = _("RPM"); + else if (type & SENSOR_TYPE_CPU_USAGE) + unit = _("%"); else - unit = ""; + unit = _("N/A"); sprintf(str, "%.0f%s", value, unit); return str; } +char * +psensor_measure_to_str(const struct measure *m, + unsigned int type, + unsigned int use_celcius) +{ + return psensor_value_to_str(type, m->value, use_celcius); +} + void psensor_set_current_value(struct psensor *sensor, double value) { struct timeval tv; @@ -232,17 +267,16 @@ psensor_set_current_measure(struct psensor *s, s->measures[s->values_max_length - 1].value = v; s->measures[s->values_max_length - 1].time = tv; - if (s->min == UNKNOWN_VALUE || v < s->min) + if (s->min == UNKNOWN_DBL_VALUE || v < s->min) s->min = v; - if (s->max == UNKNOWN_VALUE || v > s->max) + if (s->max == UNKNOWN_DBL_VALUE || v > s->max) s->max = v; - if (s->alarm_limit && s->alarm_enabled) { - if (v > s->alarm_limit) { + if (s->alarm_enabled) { + if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) { if (!s->alarm_raised && s->cb_alarm_raised) - s->cb_alarm_raised(s, - s->cb_alarm_raised_data); + s->cb_alarm_raised(s, s->cb_alarm_raised_data); s->alarm_raised = 1; } else { @@ -267,7 +301,7 @@ struct measure *psensor_get_current_measure(struct psensor *sensor) */ double get_min_value(struct psensor **sensors, int type) { - double m = UNKNOWN_VALUE; + double m = UNKNOWN_DBL_VALUE; struct psensor **s = sensors; while (*s) { @@ -280,10 +314,10 @@ double get_min_value(struct psensor **sensors, int type) for (i = 0; i < sensor->values_max_length; i++) { t = sensor->measures[i].value; - if (t == UNKNOWN_VALUE) + if (t == UNKNOWN_DBL_VALUE) continue; - if (m == UNKNOWN_VALUE || t < m) + if (m == UNKNOWN_DBL_VALUE || t < m) m = t; } } @@ -297,9 +331,9 @@ double get_min_value(struct psensor **sensors, int type) Returns the maximal value of a given 'type' (SENSOR_TYPE_TEMP or SENSOR_TYPE_FAN) */ -static double get_max_value(struct psensor **sensors, int type) +double get_max_value(struct psensor **sensors, int type) { - double m = UNKNOWN_VALUE; + double m = UNKNOWN_DBL_VALUE; struct psensor **s = sensors; while (*s) { @@ -311,10 +345,10 @@ static double get_max_value(struct psensor **sensors, int type) for (i = 0; i < sensor->values_max_length; i++) { t = sensor->measures[i].value; - if (t == UNKNOWN_VALUE) + if (t == UNKNOWN_DBL_VALUE) continue; - if (m == UNKNOWN_VALUE || t > m) + if (m == UNKNOWN_DBL_VALUE || t > m) m = t; } } @@ -324,6 +358,28 @@ static double get_max_value(struct psensor **sensors, int type) return m; } +double +psensor_get_max_current_value(struct psensor **sensors, unsigned int type) +{ + double m = UNKNOWN_DBL_VALUE; + struct psensor **s_cur = sensors; + + while (*s_cur) { + struct psensor *s = *s_cur; + + if (s->enabled && (s->type & type)) { + double v = psensor_get_current_value(s); + + if (m == UNKNOWN_DBL_VALUE || v > m) + m = v; + } + + s_cur++; + } + + return m; +} + double get_min_temp(struct psensor **sensors) { return get_min_value(sensors, SENSOR_TYPE_TEMP); @@ -344,48 +400,31 @@ double get_max_temp(struct psensor **sensors) return get_max_value(sensors, SENSOR_TYPE_TEMP); } -struct psensor **get_all_sensors(int values_max_length) +struct psensor **get_all_sensors(int use_libatasmart, int values_max_length) { struct psensor **psensors = NULL; - int count = 0; - const sensors_chip_name *chip; - int chip_nr = 0; struct psensor **tmp_psensors; - const sensors_feature *feature; - struct psensor *psensor; - int i; - - 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) { - psensor = lmsensor_psensor_create - (chip, feature, values_max_length); + psensors = lmsensor_psensor_list_add(NULL, values_max_length); - if (psensor) { - tmp_psensors - = psensor_list_add(psensors, - psensor); - - free(psensors); - - psensors = tmp_psensors; - - count++; - } - } + if (!use_libatasmart) { + tmp_psensors = hddtemp_psensor_list_add(psensors, + values_max_length); + if (tmp_psensors != psensors) { + free(psensors); + psensors = tmp_psensors; } } - - tmp_psensors = hdd_psensor_list_add(psensors, values_max_length); - - if (tmp_psensors != psensors) { - free(psensors); - psensors = tmp_psensors; - } +#ifdef HAVE_ATASMART + else { + tmp_psensors = hdd_psensor_list_add(psensors, + values_max_length); + if (tmp_psensors != psensors) { + free(psensors); + psensors = tmp_psensors; + } + } +#endif if (!psensors) { /* there is no detected sensors */ psensors = malloc(sizeof(struct psensor *)); @@ -397,26 +436,88 @@ struct psensor **get_all_sensors(int values_max_length) const char *psensor_type_to_str(unsigned int type) { - if (type & SENSOR_TYPE_REMOTE) - return "Remote"; + if ((type & SENSOR_TYPE_NVIDIA_TEMP) == SENSOR_TYPE_NVIDIA_TEMP) + return "NVidia GPU Temperature"; + + if ((type & SENSOR_TYPE_AMD_TEMP) == SENSOR_TYPE_AMD_TEMP) + return "AMD GPU Temperature"; + + if ((type & SENSOR_TYPE_AMD_FAN) == SENSOR_TYPE_AMD_FAN) + return "AMD GPU Fan Speed"; + + if ((type & SENSOR_TYPE_HDD_TEMP) == SENSOR_TYPE_HDD_TEMP) + return "HDD Temperature"; + + if (type & SENSOR_TYPE_CPU_USAGE) + return "CPU Usage"; - if (type & SENSOR_TYPE_LMSENSOR_TEMP) + if (type & SENSOR_TYPE_TEMP) return "Temperature"; - if (type & SENSOR_TYPE_LMSENSOR_FAN) + if (type & SENSOR_TYPE_FAN) return "Fan"; - if (type & SENSOR_TYPE_NVIDIA) - return "NVidia GPU Temperature"; - - if (type & SENSOR_TYPE_HDD_TEMP) - return "HDD Temperature"; + if (type & SENSOR_TYPE_REMOTE) + return "Remote"; return "N/A"; /* should not be possible */ } + +const char *psensor_type_to_unit_str(unsigned int type, int use_celcius) +{ + if (type & SENSOR_TYPE_TEMP) { + if (use_celcius) + return "\302\260C"; + else + return "\302\260F"; + } + + if (type & SENSOR_TYPE_FAN) + return _("RPM"); + + if (type & SENSOR_TYPE_CPU_USAGE) + return _("%"); + + return _("N/A"); +} + void psensor_list_update_measures(struct psensor **sensors) { lmsensor_psensor_list_update(sensors); - hdd_psensor_list_update(sensors); + +#ifdef HAVE_GTOP + cpu_psensor_list_update(sensors); +#endif + + if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDD_TEMP_HDDTEMP)) + hddtemp_psensor_list_update(sensors); + +#ifdef HAVE_ATASMART + if (psensor_list_contains_type(sensors, + SENSOR_TYPE_HDD_TEMP_ATASMART)) + hdd_psensor_list_update(sensors); +#endif +} + +void psensor_log_measures(struct psensor **sensors) +{ + if (log_level == LOG_DEBUG) + while (*sensors) { + log_debug("Measure: %s %.2f", + (*sensors)->name, + psensor_get_current_value(*sensors)); + + sensors++; + } +} + +void psensor_init() +{ + lmsensor_init(); +} + +void psensor_cleanup() +{ + lmsensor_cleanup(); }