X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetapp.c;h=edae48a4fba52fa29cd54a822abe07c1d946e871;hb=b6837fb99c8aead728c74b85f15178f5fee37482;hp=ce182e458da54244ff309622b9908a2db01d83c9;hpb=41ddd132cde95c42a7efb6832b8b1c8d8831dc83;p=collectd.git

diff --git a/src/netapp.c b/src/netapp.c
index ce182e45..edae48a4 100644
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -29,6 +29,8 @@
 
 #include <netapp_api.h>
 
+#define HAS_ALL_FLAGS(has,needs) (((has) & (needs)) == (needs))
+
 typedef struct host_config_s host_config_t;
 typedef void service_handler_t(host_config_t *host, na_elem_t *result, void *data);
 
@@ -44,45 +46,58 @@ typedef void service_handler_t(host_config_t *host, na_elem_t *result, void *dat
 
 typedef struct {
 	uint32_t flags;
-	uint64_t last_cpu_busy;
-	uint64_t last_cpu_total;
 } perf_system_data_t;
 
 /*!
  * \brief Persistent data for WAFL performence counters. (a.k.a. cache performence)
  */
 
-#define PERF_WAFL_NAME_CACHE       0x01
-#define PERF_WAFL_DIR_CACHE        0x02
-#define PERF_WAFL_BUF_CACHE        0x04
-#define PERF_WAFL_INODE_CACHE      0x08
-#define PERF_WAFL_ALL              0x0F
+#define CFG_WAFL_NAME_CACHE       0x01
+#define CFG_WAFL_DIR_CACHE        0x02
+#define CFG_WAFL_BUF_CACHE        0x04
+#define CFG_WAFL_INODE_CACHE      0x08
+#define CFG_WAFL_ALL              0x0F
+
+#define HAVE_WAFL_NAME_CACHE_HIT   0x0100
+#define HAVE_WAFL_NAME_CACHE_MISS  0x0200
+#define HAVE_WAFL_NAME_CACHE       (HAVE_WAFL_NAME_CACHE_HIT | HAVE_WAFL_NAME_CACHE_MISS)
+#define HAVE_WAFL_FIND_DIR_HIT     0x0400
+#define HAVE_WAFL_FIND_DIR_MISS    0x0800
+#define HAVE_WAFL_FIND_DIR         (HAVE_WAFL_FIND_DIR_HIT | HAVE_WAFL_FIND_DIR_MISS)
+#define HAVE_WAFL_BUF_HASH_HIT     0x1000
+#define HAVE_WAFL_BUF_HASH_MISS    0x2000
+#define HAVE_WAFL_BUF_HASH         (HAVE_WAFL_BUF_HASH_HIT | HAVE_WAFL_BUF_HASH_MISS)
+#define HAVE_WAFL_INODE_CACHE_HIT  0x4000
+#define HAVE_WAFL_INODE_CACHE_MISS 0x8000
+#define HAVE_WAFL_INODE_CACHE      (HAVE_WAFL_INODE_CACHE_HIT | HAVE_WAFL_INODE_CACHE_MISS)
+#define HAVE_WAFL_ALL              0xff00
 
 typedef struct {
 	uint32_t flags;
-	uint64_t last_name_cache_hit;
-	uint64_t last_name_cache_miss;
-	uint64_t last_find_dir_hit;
-	uint64_t last_find_dir_miss;
-	uint64_t last_buf_hash_hit;
-	uint64_t last_buf_hash_miss;
-	uint64_t last_inode_cache_hit;
-	uint64_t last_inode_cache_miss;
+	time_t timestamp;
+	uint64_t name_cache_hit;
+	uint64_t name_cache_miss;
+	uint64_t find_dir_hit;
+	uint64_t find_dir_miss;
+	uint64_t buf_hash_hit;
+	uint64_t buf_hash_miss;
+	uint64_t inode_cache_hit;
+	uint64_t inode_cache_miss;
 } perf_wafl_data_t;
 
-#define PERF_VOLUME_INIT           0x01
-#define PERF_VOLUME_IO             0x02
-#define PERF_VOLUME_OPS            0x03
-#define PERF_VOLUME_LATENCY        0x08
-#define PERF_VOLUME_ALL            0x0F
+#define CFG_VOLUME_PERF_INIT           0x0001
+#define CFG_VOLUME_PERF_IO             0x0002
+#define CFG_VOLUME_PERF_OPS            0x0003
+#define CFG_VOLUME_PERF_LATENCY        0x0008
+#define CFG_VOLUME_PERF_ALL            0x000F
 
 typedef struct {
 	uint32_t flags;
-} perf_volume_data_t;
+} cfg_volume_perf_t;
 
 typedef struct {
 	uint32_t flags;
-} volume_data_t;
+} cfg_volume_data_t;
 
 #define PERF_DISK_BUSIEST          0x01
 #define PERF_DISK_ALL              0x01
@@ -91,13 +106,22 @@ typedef struct {
 	uint32_t flags;
 } perf_disk_data_t;
 
+#define HAVE_VOLUME_PERF_BYTES_READ    0x0010
+#define HAVE_VOLUME_PERF_BYTES_WRITE   0x0020
+#define HAVE_VOLUME_PERF_OPS_READ      0x0040
+#define HAVE_VOLUME_PERF_OPS_WRITE     0x0080
+#define HAVE_VOLUME_PERF_LATENCY_READ  0x0100
+#define HAVE_VOLUME_PERF_LATENCY_WRITE 0x0200
+#define HAVE_VOLUME_PERF_ALL           0x03F0
 typedef struct {
 	uint32_t flags;
-	time_t last_timestamp;
-	uint64_t last_read_latency;
-	uint64_t last_write_latency;
-	uint64_t last_read_ops;
-	uint64_t last_write_ops;
+	time_t timestamp;
+	uint64_t read_bytes;
+	uint64_t write_bytes;
+	uint64_t read_ops;
+	uint64_t write_ops;
+	uint64_t read_latency;
+	uint64_t write_latency;
 } per_volume_perf_data_t;
 
 #define VOLUME_INIT           0x01
