X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=c5e412b7afdb1a93be194896c0d9ead9474cf46e;hb=39897615ff371e114e74dea464737df98c0684c6;hp=d7119ab89dbd3bc12ddf59a5db93d9c7c8caba86;hpb=fb33860236e4641a520ffa4e52deeef952b2853f;p=psensor.git diff --git a/src/lib/psensor.c b/src/lib/psensor.c index d7119ab..c5e412b 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -23,16 +23,12 @@ #include #define _(str) gettext(str) +#include + #include #include -#include #include -#ifdef HAVE_GTOP -#include -#include -#endif - struct psensor *psensor_create(char *id, char *name, char *chip, @@ -46,6 +42,9 @@ struct psensor *psensor_create(char *id, psensor->id = id; psensor->name = name; psensor->chip = chip; + psensor->sess_lowest = UNKNOWN_DBL_VALUE; + psensor->sess_highest = UNKNOWN_DBL_VALUE; + psensor->min = UNKNOWN_DBL_VALUE; psensor->max = UNKNOWN_DBL_VALUE; @@ -54,7 +53,6 @@ struct psensor *psensor_create(char *id, psensor->values_max_length = values_max_length; psensor->measures = measures_dbl_create(values_max_length); - psensor->alarm_enabled = 0; psensor->alarm_high_threshold = 0; psensor->alarm_low_threshold = 0; @@ -62,16 +60,8 @@ struct psensor *psensor_create(char *id, psensor->cb_alarm_raised_data = NULL; psensor->alarm_raised = 0; - psensor->url = NULL; - - psensor->color = NULL; - - psensor->graph_enabled = 1; - psensor->appindicator_enabled = 0; - -#ifdef HAVE_LIBUDISKS2 - psensor->udisks2_path = NULL; -#endif + psensor->provider_data = NULL; + psensor->provider_data_free_fct = &free; return psensor; } @@ -99,30 +89,25 @@ void psensor_values_resize(struct psensor *s, int new_size) s->measures = new_ms; } -void psensor_free(struct psensor *sensor) +void psensor_free(struct psensor *s) { - if (sensor) { - log_debug("Cleanup %s", sensor->id); - - free(sensor->name); - free(sensor->id); + if (!s) + return; - if (sensor->chip) - free(sensor->chip); + log_debug("Cleanup %s", s->id); - if (sensor->color) - free(sensor->color); + free(s->name); + free(s->id); - measures_free(sensor->measures); + if (s->chip) + free(s->chip); - free(sensor->url); + measures_free(s->measures); -#ifdef HAVE_LIBUDISKS2 - free(sensor->udisks2_path); -#endif + if (s->provider_data && s->provider_data_free_fct) + s->provider_data_free_fct(s->provider_data); - free(sensor); - } + free(s); } void psensor_list_free(struct psensor **sensors) @@ -162,32 +147,15 @@ int psensor_list_size(struct psensor **sensors) return size; } -int psensor_list_contains_type(struct psensor **sensors, unsigned int type) -{ - struct psensor **s; - - if (!sensors) - return 0; - - s = sensors; - while (*s) { - if ((*s)->type & type) - return 1; - s++; - } - - return 0; -} - struct psensor **psensor_list_add(struct psensor **sensors, struct psensor *sensor) { int size; + struct psensor **result; size = psensor_list_size(sensors); - struct psensor **result - = malloc((size + 1 + 1) * sizeof(struct psensor *)); + result = malloc((size + 1 + 1) * sizeof(struct psensor *)); if (sensors) memcpy(result, sensors, size * sizeof(struct psensor *)); @@ -282,21 +250,19 @@ void psensor_set_current_measure(struct psensor *s, double v, struct timeval tv) s->measures[s->values_max_length - 1].value = v; s->measures[s->values_max_length - 1].time = tv; - if (s->min == UNKNOWN_DBL_VALUE || v < s->min) - s->min = v; - - if (s->max == UNKNOWN_DBL_VALUE || v > s->max) - s->max = v; + if (s->sess_lowest == UNKNOWN_DBL_VALUE || v < s->sess_lowest) + s->sess_lowest = v; - 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); + if (s->sess_highest == UNKNOWN_DBL_VALUE || v > s->sess_highest) + s->sess_highest = v; - s->alarm_raised = 1; - } else { - s->alarm_raised = 0; + if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) { + if (!s->alarm_raised && s->cb_alarm_raised) { + s->alarm_raised = true; + s->cb_alarm_raised(s, s->cb_alarm_raised_data); } + } else { + s->alarm_raised = false; } } @@ -374,28 +340,6 @@ 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->graph_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); @@ -416,44 +360,6 @@ double get_max_temp(struct psensor **sensors) return get_max_value(sensors, SENSOR_TYPE_TEMP); } -struct psensor **get_all_sensors(int use_libatasmart, int values_max_length) -{ - struct psensor **psensors; - struct psensor **tmp_psensors; - - psensors = lmsensor_psensor_list_add(NULL, values_max_length); - - if (!use_libatasmart) { - tmp_psensors = hddtemp_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 - -#ifdef HAVE_GTOP - mem_psensor_list_add(&psensors, values_max_length); -#endif - - if (!psensors) { /* there is no detected sensors */ - psensors = malloc(sizeof(struct psensor *)); - *psensors = NULL; - } - - return psensors; -} - const char *psensor_type_to_str(unsigned int type) { if (type & SENSOR_TYPE_NVCTRL) { @@ -519,24 +425,6 @@ const char *psensor_type_to_unit_str(unsigned int type, int use_celsius) return _("N/A"); } -void psensor_list_update_measures(struct psensor **sensors) -{ - lmsensor_psensor_list_update(sensors); - -#ifdef HAVE_GTOP - cpu_psensor_list_update(sensors); - mem_psensor_list_update(sensors); -#endif - - if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDDTEMP)) - hddtemp_psensor_list_update(sensors); - -#ifdef HAVE_ATASMART - if (psensor_list_contains_type(sensors, SENSOR_TYPE_ATASMART)) - hdd_psensor_list_update(sensors); -#endif -} - void psensor_log_measures(struct psensor **sensors) { if (log_level == LOG_DEBUG) @@ -549,16 +437,6 @@ void psensor_log_measures(struct psensor **sensors) } } -void psensor_init() -{ - lmsensor_init(); -} - -void psensor_cleanup() -{ - lmsensor_cleanup(); -} - struct psensor **psensor_list_copy(struct psensor **sensors) { struct psensor **result; @@ -580,26 +458,3 @@ psensor_current_value_to_str(const struct psensor *s, unsigned int use_celsius) psensor_get_current_value(s), use_celsius); } - -struct psensor **psensor_list_filter_graph_enabled(struct psensor **sensors) -{ - int n, i; - struct psensor **result, **cur, *s; - - if (!sensors) - return NULL; - - n = psensor_list_size(sensors); - result = malloc((n+1) * sizeof(struct psensor *)); - - for (cur = sensors, i = 0; *cur; cur++) { - s = *cur; - - if (s->graph_enabled) - result[i++] = s; - } - - result[i] = NULL; - - return result; -}