#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
/*
* (Module-)Global variables
*/
-static char *irq_file = "irq/irq-%s.rrd";
-
-static char *config_keys[] =
+static const char *config_keys[] =
{
"Irq",
- "IgnoreSelected",
- NULL
-};
-static int config_keys_num = 2;
-
-static char *ds_def[] =
-{
- "DS:value:COUNTER:"COLLECTD_HEARTBEAT":0:65535",
- NULL
+ "IgnoreSelected"
};
-static int ds_num = 1;
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
static unsigned int *irq_list;
static unsigned int irq_list_num;
*/
static int irq_list_action;
-static int irq_config (char *key, char *value)
+static int irq_config (const char *key, const char *value)
{
if (strcasecmp (key, "Irq") == 0)
{
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;
{
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);
}
}
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;
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);
return (1 - irq_list_action);
}
-static void irq_write (char *host, char *inst, char *value)
+static void irq_submit (unsigned int irq, derive_t value)
{
- char file[BUFSIZE];
+ value_t values[1];
+ value_list_t vl = VALUE_LIST_INIT;
int status;
- if (check_ignore_irq (atoi(inst)))
- return;
-
- status = snprintf (file, BUFSIZE, irq_file, inst);
- if (status < 1)
- return;
- else if (status >= BUFSIZE)
- return;
-
- rrd_update_file (host, file, value, ds_def, ds_num);
-}
-
-#if IRQ_HAVE_READ
-static void irq_submit (unsigned int irq, unsigned int value)
-{
- char value_str[32];
- char type_str[16];
- int status;
-
if (check_ignore_irq (irq))
return;
- status = snprintf (value_str, 32, "%u:%u",
- (unsigned int) curtime, value);
- if ((status >= 32) || (status < 1))
- return;
+ values[0].derive = value;
- status = snprintf (type_str, 16, "%u", irq);
- if ((status >= 16) || (status < 1))
+ vl.values = values;
+ 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));
+
+ status = ssnprintf (vl.type_instance, sizeof (vl.type_instance),
+ "%u", irq);
+ if ((status < 1) || ((unsigned int)status >= sizeof (vl.type_instance)))
return;
- plugin_submit (MODULE_NAME, type_str, value_str);
+ plugin_dispatch_values (&vl);
} /* void irq_submit */
-static void irq_read (void)
+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;
- char *endptr;
- int i;
+ char buffer[1024];
- char *fields[64];
- int fields_num;
-
- if ((fh = fopen ("/proc/interrupts", "r")) == NULL)
+ fh = fopen ("/proc/interrupts", "r");
+ if (fh == NULL)
{
- syslog (LOG_WARNING, "irq plugin: fopen (/proc/interrupts): %s",
- strerror (errno));
- return;
+ char errbuf[1024];
+ ERROR ("irq plugin: fopen (/proc/interrupts): %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ return (-1);
}
+
while (fgets (buffer, BUFSIZE, fh) != NULL)
{
+ unsigned int irq;
+ derive_t irq_value;
+ char *endptr;
+ int i;
+
+ char *fields[64];
+ int fields_num;
+
fields_num = strsplit (buffer, fields, 64);
if (fields_num < 2)
continue;
errno = 0; /* To distinguish success/failure after call */
- irq = strtol (fields[0], &endptr, 10);
+ irq = (unsigned int) strtoul (fields[0], &endptr, /* base = */ 10);
if ((endptr == fields[0]) || (errno != 0) || (*endptr != ':'))
continue;
irq_value = 0;
for (i = 1; i < fields_num; i++)
{
- errno = 0;
- value = strtol (fields[i], &endptr, 10);
+ /* Per-CPU value */
+ value_t v;
+ int status;
- if ((*endptr != '\0') || (errno != 0))
+ status = parse_value (fields[i], &v, DS_TYPE_DERIVE);
+ if (status != 0)
break;
- irq_value += value;
+ irq_value += v.derive;
} /* for (i) */
+ if (i < fields_num)
+ continue;
+
irq_submit (irq, irq_value);
}
+
fclose (fh);
-#endif /* KERNEL_LINUX */
-} /* void irq_read */
-#else
-#define irq_read NULL
-#endif /* IRQ_HAVE_READ */
+
+ return (0);
+} /* int irq_read */
void module_register (void)
{
- plugin_register (MODULE_NAME, NULL, irq_read, irq_write);
- cf_register (MODULE_NAME, irq_config, config_keys, config_keys_num);
-}
+ plugin_register_config ("irq", irq_config,
+ config_keys, config_keys_num);
+ plugin_register_read ("irq", irq_read);
+} /* void module_register */
#undef BUFSIZE
-#undef MODULE_NAME
projects / collectd.git / blobdiff