@@ -168,23 +192,44 @@ struct host_config_s {
 
 static host_config_t *host_config;
 
-static volume_t *get_volume (host_config_t *host, const char *name) /* {{{ */
+static volume_t *get_volume (host_config_t *host, const char *name, /* {{{ */
+		uint32_t vol_data_flags, uint32_t vol_perf_flags)
 {
 	volume_t *v;
 
 	if (name == NULL)
 		return (NULL);
 	
+	/* Make sure the default flags include the init-bit. */
+	if (vol_data_flags != 0)
+		vol_data_flags |= VOLUME_INIT;
+	if (vol_perf_flags != 0)
+		vol_perf_flags |= CFG_VOLUME_PERF_INIT;
+
 	for (v = host->volumes; v; v = v->next) {
-		if (strcmp(v->name, name) == 0)
-			return v;
+		if (strcmp(v->name, name) != 0)
+			continue;
+
+		/* Check if the flags have been initialized. */
+		if (((v->volume_data.flags & VOLUME_INIT) == 0)
+				&& (vol_data_flags != 0))
+			v->volume_data.flags = vol_data_flags;
+		if (((v->perf_data.flags & CFG_VOLUME_PERF_INIT) == 0)
+				&& (vol_perf_flags != 0))
+			v->perf_data.flags = vol_perf_flags;
+
+		return v;
 	}
 
+	DEBUG ("netapp plugin: Allocating new entry for volume %s.", name);
 	v = malloc(sizeof(*v));
 	if (v == NULL)
 		return (NULL);
 	memset (v, 0, sizeof (*v));
 
+	v->volume_data.flags = vol_data_flags;
+	v->perf_data.flags = vol_perf_flags;
+
 	v->name = strdup(name);
 	if (v->name == NULL) {
 		sfree (v);
@@ -277,6 +322,19 @@ static int submit_counter (const char *host, const char *plugin_inst, /* {{{ */
 				&v, 1, timestamp));
 } /* }}} int submit_counter */
 
+static int submit_two_gauge (const char *host, const char *plugin_inst, /* {{{ */
+		const char *type, const char *type_inst, gauge_t val0, gauge_t val1,
+		time_t timestamp)
+{
+	value_t values[2];
+
+	values[0].gauge = val0;
+	values[1].gauge = val1;
+
+	return (submit_values (host, plugin_inst, type, type_inst,
+				values, 2, timestamp));
+} /* }}} int submit_two_gauge */
+
 static int submit_double (const char *host, const char *plugin_inst, /* {{{ */
 		const char *type, const char *type_inst, double d, time_t timestamp)
 {
@@ -293,42 +351,172 @@ static int submit_cache_ratio (const char *host, /* {{{ */
 		const char *type_inst,
 		uint64_t new_hits,
 		uint64_t new_misses,
-		uint64_t *old_hits,
-		uint64_t *old_misses,
+		uint64_t old_hits,
+		uint64_t old_misses,
 		time_t timestamp)
 {
 	value_t v;
 
-	if ((new_hits >= (*old_hits)) && (new_misses >= (*old_misses))) {
+	if ((new_hits >= old_hits) && (new_misses >= old_misses)) {
 		uint64_t hits;
 		uint64_t misses;
 
-		hits = new_hits - (*old_hits);
-		misses = new_misses - (*old_misses);
+		hits = new_hits - old_hits;
+		misses = new_misses - old_misses;
 
 		v.gauge = 100.0 * ((gauge_t) hits) / ((gauge_t) (hits + misses));
 	} else {
 		v.gauge = NAN;
 	}
 
-	*old_hits = new_hits;
-	*old_misses = new_misses;
-
 	return (submit_values (host, plugin_inst, "cache_ratio", type_inst,
 				&v, 1, timestamp));
 } /* }}} int submit_cache_ratio */
 
-static void collect_perf_wafl_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */
+static int submit_wafl_data (const host_config_t *host, const char *instance, /* {{{ */
+		perf_wafl_data_t *old_data, const perf_wafl_data_t *new_data)
+{
+	/* Submit requested counters */
+	if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_NAME_CACHE | HAVE_WAFL_NAME_CACHE)
+			&& HAS_ALL_FLAGS (new_data->flags, HAVE_WAFL_NAME_CACHE))
+		submit_cache_ratio (host->name, instance, "name_cache_hit",
+				new_data->name_cache_hit, new_data->name_cache_miss,
+				old_data->name_cache_hit, old_data->name_cache_miss,
+				new_data->timestamp);
+
+	if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_DIR_CACHE | HAVE_WAFL_FIND_DIR)
+			&& HAS_ALL_FLAGS (new_data->flags, HAVE_WAFL_FIND_DIR))
+		submit_cache_ratio (host->name, instance, "find_dir_hit",
+				new_data->find_dir_hit, new_data->find_dir_miss,
+				old_data->find_dir_hit, old_data->find_dir_miss,
+				new_data->timestamp);
+
+	if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_BUF_CACHE | HAVE_WAFL_BUF_HASH)
+			&& HAS_ALL_FLAGS (new_data->flags, HAVE_WAFL_BUF_HASH))
+		submit_cache_ratio (host->name, instance, "buf_hash_hit",
+				new_data->buf_hash_hit, new_data->buf_hash_miss,
+				old_data->buf_hash_hit, old_data->buf_hash_miss,
+				new_data->timestamp);
+
+	if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_INODE_CACHE | HAVE_WAFL_INODE_CACHE)
+			&& HAS_ALL_FLAGS (new_data->flags, HAVE_WAFL_INODE_CACHE))
+		submit_cache_ratio (host->name, instance, "inode_cache_hit",
+				new_data->inode_cache_hit, new_data->inode_cache_miss,
+				old_data->inode_cache_hit, old_data->inode_cache_miss,
+				new_data->timestamp);
+
+	/* Clear old HAVE_* flags */
+	old_data->flags &= ~HAVE_WAFL_ALL;
+
+	/* Copy all counters */
+	old_data->timestamp        = new_data->timestamp;
+	old_data->name_cache_hit   = new_data->name_cache_hit;
+	old_data->name_cache_miss  = new_data->name_cache_miss;
+	old_data->find_dir_hit     = new_data->find_dir_hit;
+	old_data->find_dir_miss    = new_data->find_dir_miss;
+	old_data->buf_hash_hit     = new_data->buf_hash_hit;
+	old_data->buf_hash_miss    = new_data->buf_hash_miss;
+	old_data->inode_cache_hit  = new_data->inode_cache_hit;
+	old_data->inode_cache_miss = new_data->inode_cache_miss;
+
+	/* Copy HAVE_* flags */
+	old_data->flags |= (new_data->flags & HAVE_WAFL_ALL);
+
+	return (0);
+} /* }}} int submit_wafl_data */
+
+static int submit_volume_perf_data (const host_config_t *host, /* {{{ */
+		volume_t *volume,
+		const per_volume_perf_data_t *new_data)
+{
+	/* Check for and submit disk-octet values */
+	if (HAS_ALL_FLAGS (volume->perf_data.flags, CFG_VOLUME_PERF_IO)
+			&& HAS_ALL_FLAGS (new_data->flags, HAVE_VOLUME_PERF_BYTES_READ | HAVE_VOLUME_PERF_BYTES_WRITE))
+	{
+		submit_two_counters (host->name, volume->name, "disk_octets", /* type instance = */ NULL,
+				(counter_t) new_data->read_bytes, (counter_t) new_data->write_bytes, new_data->timestamp);
+	}
+
+	/* Check for and submit disk-operations values */
+	if (HAS_ALL_FLAGS (volume->perf_data.flags, CFG_VOLUME_PERF_OPS)
+			&& HAS_ALL_FLAGS (new_data->flags, HAVE_VOLUME_PERF_OPS_READ | HAVE_VOLUME_PERF_OPS_WRITE))
+	{
+		submit_two_counters (host->name, volume->name, "disk_ops", /* type instance = */ NULL,
+				(counter_t) new_data->read_ops, (counter_t) new_data->write_ops, new_data->timestamp);
+	}
+
+	/* Check for, calculate and submit disk-latency values */
+	if (HAS_ALL_FLAGS (volume->perf_data.flags, CFG_VOLUME_PERF_LATENCY
+				| HAVE_VOLUME_PERF_OPS_READ | HAVE_VOLUME_PERF_OPS_WRITE
+				| HAVE_VOLUME_PERF_LATENCY_READ | HAVE_VOLUME_PERF_LATENCY_WRITE)
+			&& HAS_ALL_FLAGS (new_data->flags, HAVE_VOLUME_PERF_OPS_READ | HAVE_VOLUME_PERF_OPS_WRITE
+				| HAVE_VOLUME_PERF_LATENCY_READ | HAVE_VOLUME_PERF_LATENCY_WRITE))
+	{
+		gauge_t latency_per_op_read;
+		gauge_t latency_per_op_write;
+
+		latency_per_op_read = NAN;
+		latency_per_op_write = NAN;
+
+		/* Check if a counter wrapped around. */
+		if ((new_data->read_ops > volume->perf_data.read_ops)
+				&& (new_data->read_latency > volume->perf_data.read_latency))
+		{
+			uint64_t diff_ops_read;
+			uint64_t diff_latency_read;
+
+			diff_ops_read = new_data->read_ops - volume->perf_data.read_ops;
+			diff_latency_read = new_data->read_latency - volume->perf_data.read_latency;
+
+			if (diff_ops_read > 0)
+				latency_per_op_read = ((gauge_t) diff_latency_read) / ((gauge_t) diff_ops_read);
+		}
+
+		if ((new_data->write_ops > volume->perf_data.write_ops)
+				&& (new_data->write_latency > volume->perf_data.write_latency))
+		{
+			uint64_t diff_ops_write;
+			uint64_t diff_latency_write;
+
+			diff_ops_write = new_data->write_ops - volume->perf_data.write_ops;
+			diff_latency_write = new_data->write_latency - volume->perf_data.write_latency;
+
+			if (diff_ops_write > 0)
+				latency_per_op_write = ((gauge_t) diff_latency_write) / ((gauge_t) diff_ops_write);
+		}
+
+		submit_two_gauge (host->name, volume->name, "disk_latency", /* type instance = */ NULL,
+				latency_per_op_read, latency_per_op_write, new_data->timestamp);
+	}
+
+	/* Clear all HAVE_* flags. */
+	volume->perf_data.flags &= ~HAVE_VOLUME_PERF_ALL;
+
+	/* Copy all counters */
+	volume->perf_data.timestamp = new_data->timestamp;
+	volume->perf_data.read_bytes = new_data->read_bytes;
+	volume->perf_data.write_bytes = new_data->write_bytes;
+	volume->perf_data.read_ops = new_data->read_ops;
+	volume->perf_data.write_ops = new_data->write_ops;
+	volume->perf_data.read_latency = new_data->read_latency;
+	volume->perf_data.write_latency = new_data->write_latency;
+
+	/* Copy the HAVE_* flags */
+	volume->perf_data.flags |= (new_data->flags & HAVE_VOLUME_PERF_ALL);
+
+	return (0);
+} /* }}} int submit_volume_perf_data */
+
+static void query_wafl_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */
 	perf_wafl_data_t *wafl = data;
