X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=97549ac4bd2e8d9d8a363289ae1a6b80047fb612;hb=fa1395301c20b43c9b044fa08af3ceb17882fa6a;hp=b589c035ebf86c2935aa497db45a33c32a2bd544;hpb=8a3d16ade26321374c684080d627cf12ba71e598;p=psensor.git

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index b589c03..97549ac 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -25,14 +25,8 @@
 
 #include <hdd.h>
 #include <psensor.h>
-#include <lmsensor.h>
 #include <temperature.h>
 
-#ifdef HAVE_GTOP
-#include <cpu.h>
-#include <pmem.h>
-#endif
-
 struct psensor *psensor_create(char *id,
 			       char *name,
 			       char *chip,
@@ -69,6 +63,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;
 }
 
@@ -95,26 +92,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)
@@ -408,44 +409,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) {
@@ -511,24 +474,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)
@@ -543,12 +488,10 @@ 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)