X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Firq.c;h=06c50ff3ab0962efa55ab8e9165edcb36b511ca3;hb=c76419c0cf983f1ecd3d36aa236cc4e3f9cff733;hp=1168b979e07688a995a1a7e640c5237a28df8641;hpb=b61a03b05c1f4040a6599334b65141aa3bd134f5;p=collectd.git

diff --git a/src/irq.c b/src/irq.c
index 1168b979..06c50ff3 100644
--- a/src/irq.c
+++ b/src/irq.c
@@ -22,9 +22,9 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_ignorelist.h"
 
 #if !KERNEL_LINUX
@@ -72,17 +72,13 @@ static int irq_config (const char *key, const char *value)
 
 static void irq_submit (const char *irq_name, derive_t value)
 {
-	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
 	if (ignorelist_match (ignorelist, irq_name) != 0)
 		return;
 
-	values[0].derive = value;
-
-	vl.values = values;
+	vl.values = &(value_t) { .derive = value };
 	vl.values_len = 1;
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "irq", sizeof (vl.plugin));
 	sstrncpy (vl.type, "irq", sizeof (vl.type));
 	sstrncpy (vl.type_instance, irq_name, sizeof (vl.type_instance));
@@ -120,6 +116,7 @@ static int irq_read (void)
 	} else {
 		ERROR ("irq plugin: unable to get CPU count from first line "
 				"of /proc/interrupts");
+		fclose (fh);
 		return (-1);
 	}
 
@@ -155,6 +152,10 @@ static int irq_read (void)
 		if (irq_name[irq_name_len - 1] != ':')
 			continue;
 
+		/* Is it the the ARM fast interrupt (FIQ)? */
+		if (irq_name_len == 4 && (strncmp(irq_name, "FIQ:", 4) == 0))
+			continue;
+
 		irq_name[irq_name_len - 1] = 0;
 		irq_name_len--;