-	uint64_t name_cache_hit  = 0,  name_cache_miss  = 0;
-	uint64_t find_dir_hit    = 0,  find_dir_miss    = 0;
-	uint64_t buf_hash_hit    = 0,  buf_hash_miss    = 0;
-	uint64_t inode_cache_hit = 0,  inode_cache_miss = 0;
+	perf_wafl_data_t perf_data;
 	const char *plugin_inst;
-	time_t timestamp;
 	na_elem_t *counter;
+
+	memset (&perf_data, 0, sizeof (perf_data));
 	
-	timestamp = (time_t) na_child_get_uint64(out, "timestamp", 0);
+	perf_data.timestamp = (time_t) na_child_get_uint64(out, "timestamp", 0);
+
 	out = na_elem_child(na_elem_child(out, "instances"), "instance-data");
 	plugin_inst = na_child_get_string(out, "name");
 
@@ -336,57 +524,47 @@ static void collect_perf_wafl_data(host_config_t *host, na_elem_t *out, void *da
 	na_elem_iter_t iter = na_child_iterator(na_elem_child(out, "counters"));
 	for (counter = na_iterator_next(&iter); counter; counter = na_iterator_next(&iter)) {
 		const char *name;
+		uint64_t value;
 
 		name = na_child_get_string(counter, "name");
-		if (!strcmp(name, "name_cache_hit"))
-			name_cache_hit = na_child_get_uint64(counter, "value", UINT64_MAX);
-		else if (!strcmp(name, "name_cache_miss"))
-			name_cache_miss = na_child_get_uint64(counter, "value", UINT64_MAX);
-		else if (!strcmp(name, "find_dir_hit"))
-			find_dir_hit = na_child_get_uint64(counter, "value", UINT64_MAX);
-		else if (!strcmp(name, "find_dir_miss"))
-			find_dir_miss = na_child_get_uint64(counter, "value", UINT64_MAX);
-		else if (!strcmp(name, "buf_hash_hit"))
-			buf_hash_hit = na_child_get_uint64(counter, "value", UINT64_MAX);
-		else if (!strcmp(name, "buf_hash_miss"))
-			buf_hash_miss = na_child_get_uint64(counter, "value", UINT64_MAX);
-		else if (!strcmp(name, "inode_cache_hit"))
-			inode_cache_hit = na_child_get_uint64(counter, "value", UINT64_MAX);
-		else if (!strcmp(name, "inode_cache_miss"))
-			inode_cache_miss = na_child_get_uint64(counter, "value", UINT64_MAX);
-		else
+		if (name == NULL)
+			continue;
+
+		value = na_child_get_uint64(counter, "value", UINT64_MAX);
+		if (value == UINT64_MAX)
+			continue;
+
+		if (!strcmp(name, "name_cache_hit")) {
+			perf_data.name_cache_hit = value;
+			perf_data.flags |= HAVE_WAFL_NAME_CACHE_HIT;
+		} else if (!strcmp(name, "name_cache_miss")) {
+			perf_data.name_cache_miss = value;
+			perf_data.flags |= HAVE_WAFL_NAME_CACHE_MISS;
+		} else if (!strcmp(name, "find_dir_hit")) {
+			perf_data.find_dir_hit = value;
+			perf_data.flags |= HAVE_WAFL_FIND_DIR_HIT;
+		} else if (!strcmp(name, "find_dir_miss")) {
+			perf_data.find_dir_miss = value;
+			perf_data.flags |= HAVE_WAFL_FIND_DIR_MISS;
+		} else if (!strcmp(name, "buf_hash_hit")) {
+			perf_data.buf_hash_hit = value;
+			perf_data.flags |= HAVE_WAFL_BUF_HASH_HIT;
+		} else if (!strcmp(name, "buf_hash_miss")) {
+			perf_data.buf_hash_miss = value;
+			perf_data.flags |= HAVE_WAFL_BUF_HASH_MISS;
+		} else if (!strcmp(name, "inode_cache_hit")) {
+			perf_data.inode_cache_hit = value;
+			perf_data.flags |= HAVE_WAFL_INODE_CACHE_HIT;
+		} else if (!strcmp(name, "inode_cache_miss")) {
+			perf_data.inode_cache_miss = value;
+			perf_data.flags |= HAVE_WAFL_INODE_CACHE_MISS;
+		} else {
 			DEBUG("netapp plugin: Found unexpected child: %s", name);
+		}
 	}
 
-	/* Submit requested counters */
-	if ((wafl->flags & PERF_WAFL_NAME_CACHE)
-			&& (name_cache_hit != UINT64_MAX) && (name_cache_miss != UINT64_MAX))
-		submit_cache_ratio (host->name, plugin_inst, "name_cache_hit",
-				name_cache_hit, name_cache_miss,
-				&wafl->last_name_cache_hit, &wafl->last_name_cache_miss,
-				timestamp);
-
-	if ((wafl->flags & PERF_WAFL_DIR_CACHE)
-			&& (find_dir_hit != UINT64_MAX) && (find_dir_miss != UINT64_MAX))
-		submit_cache_ratio (host->name, plugin_inst, "find_dir_hit",
-				find_dir_hit, find_dir_miss,
-				&wafl->last_find_dir_hit, &wafl->last_find_dir_miss,
-				timestamp);
-
-	if ((wafl->flags & PERF_WAFL_BUF_CACHE)
-			&& (buf_hash_hit != UINT64_MAX) && (buf_hash_miss != UINT64_MAX))
-		submit_cache_ratio (host->name, plugin_inst, "buf_hash_hit",
-				buf_hash_hit, buf_hash_miss,
-				&wafl->last_buf_hash_hit, &wafl->last_buf_hash_miss,
-				timestamp);
-
-	if ((wafl->flags & PERF_WAFL_INODE_CACHE)
-			&& (inode_cache_hit != UINT64_MAX) && (inode_cache_miss != UINT64_MAX))
-		submit_cache_ratio (host->name, plugin_inst, "inode_cache_hit",
-				inode_cache_hit, inode_cache_miss,
-				&wafl->last_inode_cache_hit, &wafl->last_inode_cache_miss,
-				timestamp);
-} /* }}} void collect_perf_wafl_data */
+	submit_wafl_data (host, plugin_inst, wafl, &perf_data);
+} /* }}} void query_wafl_data */
 
 static void collect_perf_disk_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */
 	perf_disk_data_t *perf = data;
