X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsensors.c;h=ff8b580de0a688e51bf6e02c6541de1d636b54ca;hb=2403dd00be7ee359a1da567ec1a3d1dddf179a58;hp=290ddd289541211e06539a5f4b77b716b151c564;hpb=403e429f70e11ac11b6d5af174322b01e45b810a;p=collectd.git

diff --git a/src/sensors.c b/src/sensors.c
index 290ddd28..ff8b580d 100644
--- a/src/sensors.c
+++ b/src/sensors.c
@@ -81,6 +81,7 @@ static char *extended_filename_format = "lm_sensors-%s.rrd";
 #define SENSOR_TYPE_FANSPEED 2
 #define SENSOR_TYPE_TEMPERATURE 3
 
+#if SENSORS_HAVE_READ
 static char *sensor_type_prefix[] =
 {
 	"unknown",
@@ -89,6 +90,7 @@ static char *sensor_type_prefix[] =
 	"temperature",
 	NULL
 };
+#endif
 
 typedef struct sensors_labeltypes {
 	char *label;
@@ -98,6 +100,7 @@ typedef struct sensors_labeltypes {
 /*
  * finite list of known labels extracted from lm_sensors
  */
+#if SENSORS_HAVE_READ
 static sensors_labeltypes known_features[] = 
 {
 	{ "fan1", SENSOR_TYPE_FANSPEED },
@@ -154,6 +157,7 @@ static sensors_labeltypes known_features[] =
 	{ "12V", SENSOR_TYPE_VOLTAGE },
 	{ 0, -1 }
 };
+#endif
 /* end new naming */
 
 static char *config_keys[] =
@@ -174,7 +178,7 @@ static ignorelist_t *sensor_list;
  */
 static int sensor_extended_naming = 0;
 
-#ifdef HAVE_LIBSENSORS
+#if SENSORS_HAVE_READ
 typedef struct featurelist
 {
 	const sensors_chip_name    *chip;
@@ -184,7 +188,7 @@ typedef struct featurelist
 } featurelist_t;
 
 featurelist_t *first_feature = NULL;
-#endif /* defined (HAVE_LIBSENSORS) */
+#endif /* if SENSORS_HAVE_READ */
 
 static int sensors_config (char *key, char *value)
 {
@@ -226,7 +230,7 @@ static int sensors_config (char *key, char *value)
 
 static void collectd_sensors_init (void)
 {
-#ifdef HAVE_LIBSENSORS
+#if SENSORS_HAVE_READ
 	FILE *fh;
 	featurelist_t *last_feature = NULL;
 	featurelist_t *new_feature;
@@ -326,11 +330,30 @@ static void collectd_sensors_init (void)
 
 	if (first_feature == NULL)
 		sensors_cleanup ();
-#endif /* defined(HAVE_LIBSENSORS) */
+#endif /* if SENSORS_HAVE_READ */
 
 	return;
 }
 
+static void sensors_shutdown (void)
+{
+#if SENSORS_HAVE_READ
+	featurelist_t *thisft = first_feature;
+	featurelist_t *nextft;
+
+	while (thisft != NULL)
+	{
+		nextft = thisft->next;
+		sfree (thisft);
+		thisft = nextft;
+	}
+
+	sensors_cleanup ();
+#endif /* if SENSORS_HAVE_READ */
+
+	ignorelist_free (sensor_list);
+}
+
 static void sensors_voltage_write (char *host, char *inst, char *val)
 {
 	char file[BUFSIZE];
@@ -470,6 +493,7 @@ void module_register (void)
 {
 	plugin_register (MODULE_NAME, collectd_sensors_init, sensors_read, sensors_write);
 	plugin_register (MODULE_NAME_VOLTAGE, NULL, NULL, sensors_voltage_write);
+	plugin_register_shutdown (MODULE_NAME, sensors_shutdown);
 	cf_register (MODULE_NAME, sensors_config, config_keys, config_keys_num);
 }