X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Flib%2Fpsensor.h;h=111976b5486be17ac6fe1aaf94095b90047f5277;hp=e459866f9f50d8e5fa1d0d42f5e68fc5c191cd27;hb=bd7036af56a4b61b2b473dccbeac5e26f78b57da;hpb=dcd813f21c83592155f712ff1acf450b483d8072 diff --git a/src/lib/psensor.h b/src/lib/psensor.h index e459866..111976b 100644 --- a/src/lib/psensor.h +++ b/src/lib/psensor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 jeanfi@gmail.com + * Copyright (C) 2010-2016 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 @@ -19,23 +19,17 @@ #ifndef _PSENSOR_PSENSOR_H_ #define _PSENSOR_PSENSOR_H_ -#include +#include -#include "config.h" -#ifdef HAVE_ATASMART -#include -#endif - -#include "bool.h" -#include "color.h" -#include "log.h" -#include "measure.h" +#include +#include +#include enum psensor_type { /* type of sensor values */ SENSOR_TYPE_TEMP = 0x00001, SENSOR_TYPE_RPM = 0x00002, - SENSOR_TYPE_USAGE = 0x00004, + SENSOR_TYPE_PERCENT = 0x00004, /* Whether the sensor is remote */ SENSOR_TYPE_REMOTE = 0x00008, @@ -47,6 +41,7 @@ enum psensor_type { SENSOR_TYPE_ATIADL = 0x00800, SENSOR_TYPE_ATASMART = 0x01000, SENSOR_TYPE_HDDTEMP = 0x02000, + SENSOR_TYPE_UDISKS2 = 0x800000, /* Type of HW component */ SENSOR_TYPE_HDD = 0x04000, @@ -54,9 +49,15 @@ enum psensor_type { SENSOR_TYPE_GPU = 0x10000, SENSOR_TYPE_FAN = 0x20000, + SENSOR_TYPE_GRAPHICS = 0x40000, + SENSOR_TYPE_VIDEO = 0x80000, + SENSOR_TYPE_PCIE = 0x100000, + SENSOR_TYPE_MEMORY = 0x200000, + SENSOR_TYPE_AMBIENT = 0x400000, + /* Combinations */ SENSOR_TYPE_HDD_TEMP = (SENSOR_TYPE_HDD | SENSOR_TYPE_TEMP), - SENSOR_TYPE_CPU_USAGE = (SENSOR_TYPE_CPU | SENSOR_TYPE_USAGE) + SENSOR_TYPE_CPU_USAGE = (SENSOR_TYPE_CPU | SENSOR_TYPE_PERCENT) }; struct psensor { @@ -69,58 +70,44 @@ struct psensor { /* Name of the chip. */ char *chip; - /* lm-sensor */ - const sensors_chip_name *iname; - const sensors_feature *feature; - /* Maximum length of 'values' */ int values_max_length; - /* Last registered measures of the sensor. Index 0 for the - oldest measure. */ + /* + * Last registered measures of the sensor. Index 0 for the + * oldest measure. + */ struct measure *measures; - /* Color of the sensor used for the graph */ - struct color *color; - - /* Whether the graph sensor is displayed. */ - bool graph_enabled; - /* see psensor_type */ unsigned int type; - /* The maximum detected value of the sensor */ double max; - /* The minimum detected value of the sensor */ double min; - /* Whether alarm alert is enabled for this sensor */ - bool alarm_enabled; + /* The highest value detected during this session. */ + double sess_highest; - int alarm_high_threshold; - int alarm_low_threshold; + /* The lowest value detected during this session. */ + double sess_lowest; + + double alarm_high_threshold; + double alarm_low_threshold; /* Whether an alarm is raised for this sensor */ - unsigned int alarm_raised; + bool alarm_raised; - void (*cb_alarm_raised) (struct psensor *, void *); + void (*cb_alarm_raised)(struct psensor *, void *); void *cb_alarm_raised_data; -#ifdef HAVE_NVIDIA - /* Nvidia id for the nvctrl */ - int nvidia_id; -#endif #ifdef HAVE_LIBATIADL /* AMD id for the aticonfig */ int amd_id; #endif -#ifdef HAVE_ATASMART - SkDisk *disk; -#endif - char *url; - bool appindicator_enabled; + void *provider_data; + void (*provider_data_free_fct)(void *); }; struct psensor *psensor_create(char *id, @@ -136,18 +123,10 @@ void psensor_free(struct psensor *sensor); void psensor_list_free(struct psensor **sensors); int psensor_list_size(struct psensor **sensors); -struct psensor **psensor_list_filter_graph_enabled(struct psensor **); - struct psensor *psensor_list_get_by_id(struct psensor **sensors, const char *id); -/* - Return 1 if there is at least one sensor of a given type, else - returns 0 */ -int psensor_list_contains_type(struct psensor **sensors, unsigned int type); - int is_temp_type(unsigned int type); -int is_fan_type(unsigned int type); double get_min_temp(struct psensor **sensors); double get_max_temp(struct psensor **sensors); @@ -156,30 +135,24 @@ double get_min_rpm(struct psensor **sensors); double get_max_rpm(struct psensor **sensors); /* - Get the maximal current value of all sensors of a given type. -*/ -double -psensor_get_max_current_value(struct psensor **sensors, unsigned int type); - -/* - Converts the value of a sensor to a string. - - parameter 'type' is SENSOR_TYPE_LMSENSOR_TEMP, SENSOR_TYPE_NVIDIA, - or SENSOR_TYPE_LMSENSOR_FAN -*/ + * Converts the value of a sensor to a string. + * + * parameter 'type' is SENSOR_TYPE_LMSENSOR_TEMP, SENSOR_TYPE_NVIDIA, + * or SENSOR_TYPE_LMSENSOR_FAN + */ char *psensor_value_to_str(unsigned int type, double value, - int use_celcius); + int use_celsius); char *psensor_measure_to_str(const struct measure *m, unsigned int type, - unsigned int use_celcius); - -struct psensor **get_all_sensors(int use_libatasmart, int values_max_length); + unsigned int use_celsius); struct psensor **psensor_list_add(struct psensor **sensors, struct psensor *sensor); +void psensor_list_append(struct psensor ***sensors, struct psensor *sensor); + struct psensor **psensor_list_copy(struct psensor **); void psensor_set_current_value(struct psensor *sensor, double value); @@ -190,24 +163,13 @@ double psensor_get_current_value(const struct psensor *); struct measure *psensor_get_current_measure(struct psensor *sensor); -/* - Returns a string representation of a psensor type. -*/ +/* Returns a string representation of a psensor type. */ const char *psensor_type_to_str(unsigned int type); -const char *psensor_type_to_unit_str(unsigned int type, int use_celcius); - -void psensor_list_update_measures(struct psensor **sensors); - -void psensor_init(); - -void psensor_cleanup(); +const char *psensor_type_to_unit_str(unsigned int type, int use_celsius); double get_max_value(struct psensor **sensors, int type); -double celcius_to_fahrenheit(double c); -double fahrenheit_to_celcius(double c); - char *psensor_current_value_to_str(const struct psensor *, unsigned int); void psensor_log_measures(struct psensor **sensors);