@@ -465,7 +643,7 @@ static void collect_perf_disk_data(host_config_t *host, na_elem_t *out, void *da
 static void collect_volume_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */
 	na_elem_t *inst;
 	volume_t *volume;
-	volume_data_t *volume_data = data;
+	cfg_volume_data_t *cfg_volume_data = data;
 
 	out = na_elem_child(out, "volumes");
 	na_elem_iter_t inst_iter = na_child_iterator(out);
@@ -477,13 +655,11 @@ static void collect_volume_data(host_config_t *host, na_elem_t *out, void *data)
 		uint64_t sis_saved_reported;
 		uint64_t sis_saved;
 
-		volume = get_volume(host, na_child_get_string(inst, "name"));
+		volume = get_volume(host, na_child_get_string(inst, "name"),
+				cfg_volume_data->flags, /* perf_flags = */ 0);
 		if (volume == NULL)
 			continue;
 
-		if (!(volume->volume_data.flags & VOLUME_INIT))
-			volume->volume_data.flags = volume_data->flags;
-
 		if (!(volume->volume_data.flags & VOLUME_DF))
 			continue;
 
@@ -566,110 +742,64 @@ static void collect_volume_data(host_config_t *host, na_elem_t *out, void *data)
 	}
 } /* }}} void collect_volume_data */
 
-static void collect_perf_volume_data(host_config_t *host, na_elem_t *out, void *data) {
-	perf_volume_data_t *perf = data;
-	const char *name;
+static void query_volume_perf_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */
+	cfg_volume_perf_t *perf = data;
 	time_t timestamp;
 	na_elem_t *counter, *inst;
-	volume_t *volume;
-	value_t values[2];
-	value_list_t vl = VALUE_LIST_INIT;
 	
 	timestamp = (time_t) na_child_get_uint64(out, "timestamp", 0);
+
 	out = na_elem_child(out, "instances");
 	na_elem_iter_t inst_iter = na_child_iterator(out);
 	for (inst = na_iterator_next(&inst_iter); inst; inst = na_iterator_next(&inst_iter)) {
-		uint64_t read_data = 0, write_data = 0, read_ops = 0, write_ops = 0, read_latency = 0, write_latency = 0;
+		per_volume_perf_data_t perf_data;
+		volume_t *volume;
+
+		memset (&perf_data, 0, sizeof (perf_data));
+		perf_data.timestamp = timestamp;
+
+		volume = get_volume(host, na_child_get_string(inst, "name"),
+				/* data_flags = */ 0, perf->flags);
+		if (volume == NULL)
+			continue;
 
-		volume = get_volume(host, na_child_get_string(inst, "name"));
-		if (!volume->perf_data.flags) {
-			volume->perf_data.flags = perf->flags;
-			volume->perf_data.last_read_latency = volume->perf_data.last_read_ops = 0;
-			volume->perf_data.last_write_latency = volume->perf_data.last_write_ops = 0;
-		}
 		na_elem_iter_t count_iter = na_child_iterator(na_elem_child(inst, "counters"));
 		for (counter = na_iterator_next(&count_iter); counter; counter = na_iterator_next(&count_iter)) {
+			const char *name;
+			uint64_t value;
+
 			name = na_child_get_string(counter, "name");
-			if (!strcmp(name, "read_ops")) {
-				read_ops = na_child_get_uint64(counter, "value", 0);
-			} else if (!strcmp(name, "write_ops")) {
-				write_ops = na_child_get_uint64(counter, "value", 0);
-			} else if (!strcmp(name, "read_data")) {
-				read_data = na_child_get_uint64(counter, "value", 0);
+			if (name == NULL)
+				continue;
+
+			value = na_child_get_uint64(counter, "value", UINT64_MAX);
+			if (value == UINT64_MAX)
+				continue;
+
+			if (!strcmp(name, "read_data")) {
+				perf_data.read_bytes = value;
+				perf_data.flags |= HAVE_VOLUME_PERF_BYTES_READ;
 			} else if (!strcmp(name, "write_data")) {
-				write_data = na_child_get_uint64(counter, "value", 0);
+				perf_data.write_bytes = value;
+				perf_data.flags |= HAVE_VOLUME_PERF_BYTES_WRITE;
+			} else if (!strcmp(name, "read_ops")) {
+				perf_data.read_ops = value;
+				perf_data.flags |= HAVE_VOLUME_PERF_OPS_READ;
+			} else if (!strcmp(name, "write_ops")) {
+				perf_data.write_ops = value;
+				perf_data.flags |= HAVE_VOLUME_PERF_OPS_WRITE;
 			} else if (!strcmp(name, "read_latency")) {
-				read_latency = na_child_get_uint64(counter, "value", 0);
+				perf_data.read_latency = value;
+				perf_data.flags |= HAVE_VOLUME_PERF_LATENCY_READ;
 			} else if (!strcmp(name, "write_latency")) {
-				write_latency = na_child_get_uint64(counter, "value", 0);
-			}
-		}
-		if (read_ops && write_ops) {
-			values[0].counter = read_ops;
-			values[1].counter = write_ops;
-			vl.values = values;
-			vl.values_len = 2;
-			vl.time = timestamp;
-			vl.interval = interval_g;
-			sstrncpy(vl.plugin, "netapp", sizeof(vl.plugin));
-			sstrncpy(vl.host, host->name, sizeof(vl.host));
-			sstrncpy(vl.plugin_instance, volume->name, sizeof(vl.plugin_instance));
-			sstrncpy(vl.type, "disk_ops", sizeof(vl.type));
-			vl.type_instance[0] = 0;
-			if (volume->perf_data.flags & PERF_VOLUME_OPS) {
-				/* We might need the data even if it wasn't configured to calculate
-				   the latency. Therefore we just skip the dispatch. */
-				DEBUG("%s/netapp-%s/disk_ops: %"PRIu64" %"PRIu64, host->name, volume->name, read_ops, write_ops);
-				plugin_dispatch_values(&vl);
-			}
-			if ((volume->perf_data.flags & PERF_VOLUME_LATENCY) && read_latency && write_latency) {
-				values[0].gauge = 0;
-				if (read_ops - volume->perf_data.last_read_ops) values[0].gauge = (read_latency - volume->perf_data.last_read_latency) * (timestamp - volume->perf_data.last_timestamp) / (read_ops - volume->perf_data.last_read_ops);
-				values[1].gauge = 0;
-				if (write_ops - volume->perf_data.last_write_ops) values[1].gauge = (write_latency - volume->perf_data.last_write_latency) * (timestamp - volume->perf_data.last_timestamp) / (write_ops - volume->perf_data.last_write_ops);
-				vl.values = values;
-				vl.values_len = 2;
-				vl.time = timestamp;
-				vl.interval = interval_g;
-				sstrncpy(vl.plugin, "netapp", sizeof(vl.plugin));
-				sstrncpy(vl.host, host->name, sizeof(vl.host));
-				sstrncpy(vl.plugin_instance, volume->name, sizeof(vl.plugin_instance));
-				sstrncpy(vl.type, "disk_latency", sizeof(vl.type));
-				vl.type_instance[0] = 0;
-				if (volume->perf_data.last_read_ops && volume->perf_data.last_write_ops) {
-					DEBUG("%s/netapp-%s/disk_latency: ro: %"PRIu64" lro: %"PRIu64" "
-							"rl: %"PRIu64" lrl: %"PRIu64" "
-							"%llu %llu",
-							host->name, volume->name,
-							read_ops, volume->perf_data.last_read_ops,
-							read_latency, volume->perf_data.last_read_latency,
-							values[0].counter, values[1].counter);
-					plugin_dispatch_values(&vl);
-				}
-				volume->perf_data.last_timestamp = timestamp;
-				volume->perf_data.last_read_latency = read_latency;
-				volume->perf_data.last_read_ops = read_ops;
-				volume->perf_data.last_write_latency = write_latency;
-				volume->perf_data.last_write_ops = write_ops;
+				perf_data.write_latency = value;
+				perf_data.flags |= HAVE_VOLUME_PERF_LATENCY_WRITE;
 			}
 		}
-		if ((volume->perf_data.flags & PERF_VOLUME_IO) && read_data && write_data) {
-			values[0].counter = read_data;
-			values[1].counter = write_data;
-			vl.values = values;
-			vl.values_len = 2;
-			vl.time = timestamp;
-			vl.interval = interval_g;
-			sstrncpy(vl.plugin, "netapp", sizeof(vl.plugin));
-			sstrncpy(vl.host, host->name, sizeof(vl.host));
-			sstrncpy(vl.plugin_instance, volume->name, sizeof(vl.plugin_instance));
-			sstrncpy(vl.type, "disk_octets", sizeof(vl.type));
-			vl.type_instance[0] = 0;
-			DEBUG("%s/netapp-%s/disk_octets: %"PRIu64" %"PRIu64, host->name, volume->name, read_data, write_data);
-			plugin_dispatch_values (&vl);
-		}
-	}
-}
+
+		submit_volume_perf_data (host, volume, &perf_data);
+	} /* for (volume) */
+} /* }}} void query_volume_perf_data */
 
 static void collect_perf_system_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */
 	counter_t disk_read = 0, disk_written = 0;
