diff --git a/src/sensors.c b/src/sensors.c
index 544afd1b37e256dfb87b1e2becba6738a70673ff..a30549fea5ebf1b8dcbde4447632b9c8261aa3f1 100644 (file)
--- a/src/sensors.c
+++ b/src/sensors.c
#if defined(HAVE_SENSORS_SENSORS_H)
# include <sensors/sensors.h>
-#else
-# undef HAVE_LIBSENSORS
#endif
-#if defined(HAVE_LIBSENSORS)
-# define SENSORS_HAVE_READ 1
-#else
-# define SENSORS_HAVE_READ 0
-#endif
-
-static data_source_t data_source_fanspeed[1] =
-{
- {"value", DS_TYPE_GAUGE, 0, NAN}
-};
-
-static data_set_t fanspeed_ds =
-{
- "fanspeed", 1, data_source_fanspeed
-};
-
-static data_source_t data_source_temperature[1] =
-{
- {"value", DS_TYPE_GAUGE, -273.15, NAN}
-};
-
-static data_set_t temperature_ds =
-{
- "temperature", 1, data_source_temperature
-};
-
-static data_source_t data_source_voltage[1] =
-{
- {"value", DS_TYPE_GAUGE, NAN, NAN}
-};
-
-static data_set_t voltage_ds =
-{
- "voltage", 1, data_source_voltage
-};
-
-#if SENSORS_HAVE_READ
#define SENSOR_TYPE_VOLTAGE 0
#define SENSOR_TYPE_FANSPEED 1
#define SENSOR_TYPE_TEMPERATURE 2
{ "3.3V", SENSOR_TYPE_VOLTAGE },
{ "2.5V", SENSOR_TYPE_VOLTAGE },
{ "2.0V", SENSOR_TYPE_VOLTAGE },
- { "12V", SENSOR_TYPE_VOLTAGE },
- { (char *) 0, SENSOR_TYPE_UNKNOWN }
+ { "12V", SENSOR_TYPE_VOLTAGE }
};
+static int known_features_num = STATIC_ARRAY_SIZE (known_features);
/* end new naming */
static const char *config_keys[] =
first_feature = NULL;
}
-static void sensors_load_conf (void)
+static int sensors_load_conf (void)
{
FILE *fh;
featurelist_t *last_feature = NULL;
if ((sensors_config_mtime != 0)
&& (sensors_config_mtime == statbuf.st_mtime))
- return;
+ return (0);
if (sensors_config_mtime != 0)
{
char errbuf[1024];
ERROR ("sensors plugin: fopen(%s) failed: %s", conffile,
sstrerror (errno, errbuf, sizeof (errbuf)));
- return;
+ return (-1);
}
status = sensors_init (fh);
{
ERROR ("sensors plugin: Cannot initialize sensors. "
"Data will not be collected.");
- return;
+ return (-1);
}
sensors_config_mtime = statbuf.st_mtime;
continue;
/* Only known features */
- for (i = 0; known_features[i].type >= 0; i++)
+ for (i = 0; i < known_features_num; i++)
{
if (strcmp (data->name, known_features[i].label) != 0)
continue;
sensors_cleanup ();
INFO ("sensors plugin: lm_sensors reports no "
"features. Data will not be collected.");
+ return (-1);
}
-} /* void sensors_load_conf */
+
+ return (0);
+} /* int sensors_load_conf */
static int sensors_shutdown (void)
{
const char *type, const char *type_instance,
double val)
{
+ char match_key[1024];
+ int status;
+
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
- if (ignorelist_match (sensor_list, type_instance))
+ status = snprintf (match_key, sizeof (match_key), "%s/%s-%s",
+ plugin_instance, type, type_instance);
+ if ((status < 1) || (status >= sizeof (match_key)))
return;
+ match_key[sizeof (match_key) - 1] = '\0';
+
+ if (sensor_list != NULL)
+ {
+ DEBUG ("sensors plugin: Checking ignorelist for `%s'", match_key);
+ if (ignorelist_match (sensor_list, match_key))
+ return;
+ }
values[0].gauge = val;
char plugin_instance[DATA_MAX_NAME_LEN];
char type_instance[DATA_MAX_NAME_LEN];
- sensors_load_conf ();
+ if (sensors_load_conf () != 0)
+ return (-1);
for (feature = first_feature; feature != NULL; feature = feature->next)
{
return (0);
} /* int sensors_read */
-#endif /* SENSORS_HAVE_READ */
void module_register (void)
{
- plugin_register_data_set (&fanspeed_ds);
- plugin_register_data_set (&temperature_ds);
- plugin_register_data_set (&voltage_ds);
-
-#if SENSORS_HAVE_READ
plugin_register_config ("sensors", sensors_config,
config_keys, config_keys_num);
plugin_register_read ("sensors", sensors_read);
plugin_register_shutdown ("sensors", sensors_shutdown);
-#endif
} /* void module_register */