X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.h;h=37891c36d216b41ddd6f66145ae6a144a91ecf4c;hb=850c80cb3c81b5bd24245ebf98165a98e47baa71;hp=9d816d8203803224e06c6e57558695afedd8c136;hpb=89f933625c13ceb825059b5499484de9664e0d2e;p=psensor.git diff --git a/src/lib/psensor.h b/src/lib/psensor.h index 9d816d8..37891c3 100644 --- a/src/lib/psensor.h +++ b/src/lib/psensor.h @@ -1,40 +1,69 @@ /* - Copyright (C) 2010-2011 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 -*/ - + * Copyright (C) 2010-2014 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 + */ #ifndef _PSENSOR_PSENSOR_H_ #define _PSENSOR_PSENSOR_H_ -#include "config.h" #include +#include "config.h" +#ifdef HAVE_ATASMART +#include +#endif + +#include "bool.h" #include "color.h" +#include #include "measure.h" enum psensor_type { - SENSOR_TYPE_TEMP = 0x0001, - SENSOR_TYPE_FAN = 0x0002, - SENSOR_TYPE_REMOTE = 0x0004, - - SENSOR_TYPE_LMSENSOR_TEMP = 0x0100 | SENSOR_TYPE_TEMP, - SENSOR_TYPE_NVIDIA = 0x0200 | SENSOR_TYPE_TEMP, - SENSOR_TYPE_HDD_TEMP = 0x0300 | SENSOR_TYPE_TEMP, - SENSOR_TYPE_LMSENSOR_FAN = 0x0400 | SENSOR_TYPE_FAN + /* type of sensor values */ + SENSOR_TYPE_TEMP = 0x00001, + SENSOR_TYPE_RPM = 0x00002, + SENSOR_TYPE_PERCENT = 0x00004, + + /* Whether the sensor is remote */ + SENSOR_TYPE_REMOTE = 0x00008, + + /* Libraries used for retrieving sensor information */ + SENSOR_TYPE_LMSENSOR = 0x00100, + SENSOR_TYPE_NVCTRL = 0x00200, + SENSOR_TYPE_GTOP = 0x00400, + SENSOR_TYPE_ATIADL = 0x00800, + SENSOR_TYPE_ATASMART = 0x01000, + SENSOR_TYPE_HDDTEMP = 0x02000, + SENSOR_TYPE_UDISKS2 = 0x800000, + + /* Type of HW component */ + SENSOR_TYPE_HDD = 0x04000, + SENSOR_TYPE_CPU = 0x08000, + 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_PERCENT) }; struct psensor { @@ -44,22 +73,26 @@ struct psensor { /* Uniq id of the sensor */ char *id; + /* 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. */ + * oldest measure. */ struct measure *measures; /* Color of the sensor used for the graph */ struct color *color; - /* Whether the sensor is displayed in the graph */ - int enabled; + /* Whether the graph sensor is displayed. */ + bool graph_enabled; /* see psensor_type */ unsigned int type; @@ -70,34 +103,38 @@ struct psensor { /* The minimum detected value of the sensor */ double min; - /* - Whether alarm alerts is enabled for this sensor - */ - int alarm_enabled; + /* Whether alarm alert is enabled for this sensor */ + bool alarm_enabled; - /* - An alarm is raised if the current sensor value is bigger. 0 - means no limit - */ - double alarm_limit; + int alarm_high_threshold; + int alarm_low_threshold; - /* Whether the current value is bigger than 'alarm_limit'. */ - int alarm_raised; + /* Whether an alarm is raised for this sensor */ + unsigned int 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; +#ifdef HAVE_LIBATIADL + /* AMD id for the aticonfig */ + int amd_id; +#endif +#ifdef HAVE_ATASMART + SkDisk *disk; #endif + void *provider_data; + void (*provider_data_free_fct)(void *); + char *url; + bool appindicator_enabled; }; struct psensor *psensor_create(char *id, - char *name, unsigned int type, + char *name, + char *chip, + unsigned int type, int values_max_length); void psensor_values_resize(struct psensor *s, int new_size); @@ -107,16 +144,12 @@ 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); @@ -124,40 +157,50 @@ double get_max_temp(struct psensor **sensors); 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. -*/ +/* 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. + * 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_celsius); - parameter 'type' is SENSOR_TYPE_LMSENSOR_TEMP, SENSOR_TYPE_NVIDIA, - or SENSOR_TYPE_LMSENSOR_FAN -*/ -char *psensor_value_to_string(unsigned int type, double value); +char *psensor_measure_to_str(const struct measure *m, + unsigned int type, + unsigned int use_celsius); -struct psensor **get_all_sensors(int values_max_length); +struct psensor **get_all_sensors(int use_libatasmart, int values_max_length); 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); void psensor_set_current_measure(struct psensor *sensor, double value, struct timeval tv); -double psensor_get_current_value(struct psensor *sensor); +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); +const char *psensor_type_to_unit_str(unsigned int type, int use_celsius); + +double get_max_value(struct psensor **sensors, int type); + +char *psensor_current_value_to_str(const struct psensor *, unsigned int); -void psensor_list_update_measures(struct psensor **sensors); +void psensor_log_measures(struct psensor **sensors); #endif