@@ -744,7 +874,7 @@ static void collect_perf_system_data(host_config_t *host, na_elem_t *out, void *
 	}
 } /* }}} void collect_perf_system_data */
 
-int config_init() {
+static int config_init(void) { /* {{{ */
 	char err[256];
 	na_elem_t *e;
 	host_config_t *host;
@@ -772,7 +902,7 @@ int config_init() {
 			if (service->handler == collect_perf_system_data) {
 				service->query = na_elem_new("perf-object-get-instances");
 				na_child_add_string(service->query, "objectname", "system");
-			} else if (service->handler == collect_perf_volume_data) {
+			} else if (service->handler == query_volume_perf_data) {
 				service->query = na_elem_new("perf-object-get-instances");
 				na_child_add_string(service->query, "objectname", "volume");
 /*				e = na_elem_new("instances");
@@ -786,7 +916,7 @@ int config_init() {
 				na_child_add_string(e, "foo", "read_latency");
 				na_child_add_string(e, "foo", "write_latency");
 				na_child_add(service->query, e);
-			} else if (service->handler == collect_perf_wafl_data) {
+			} else if (service->handler == query_wafl_data) {
 				service->query = na_elem_new("perf-object-get-instances");
 				na_child_add_string(service->query, "objectname", "wafl");
 /*				e = na_elem_new("instances");
@@ -820,100 +950,187 @@ int config_init() {
 		}
 	}
 	return 0;
-}
+} /* }}} int config_init */
+
+static int config_bool_to_flag (const oconfig_item_t *ci, /* {{{ */
+		uint32_t *flags, uint32_t flag)
+{
+	if ((ci == NULL) || (flags == NULL))
+		return (EINVAL);
+
+	if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_BOOLEAN))
+	{
+		WARNING ("netapp plugin: The %s option needs exactly one boolean argument.",
+				ci->key);
+		return (-1);
+	}
+
+	if (ci->values[0].value.boolean)
+		*flags |= flag;
+	else
+		*flags &= ~flag;
+
+	return (0);
+} /* }}} int config_bool_to_flag */
 
-static void set_global_perf_vol_flag(const host_config_t *host, uint32_t flag, int value) {
+static int config_get_multiplier (const oconfig_item_t *ci, /* {{{ */
+		service_config_t *service)
+{
+	int tmp;
+
+	if ((ci == NULL) || (service == NULL))
+		return (EINVAL);
+
+	if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_NUMBER))
+	{
+		WARNING ("netapp plugin: The `Multiplier' option needs exactly one numeric argument.");
+		return (-1);
+	}
+
+	tmp = (int) (ci->values[0].value.number + .5);
+	if (tmp < 1)
+	{
+		WARNING ("netapp plugin: The `Multiplier' option needs a positive integer argument.");
+		return (-1);
+	}
+
+	service->multiplier = tmp;
+	service->skip_countdown = tmp;
+
+	return (0);
+} /* }}} int config_get_multiplier */
+
+static void set_global_perf_vol_flag(const host_config_t *host, /* {{{ */
+		uint32_t flag, _Bool set)
+{
 	volume_t *v;
 	
 	for (v = host->volumes; v; v = v->next) {
-		v->perf_data.flags &= ~flag;
-		if (value) v->perf_data.flags |= flag;
+		if (set)
+			v->perf_data.flags |= flag;
+		else /* if (!set) */
+			v->perf_data.flags &= ~flag;
 	}
-}
+} /* }}} void set_global_perf_vol_flag */
 
