X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Firq.c;h=401cc6f9cb3f13e84e1a5e2fd961238565c6632c;hb=221bd73964e68cc79b45eab727015318cd3ebf84;hp=6c30e95a752bb4583ca6ce466279062cdfb7e094;hpb=a1c44684e780fdc52dcd31d4cff3d89122ee2a84;p=collectd.git

diff --git a/src/irq.c b/src/irq.c
index 6c30e95a..401cc6f9 100644
--- a/src/irq.c
+++ b/src/irq.c
@@ -25,12 +25,8 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#define MODULE_NAME "irq"
-
-#if KERNEL_LINUX
-# define IRQ_HAVE_READ 1
-#else
-# define IRQ_HAVE_READ 0
+#if !KERNEL_LINUX
+# error "No applicable input method."
 #endif
 
 #define BUFSIZE 128
@@ -38,17 +34,6 @@
 /*
  * (Module-)Global variables
  */
-static data_source_t dsrc_irq[1] =
-{
-	{"value", DS_TYPE_COUNTER, 0, 65535.0}
-};
-
-static data_set_t ds_irq =
-{
-	"irq", 1, dsrc_irq
-};
-
-#if IRQ_HAVE_READ
 static const char *config_keys[] =
 {
 	"Irq",
@@ -78,7 +63,7 @@ static int irq_config (const char *key, const char *value)
 		if (temp == NULL)
 		{
 			fprintf (stderr, "irq plugin: Cannot allocate more memory.\n");
-			syslog (LOG_ERR, "irq plugin: Cannot allocate more memory.");
+			ERROR ("irq plugin: Cannot allocate more memory.");
 			return (1);
 		}
 		irq_list = temp;
@@ -91,7 +76,7 @@ static int irq_config (const char *key, const char *value)
 		{
 			fprintf (stderr, "irq plugin: Irq value is not a "
 					"number: `%s'\n", value);
-			syslog (LOG_ERR, "irq plugin: Irq value is not a "
+			ERROR ("irq plugin: Irq value is not a "
 					"number: `%s'", value);
 			return (1);
 		}
@@ -100,9 +85,7 @@ static int irq_config (const char *key, const char *value)
 	}
 	else if (strcasecmp (key, "IgnoreSelected") == 0)
 	{
-		if ((strcasecmp (value, "True") == 0)
-				|| (strcasecmp (value, "Yes") == 0)
-				|| (strcasecmp (value, "On") == 0))
+		if (IS_TRUE (value))
 			irq_list_action = 1;
 		else
 			irq_list_action = 0;
@@ -126,7 +109,7 @@ static int check_ignore_irq (const unsigned int irq)
 	if (irq_list_num < 1)
 		return (0);
 
-	for (i = 0; i < irq_list_num; i++)
+	for (i = 0; (unsigned int)i < irq_list_num; i++)
 		if (irq == irq_list[i])
 			return (irq_list_action);
 
@@ -146,30 +129,28 @@ static void irq_submit (unsigned int irq, counter_t value)
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "irq");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "irq", sizeof (vl.plugin));
+	sstrncpy (vl.type, "irq", sizeof (vl.type));
 
-	status = snprintf (vl.type_instance, sizeof (vl.type_instance),
+	status = ssnprintf (vl.type_instance, sizeof (vl.type_instance),
 			"%u", irq);
-	if ((status < 1) || (status >= sizeof (vl.type_instance)))
+	if ((status < 1) || ((unsigned int)status >= sizeof (vl.type_instance)))
 		return;
 
-	plugin_dispatch_values ("irq", &vl);
+	plugin_dispatch_values (&vl);
 } /* void irq_submit */
 
 static int irq_read (void)
 {
-#if KERNEL_LINUX
-
 #undef BUFSIZE
 #define BUFSIZE 256
 
 	FILE *fh;
 	char buffer[BUFSIZE];
 	unsigned int irq;
-	unsigned int irq_value;
-	long value;
+	unsigned long long irq_value;
+	unsigned long long value;
 	char *endptr;
 	int i;
 
@@ -178,8 +159,9 @@ static int irq_read (void)
 
 	if ((fh = fopen ("/proc/interrupts", "r")) == NULL)
 	{
-		syslog (LOG_WARNING, "irq plugin: fopen (/proc/interrupts): %s",
-				strerror (errno));
+		char errbuf[1024];
+		WARNING ("irq plugin: fopen (/proc/interrupts): %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
 		return (-1);
 	}
 	while (fgets (buffer, BUFSIZE, fh) != NULL)
@@ -198,7 +180,7 @@ static int irq_read (void)
 		for (i = 1; i < fields_num; i++)
 		{
 			errno = 0;
-			value = strtol (fields[i], &endptr, 10);
+			value = strtoull (fields[i], &endptr, 10);
 
 			if ((*endptr != '\0') || (errno != 0))
 				break;
@@ -206,25 +188,20 @@ static int irq_read (void)
 			irq_value += value;
 		} /* for (i) */
 
-		irq_submit (irq, irq_value);
+		/* Force 32bit wrap-around */
+		irq_submit (irq, irq_value % 4294967296ULL);
 	}
+
 	fclose (fh);
-#endif /* KERNEL_LINUX */
 
 	return (0);
 } /* int irq_read */
-#endif /* IRQ_HAVE_READ */
 
 void module_register (void)
 {
-	plugin_register_data_set (&ds_irq);
-
-#if IRQ_HAVE_READ
 	plugin_register_config ("irq", irq_config,
 			config_keys, config_keys_num);
 	plugin_register_read ("irq", irq_read);
-#endif /* IRQ_HAVE_READ */
-}
+} /* void module_register */
 
 #undef BUFSIZE
-#undef MODULE_NAME