X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=8d7b37e30ffdde51b882c21761291176a5e672ef;hb=7cf703ceb488aaefdbf43e496e44865ead748e54;hp=8a71781e5d160d218316cb12fa984ea957d876b4;hpb=637e142fd9693a875ae7d9de728fba79db961da1;p=psensor.git diff --git a/src/lib/psensor.c b/src/lib/psensor.c index 8a71781..8d7b37e 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -20,13 +20,19 @@ #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,13 +42,13 @@ 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; @@ -66,7 +72,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; @@ -203,6 +209,8 @@ char *psensor_value_to_string(unsigned int type, double value) if (is_temp_type(type)) unit = "C"; + else if (type & SENSOR_TYPE_CPU_USAGE) + unit = "%"; else unit = ""; @@ -229,13 +237,13 @@ psensor_set_current_measure(struct psensor *s, &s->measures[1], (s->values_max_length - 1) * sizeof(struct measure)); - s->measures[s->values_max_length - 1].value = v; + s->measures[s->values_max_length - 1].value.d_num = 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) { @@ -253,7 +261,7 @@ psensor_set_current_measure(struct psensor *s, double psensor_get_current_value(struct psensor *sensor) { - return sensor->measures[sensor->values_max_length - 1].value; + return sensor->measures[sensor->values_max_length - 1].value.d_num; } struct measure *psensor_get_current_measure(struct psensor *sensor) @@ -267,7 +275,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) { @@ -278,12 +286,12 @@ double get_min_value(struct psensor **sensors, int type) double t; for (i = 0; i < sensor->values_max_length; i++) { - t = sensor->measures[i].value; + t = sensor->measures[i].value.d_num; - 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 +305,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) { @@ -309,12 +317,12 @@ static double get_max_value(struct psensor **sensors, int type) int i; double t; for (i = 0; i < sensor->values_max_length; i++) { - t = sensor->measures[i].value; + t = sensor->measures[i].value.d_num; - 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 +332,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); @@ -347,41 +377,11 @@ double get_max_temp(struct psensor **sensors) struct psensor **get_all_sensors(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); - - if (psensor) { - tmp_psensors - = psensor_list_add(psensors, - psensor); - - free(psensors); - - psensors = tmp_psensors; - - count++; - } - } - } - } + psensors = lmsensor_psensor_list_add(NULL, values_max_length); tmp_psensors = hdd_psensor_list_add(psensors, values_max_length); - if (tmp_psensors != psensors) { free(psensors); psensors = tmp_psensors; @@ -406,19 +406,57 @@ const char *psensor_type_to_str(unsigned int type) if (type & SENSOR_TYPE_LMSENSOR_FAN) return "Fan"; - if (type & SENSOR_TYPE_NVIDIA) + if (type & SENSOR_TYPE_NVIDIA_TEMP) return "NVidia GPU Temperature"; + if (type & SENSOR_TYPE_AMD_TEMP) + return "AMD GPU Temperature"; + + if (type & SENSOR_TYPE_AMD_FAN) + return "AMD GPU Fan Speed"; + if (type & SENSOR_TYPE_HDD_TEMP) return "HDD Temperature"; + if (type & SENSOR_TYPE_CPU_USAGE) + return "CPU Usage"; + return "N/A"; /* should not be possible */ } + +const char *psensor_type_to_unit_str(unsigned int type) +{ + if (type & SENSOR_TYPE_TEMP) + return _("C"); + + 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); +#ifdef HAVE_GTOP + cpu_psensor_list_update(sensors); +#endif + if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDD_TEMP)) hdd_psensor_list_update(sensors); } + +void psensor_init() +{ + lmsensor_init(); +} + +void psensor_cleanup() +{ + lmsensor_cleanup(); +}