-static void set_global_vol_flag(const host_config_t *host, uint32_t flag, int value) {
+static void set_global_vol_flag(const host_config_t *host, /* {{{ */
+		uint32_t flag, _Bool set) {
 	volume_t *v;
 	
 	for (v = host->volumes; v; v = v->next) {
-		v->volume_data.flags &= ~flag;
-		if (value) v->volume_data.flags |= flag;
+		if (set)
+			v->volume_data.flags |= flag;
+		else /* if (!set) */
+			v->volume_data.flags &= ~flag;
 	}
-}
+} /* }}} void set_global_vol_flag */
 
-static void process_perf_volume_flag(host_config_t *host, perf_volume_data_t *perf_volume, const oconfig_item_t *item, uint32_t flag) {
-	int n;
+static void process_perf_volume_flag (host_config_t *host, /* {{{ */
+		cfg_volume_perf_t *perf_volume, const oconfig_item_t *item,
+		uint32_t flag)
+{
+	int i;
 	
-	for (n = 0; n < item->values_num; ++n) {
-		int minus = 0;
-		const char *name = item->values[n].value.string;
+	for (i = 0; i < item->values_num; ++i) {
+		const char *name;
 		volume_t *v;
-		if (item->values[n].type != OCONFIG_TYPE_STRING) {
-			WARNING("netapp plugin: Ignoring non-string argument in \"GetVolPerfData\" block for host %s", host->name);
+		_Bool set = true;
+
+		if (item->values[i].type != OCONFIG_TYPE_STRING) {
+			WARNING("netapp plugin: Ignoring non-string argument in "
+					"\"GetVolumePerfData\" block for host %s", host->name);
 			continue;
 		}
+
+		name = item->values[i].value.string;
 		if (name[0] == '+') {
+			set = true;
 			++name;
 		} else if (name[0] == '-') {
-			minus = 1;
+			set = false;
 			++name;
 		}
+
 		if (!name[0]) {
-			perf_volume->flags &= ~flag;
-			if (!minus) perf_volume->flags |= flag;
-			set_global_perf_vol_flag(host, flag, !minus);
+			if (set)
+				perf_volume->flags |= flag;
+			else /* if (!set) */
+				perf_volume->flags &= ~flag;
+
+			set_global_perf_vol_flag(host, flag, set);
 			continue;
 		}
-		v = get_volume(host, name);
-		if (!v->perf_data.flags) {
-			v->perf_data.flags = perf_volume->flags;
-			v->perf_data.last_read_latency = v->perf_data.last_read_ops = 0;
-			v->perf_data.last_write_latency = v->perf_data.last_write_ops = 0;
-		}
-		v->perf_data.flags &= ~flag;
-		if (!minus) v->perf_data.flags |= flag;
-	}
-}
 
-static void process_volume_flag(host_config_t *host, volume_data_t *volume_data, const oconfig_item_t *item, uint32_t flag) {
-	int n;
+		v = get_volume (host, name, /* data_flags = */ 0, perf_volume->flags);
+		if (v == NULL)
+			continue;
+
+		if (set)
+			v->perf_data.flags |= flag;
+		else /* if (!set) */
+			v->perf_data.flags &= ~flag;
+	} /* for (i = 0 .. item->values_num) */
+} /* }}} void process_perf_volume_flag */
+
+static void process_volume_flag (host_config_t *host, /* {{{ */
+		cfg_volume_data_t *cfg_volume_data, const oconfig_item_t *item, uint32_t flag)
+{
+	int i;
 	
-	for (n = 0; n < item->values_num; ++n) {
-		int minus = 0;
-		const char *name = item->values[n].value.string;
+	for (i = 0; i < item->values_num; ++i) {
+		const char *name;
 		volume_t *v;
-		if (item->values[n].type != OCONFIG_TYPE_STRING) {
-			WARNING("netapp plugin: Ignoring non-string argument in \"GetVolData\" block for host %s", host->name);
+		_Bool set = true;
+
+		if (item->values[i].type != OCONFIG_TYPE_STRING) {
+			WARNING("netapp plugin: Ignoring non-string argument in \"GetVolData\""
+					"block for host %s", host->name);
 			continue;
 		}
+
+		name = item->values[i].value.string;
 		if (name[0] == '+') {
+			set = true;
 			++name;
 		} else if (name[0] == '-') {
-			minus = 1;
+			set = false;
 			++name;
 		}
+
 		if (!name[0]) {
-			volume_data->flags &= ~flag;
-			if (!minus) volume_data->flags |= flag;
-			set_global_vol_flag(host, flag, !minus);
+			if (set)
+				cfg_volume_data->flags |= flag;
+			else /* if (!set) */
+				cfg_volume_data->flags &= ~flag;
+
+			set_global_vol_flag(host, flag, set);
 			continue;
 		}
-		v = get_volume(host, name);
-		if (!v->volume_data.flags) v->volume_data.flags = volume_data->flags;
-		v->volume_data.flags &= ~flag;
-		if (!minus) v->volume_data.flags |= flag;
+
+		v = get_volume(host, name, cfg_volume_data->flags, /* perf_flags = */ 0);
+		if (v == NULL)
+			continue;
+
+		if (!v->volume_data.flags)
+			v->volume_data.flags = cfg_volume_data->flags;
+
+		if (set)
+			v->volume_data.flags |= flag;
+		else /* if (!set) */
+			v->volume_data.flags &= ~flag;
 	}
-}
+} /* }}} void process_volume_flag */
 
 static void build_perf_vol_config(host_config_t *host, const oconfig_item_t *ci) {
 	int i, had_io = 0, had_ops = 0, had_latency = 0;
 	service_config_t *service;
-	perf_volume_data_t *perf_volume;
+	cfg_volume_perf_t *perf_volume;
 	
 	service = malloc(sizeof(*service));
 	service->query = 0;
-	service->handler = collect_perf_volume_data;
+	service->handler = query_volume_perf_data;
 	perf_volume = service->data = malloc(sizeof(*perf_volume));
-	perf_volume->flags = PERF_VOLUME_INIT;
+	perf_volume->flags = CFG_VOLUME_PERF_INIT;
 	service->next = host->services;
 	host->services = service;
 	for (i = 0; i < ci->children_num; ++i) {
@@ -921,46 +1138,42 @@ static void build_perf_vol_config(host_config_t *host, const oconfig_item_t *ci)
 		
 		/* if (!item || !item->key || !*item->key) continue; */
 		if (!strcasecmp(item->key, "Multiplier")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_NUMBER || item->values[0].value.number != (int) item->values[0].value.number || item->values[0].value.number < 1) {
-				WARNING("netapp plugin: \"Multiplier\" of host %s service GetVolPerfData needs exactly one positive integer argument.", host->name);
-				continue;
-			}
-			service->skip_countdown = service->multiplier = item->values[0].value.number;
+			config_get_multiplier (item, service);
 		} else if (!strcasecmp(item->key, "GetIO")) {
 			had_io = 1;
-			process_perf_volume_flag(host, perf_volume, item, PERF_VOLUME_IO);
+			process_perf_volume_flag(host, perf_volume, item, CFG_VOLUME_PERF_IO);
 		} else if (!strcasecmp(item->key, "GetOps")) {
 			had_ops = 1;
-			process_perf_volume_flag(host, perf_volume, item, PERF_VOLUME_OPS);
+			process_perf_volume_flag(host, perf_volume, item, CFG_VOLUME_PERF_OPS);
 		} else if (!strcasecmp(item->key, "GetLatency")) {
 			had_latency = 1;
-			process_perf_volume_flag(host, perf_volume, item, PERF_VOLUME_LATENCY);
+			process_perf_volume_flag(host, perf_volume, item, CFG_VOLUME_PERF_LATENCY);
 		}
 	}
 	if (!had_io) {
-		perf_volume->flags |= PERF_VOLUME_IO;
-		set_global_perf_vol_flag(host, PERF_VOLUME_IO, 1);
+		perf_volume->flags |= CFG_VOLUME_PERF_IO;
+		set_global_perf_vol_flag(host, CFG_VOLUME_PERF_IO, /* set = */ true);
 	}
 	if (!had_ops) {
-		perf_volume->flags |= PERF_VOLUME_OPS;
-		set_global_perf_vol_flag(host, PERF_VOLUME_OPS, 1);
+		perf_volume->flags |= CFG_VOLUME_PERF_OPS;
+		set_global_perf_vol_flag(host, CFG_VOLUME_PERF_OPS, /* set = */ true);
 	}
 	if (!had_latency) {
-		perf_volume->flags |= PERF_VOLUME_LATENCY;
-		set_global_perf_vol_flag(host, PERF_VOLUME_LATENCY, 1);
+		perf_volume->flags |= CFG_VOLUME_PERF_LATENCY;
+		set_global_perf_vol_flag(host, CFG_VOLUME_PERF_LATENCY, /* set = */ true);
 	}
 }
 
 static void build_volume_config(host_config_t *host, oconfig_item_t *ci) {
 	int i, had_df = 0;
 	service_config_t *service;
-	volume_data_t *volume_data;
+	cfg_volume_data_t *cfg_volume_data;
 	
 	service = malloc(sizeof(*service));
 	service->query = 0;
 	service->handler = collect_volume_data;
-	volume_data = service->data = malloc(sizeof(*volume_data));
-	volume_data->flags = VOLUME_INIT;
+	cfg_volume_data = service->data = malloc(sizeof(*cfg_volume_data));
+	cfg_volume_data->flags = VOLUME_INIT;
 	service->next = host->services;
 	host->services = service;
 	for (i = 0; i < ci->children_num; ++i) {
@@ -968,26 +1181,16 @@ static void build_volume_config(host_config_t *host, oconfig_item_t *ci) {
 		
 		/* if (!item || !item->key || !*item->key) continue; */
 		if (!strcasecmp(item->key, "Multiplier")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_NUMBER || item->values[0].value.number != (int) item->values[0].value.number || item->values[0].value.number < 1) {
-				WARNING("netapp plugin: \"Multiplier\" of host %s service GetVolPerfData needs exactly one positive integer argument.", host->name);
-				continue;
-			}
-			service->skip_countdown = service->multiplier = item->values[0].value.number;
+			config_get_multiplier (item, service);
 		} else if (!strcasecmp(item->key, "GetDiskUtil")) {
 			had_df = 1;
-			process_volume_flag(host, volume_data, item, VOLUME_DF);
+			process_volume_flag(host, cfg_volume_data, item, VOLUME_DF);
 		}
 	}
 	if (!had_df) {
-		volume_data->flags |= VOLUME_DF;
-		set_global_vol_flag(host, VOLUME_DF, 1);
+		cfg_volume_data->flags |= VOLUME_DF;
+		set_global_vol_flag(host, VOLUME_DF, /* set = */ true);
 	}
-/*	service = malloc(sizeof(*service));
-	service->query = 0;
-	service->handler = collect_snapshot_data;
-	service->data = volume_data;
-	service->next = temp->services;
-	temp->services = service;*/
 }
 
 static void build_perf_disk_config(host_config_t *temp, oconfig_item_t *ci) {
@@ -1007,130 +1210,98 @@ static void build_perf_disk_config(host_config_t *temp, oconfig_item_t *ci) {
 		
 		/* if (!item || !item->key || !*item->key) continue; */
 		if (!strcasecmp(item->key, "Multiplier")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_NUMBER || item->values[0].value.number != (int) item->values[0].value.number || item->values[0].value.number < 1) {
-				WARNING("netapp plugin: \"Multiplier\" of host %s service GetWaflPerfData needs exactly one positive integer argument.", ci->values[0].value.string);
-				continue;
-			}
-			service->skip_countdown = service->multiplier = item->values[0].value.number;
+			config_get_multiplier (item, service);
 		} else if (!strcasecmp(item->key, "GetBusy")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
-				WARNING("netapp plugin: \"GetBusy\" of host %s service GetDiskPerfData needs exactly one bool argument.", ci->values[0].value.string);
-				continue;
-			}
-			perf_disk->flags = (perf_disk->flags & ~PERF_SYSTEM_CPU) | (item->values[0].value.boolean ? PERF_DISK_BUSIEST : 0);
+			config_bool_to_flag (item, &perf_disk->flags, PERF_SYSTEM_CPU);
 		}
 	}
 }
 
