X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=1efff09e1ab1eb836fa120f62d6b6fda673fe26c;hb=b352229bd4526b1193080397ebb8136420d33c7e;hp=8b92c0100de23509fe10232dda8ef3901f201eec;hpb=f3b05dae619a7909bd7422b3a82422c9442aa114;p=psensor.git diff --git a/src/lib/psensor.c b/src/lib/psensor.c index 8b92c01..1efff09 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -23,13 +23,10 @@ #include #define _(str) gettext(str) -#include "hdd.h" -#include "psensor.h" -#include "lmsensor.h" - -#ifdef HAVE_GTOP -#include "cpu.h" -#endif +#include +#include +#include +#include struct psensor *psensor_create(char *id, char *name, @@ -67,6 +64,9 @@ struct psensor *psensor_create(char *id, psensor->graph_enabled = 1; psensor->appindicator_enabled = 0; + psensor->provider_data = NULL; + psensor->provider_data_free_fct = &free; + return psensor; } @@ -81,6 +81,7 @@ void psensor_values_resize(struct psensor *s, int new_size) if (cur_ms) { int i; + for (i = 0; i < new_size - 1 && i < cur_size - 1; i++) measure_copy(&cur_ms[cur_size - i - 1], &new_ms[new_size - i - 1]); @@ -92,26 +93,30 @@ 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); + if (!s) + return; - free(sensor->name); - free(sensor->id); + log_debug("Cleanup %s", s->id); - if (sensor->chip) - free(sensor->chip); + free(s->name); + free(s->id); - if (sensor->color) - free(sensor->color); + if (s->chip) + free(s->chip); - measures_free(sensor->measures); + if (s->color) + free(s->color); - free(sensor->url); + measures_free(s->measures); - free(sensor); - } + free(s->url); + + if (s->provider_data && s->provider_data_free_fct) + s->provider_data_free_fct(s->provider_data); + + free(s); } void psensor_list_free(struct psensor **sensors) @@ -171,7 +176,9 @@ int psensor_list_contains_type(struct psensor **sensors, unsigned int type) struct psensor **psensor_list_add(struct psensor **sensors, struct psensor *sensor) { - int size = psensor_list_size(sensors); + int size; + + size = psensor_list_size(sensors); struct psensor **result = malloc((size + 1 + 1) * sizeof(struct psensor *)); @@ -185,6 +192,22 @@ struct psensor **psensor_list_add(struct psensor **sensors, return result; } +void psensor_list_append(struct psensor ***sensors, struct psensor *sensor) +{ + struct psensor **tmp; + + if (!sensor) + return; + + tmp = psensor_list_add(*sensors, sensor); + + if (tmp != *sensors) { + free(*sensors); + *sensors = tmp; + } +} + + struct psensor *psensor_list_get_by_id(struct psensor **sensors, const char *id) { struct psensor **sensors_cur = sensors; @@ -204,23 +227,8 @@ int is_temp_type(unsigned int type) return type & SENSOR_TYPE_TEMP; } -int is_fan_type(unsigned int type) -{ - return type & SENSOR_TYPE_FAN; -} - -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) +psensor_value_to_str(unsigned int type, double value, int use_celsius) { char *str; const char *unit; @@ -231,10 +239,10 @@ psensor_value_to_str(unsigned int type, double value, int use_celcius) */ str = malloc(20); - unit = psensor_type_to_unit_str(type, use_celcius); + unit = psensor_type_to_unit_str(type, use_celsius); - if (is_temp_type(type) && !use_celcius) - value = celcius_to_fahrenheit(value); + if (is_temp_type(type) && !use_celsius) + value = celsius_to_fahrenheit(value); sprintf(str, "%.0f%s", value, unit); @@ -244,9 +252,9 @@ psensor_value_to_str(unsigned int type, double value, int use_celcius) char * psensor_measure_to_str(const struct measure *m, unsigned int type, - unsigned int use_celcius) + unsigned int use_celsius) { - return psensor_value_to_str(type, m->value, use_celcius); + return psensor_value_to_str(type, m->value, use_celsius); } void psensor_set_current_value(struct psensor *sensor, double value) @@ -343,6 +351,7 @@ double get_max_value(struct psensor **sensors, int type) if (sensor->type & type) { int i; double t; + for (i = 0; i < sensor->values_max_length; i++) { t = sensor->measures[i].value; @@ -437,16 +446,28 @@ struct psensor **get_all_sensors(int use_libatasmart, int values_max_length) const char *psensor_type_to_str(unsigned int type) { - if (type & SENSOR_TYPE_NVCTRL) - return "NVidia GPU"; + if (type & SENSOR_TYPE_NVCTRL) { + if (type & SENSOR_TYPE_TEMP) + return "Temperature"; + else if (type & SENSOR_TYPE_GRAPHICS) + return "Graphics usage"; + else if (type & SENSOR_TYPE_VIDEO) + return "Video usage"; + else if (type & SENSOR_TYPE_MEMORY) + return "Memory usage"; + else if (type & SENSOR_TYPE_PCIE) + return "PCIe usage"; + + return "NVIDIA GPU"; + } if (type & SENSOR_TYPE_ATIADL) { if (type & SENSOR_TYPE_TEMP) return "AMD GPU Temperature"; else if (type & SENSOR_TYPE_RPM) return "AMD GPU Fan Speed"; - else /* type & SENSOR_TYPE_USAGE */ - return "AMD GPU Usage"; + /*else type & SENSOR_TYPE_USAGE */ + return "AMD GPU Usage"; } if ((type & SENSOR_TYPE_HDD_TEMP) == SENSOR_TYPE_HDD_TEMP) @@ -458,7 +479,7 @@ const char *psensor_type_to_str(unsigned int type) if (type & SENSOR_TYPE_TEMP) return "Temperature"; - if (type & SENSOR_TYPE_FAN) + if (type & SENSOR_TYPE_RPM) return "Fan"; if (type & SENSOR_TYPE_CPU) @@ -467,34 +488,31 @@ const char *psensor_type_to_str(unsigned int type) if (type & SENSOR_TYPE_REMOTE) return "Remote"; + if (type & SENSOR_TYPE_MEMORY) + return "Memory"; + return "N/A"; } -const char *psensor_type_to_unit_str(unsigned int type, int use_celcius) +const char *psensor_type_to_unit_str(unsigned int type, int use_celsius) { if (is_temp_type(type)) { - if (use_celcius) + if (use_celsius) return "\302\260C"; - else - return "\302\260F"; - } else if (is_fan_type(type)) { + return "\302\260F"; + } else if (type & SENSOR_TYPE_RPM) { return _("RPM"); - } else if (type & SENSOR_TYPE_CPU_USAGE) { + } else if (type & SENSOR_TYPE_PERCENT) { return _("%"); - } else { - return _("N/A"); } + 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_HDDTEMP)) hddtemp_psensor_list_update(sensors); @@ -541,11 +559,11 @@ struct psensor **psensor_list_copy(struct psensor **sensors) } char * -psensor_current_value_to_str(const struct psensor *s, unsigned int celcius) +psensor_current_value_to_str(const struct psensor *s, unsigned int use_celsius) { return psensor_value_to_str(s->type, psensor_get_current_value(s), - celcius); + use_celsius); } struct psensor **psensor_list_filter_graph_enabled(struct psensor **sensors)