-static void build_perf_wafl_config(host_config_t *temp, oconfig_item_t *ci) {
+static void build_perf_wafl_config(host_config_t *host, oconfig_item_t *ci) { /* {{{ */
 	int i;
 	service_config_t *service;
 	perf_wafl_data_t *perf_wafl;
 	
 	service = malloc(sizeof(*service));
+	if (service == NULL)
+		return;
+	memset (service, 0, sizeof (*service));
+
 	service->query = 0;
-	service->handler = collect_perf_wafl_data;
+	service->handler = query_wafl_data;
 	perf_wafl = service->data = malloc(sizeof(*perf_wafl));
-	perf_wafl->flags = PERF_WAFL_ALL;
-	perf_wafl->last_name_cache_hit = 0;
-	perf_wafl->last_name_cache_miss = 0;
-	perf_wafl->last_find_dir_hit = 0;
-	perf_wafl->last_find_dir_miss = 0;
-	perf_wafl->last_buf_hash_hit = 0;
-	perf_wafl->last_buf_hash_miss = 0;
-	perf_wafl->last_inode_cache_hit = 0;
-	perf_wafl->last_inode_cache_miss = 0;
-	service->next = temp->services;
-	temp->services = service;
+	perf_wafl->flags = CFG_WAFL_ALL;
+
 	for (i = 0; i < ci->children_num; ++i) {
 		oconfig_item_t *item = ci->children + i;
 		
-		/* if (!item || !item->key || !*item->key) continue; */
 		if (!strcasecmp(item->key, "Multiplier")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_NUMBER || item->values[0].value.number != (int) item->values[0].value.number || item->values[0].value.number < 1) {
-				WARNING("netapp plugin: \"Multiplier\" of host %s service GetWaflPerfData needs exactly one positive integer argument.", ci->values[0].value.string);
-				continue;
-			}
-			service->skip_countdown = service->multiplier = item->values[0].value.number;
+			config_get_multiplier (item, service);
 		} else if (!strcasecmp(item->key, "GetNameCache")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
-				WARNING("netapp plugin: \"GetNameCache\" of host %s service GetWaflPerfData needs exactly one bool argument.", ci->values[0].value.string);
-				continue;
-			}
-			perf_wafl->flags = (perf_wafl->flags & ~PERF_WAFL_NAME_CACHE) | (item->values[0].value.boolean ? PERF_WAFL_NAME_CACHE : 0);
+			config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_NAME_CACHE);
 		} else if (!strcasecmp(item->key, "GetDirCache")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
-				WARNING("netapp plugin: \"GetDirChache\" of host %s service GetWaflPerfData needs exactly one bool argument.", ci->values[0].value.string);
-				continue;
-			}
-			perf_wafl->flags = (perf_wafl->flags & ~PERF_WAFL_DIR_CACHE) | (item->values[0].value.boolean ? PERF_WAFL_DIR_CACHE : 0);
+			config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_DIR_CACHE);
 		} else if (!strcasecmp(item->key, "GetBufCache")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
-				WARNING("netapp plugin: \"GetBufCache\" of host %s service GetWaflPerfData needs exactly one bool argument.", ci->values[0].value.string);
-				continue;
-			}
-			perf_wafl->flags = (perf_wafl->flags & ~PERF_WAFL_BUF_CACHE) | (item->values[0].value.boolean ? PERF_WAFL_BUF_CACHE : 0);
+			config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_BUF_CACHE);
 		} else if (!strcasecmp(item->key, "GetInodeCache")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
-				WARNING("netapp plugin: \"GetInodeCache\" of host %s service GetWaflPerfData needs exactly one bool argument.", ci->values[0].value.string);
-				continue;
-			}
-			perf_wafl->flags = (perf_wafl->flags & ~PERF_WAFL_INODE_CACHE) | (item->values[0].value.boolean ? PERF_WAFL_INODE_CACHE : 0);
+			config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_INODE_CACHE);
+		} else {
+			WARNING ("netapp plugin: The %s config option is not allowed within "
+					"`GetWaflPerfData' blocks.", item->key);
 		}
 	}
-}
 
-static void build_perf_sys_config(host_config_t *temp, oconfig_item_t *ci, const service_config_t *default_service) {
+	service->next = host->services;
+	host->services = service;
+} /* }}} void build_perf_wafl_config */
+
+static int build_perf_sys_config (host_config_t *host, /* {{{ */
+		oconfig_item_t *ci, const service_config_t *default_service)
+{
 	int i;
 	service_config_t *service;
 	perf_system_data_t *perf_system;
 	
 	service = malloc(sizeof(*service));
+	if (service == NULL)
+		return (-1);
+	memset (service, 0, sizeof (*service));
 	*service = *default_service;
 	service->handler = collect_perf_system_data;
-	perf_system = service->data = malloc(sizeof(*perf_system));
+
+	perf_system = malloc(sizeof(*perf_system));
+	if (perf_system == NULL) {
+		sfree (service);
+		return (-1);
+	}
+	memset (perf_system, 0, sizeof (*perf_system));
 	perf_system->flags = PERF_SYSTEM_ALL;
-	perf_system->last_cpu_busy = 0;
-	perf_system->last_cpu_total = 0;
-	service->next = temp->services;
-	temp->services = service;
+	service->data = perf_system;
+
 	for (i = 0; i < ci->children_num; ++i) {
 		oconfig_item_t *item = ci->children + i;
 
-		/* if (!item || !item->key || !*item->key) continue; */
 		if (!strcasecmp(item->key, "Multiplier")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_NUMBER || item->values[0].value.number != (int) item->values[0].value.number || item->values[0].value.number < 1) {
-				WARNING("netapp plugin: \"Multiplier\" of host %s service GetSystemPerfData needs exactly one positive integer argument.", ci->values[0].value.string);
-				continue;
-			}
-			service->skip_countdown = service->multiplier = item->values[0].value.number;
+			config_get_multiplier (item, service);
 		} else if (!strcasecmp(item->key, "GetCPULoad")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
-				WARNING("netapp plugin: \"GetCPULoad\" of host %s service GetSystemPerfData needs exactly one bool argument.", ci->values[0].value.string);
-				continue;
-			}
-			perf_system->flags = (perf_system->flags & ~PERF_SYSTEM_CPU) | (item->values[0].value.boolean ? PERF_SYSTEM_CPU : 0);
+			config_bool_to_flag (item, &perf_system->flags, PERF_SYSTEM_CPU);
 		} else if (!strcasecmp(item->key, "GetInterfaces")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
-				WARNING("netapp plugin: \"GetInterfaces\" of host %s service GetSystemPerfData needs exactly one bool argument.", ci->values[0].value.string);
-				continue;
-			}
-			perf_system->flags = (perf_system->flags & ~PERF_SYSTEM_NET) | (item->values[0].value.boolean ? PERF_SYSTEM_NET : 0);
+			config_bool_to_flag (item, &perf_system->flags, PERF_SYSTEM_NET);
 		} else if (!strcasecmp(item->key, "GetDiskOps")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
-				WARNING("netapp plugin: \"GetDiskOps\" of host %s service GetSystemPerfData needs exactly one bool argument.", ci->values[0].value.string);
-				continue;
-			}
-			perf_system->flags = (perf_system->flags & ~PERF_SYSTEM_OPS) | (item->values[0].value.boolean ? PERF_SYSTEM_OPS : 0);
+			config_bool_to_flag (item, &perf_system->flags, PERF_SYSTEM_OPS);
 		} else if (!strcasecmp(item->key, "GetDiskIO")) {
-			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
-				WARNING("netapp plugin: \"GetDiskIO\" of host %s service GetSystemPerfData needs exactly one bool argument.", ci->values[0].value.string);
-				continue;
-			}
-			perf_system->flags = (perf_system->flags & ~PERF_SYSTEM_DISK) | (item->values[0].value.boolean ? PERF_SYSTEM_DISK : 0);
+			config_bool_to_flag (item, &perf_system->flags, PERF_SYSTEM_DISK);
+		} else {
+			WARNING ("netapp plugin: The %s config option is not allowed within "
+					"`GetSystemPerfData' blocks.", item->key);
 		}
 	}
-}
+
+	service->next = host->services;
+	host->services = service;
+
+	return (0);
+} /* }}} int build_perf_sys_config */
 
 static host_config_t *build_host_config(const oconfig_item_t *ci, const host_config_t *default_host, const service_config_t *def_def_service) {
 	int i;
@@ -1184,11 +1355,6 @@ static host_config_t *build_host_config(const oconfig_item_t *ci, const host_con
 			build_perf_vol_config(&temp, item);
 		} else if (!strcasecmp(item->key, "GetSystemPerfData")) {
 			build_perf_sys_config(&temp, item, &default_service);
-/*			if ((item->values_num != 1) || (item->values[0].type != OCONFIG_TYPE_STRING)) {
-				WARNING("netapp plugin: \"Collect\" needs exactly one string argument. Ignoring collect block for \"%s\".", ci->values[0].value.string);
-				continue;
-			}
-			build_collect_config(&temp, item);*/
 		} else if (!strcasecmp(item->key, "GetWaflPerfData")) {
 			build_perf_wafl_config(&temp, item);
 		} else if (!strcasecmp(item->key, "GetDiskPerfData")) {
@@ -1196,7 +1362,8 @@ static host_config_t *build_host_config(const oconfig_item_t *ci, const host_con
 		} else if (!strcasecmp(item->key, "GetVolumeData")) {
 			build_volume_config(&temp, item);
 		} else {
-			WARNING("netapp plugin: Ignoring unknown config option \"%s\" in host block \"%s\".", item->key, ci->values[0].value.string);
+			WARNING("netapp plugin: Ignoring unknown config option \"%s\" in host block \"%s\".",
+					item->key, ci->values[0].value.string);
 		}
 	}