Removed the `XXX_HAVE_READ' defines from all plugins.

[collectd.git] / src / irq.c

diff --git a/src/irq.c b/src/irq.c
index 69a3196..b6b8c4c 100644 (file)
--- 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,22 +34,12 @@
 /*
  * (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;
@@ -65,7 +51,7 @@ 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)
        {
@@ -77,7 +63,7 @@ static int irq_config (char *key, 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;
@@ -90,7 +76,7 @@ static int irq_config (char *key, 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);
                }
@@ -132,49 +118,33 @@ static int check_ignore_irq (const unsigned int irq)
        return (1 - irq_list_action);
 }
 
-static void irq_write (char *host, char *inst, char *value)
+static void irq_submit (unsigned int irq, counter_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].counter = value;
+
+       vl.values = values;
+       vl.values_len = 1;
+       vl.time = time (NULL);
+       strcpy (vl.host, hostname_g);
+       strcpy (vl.plugin, "irq");
 
-       status = snprintf (type_str, 16, "%u", irq);
-       if ((status >= 16) || (status < 1))
+       status = snprintf (vl.type_instance, sizeof (vl.type_instance),
+                       "%u", irq);
+       if ((status < 1) || (status >= sizeof (vl.type_instance)))
                return;
 
-       plugin_submit (MODULE_NAME, type_str, value_str);
+       plugin_dispatch_values ("irq", &vl);
 } /* void irq_submit */
 
-static void irq_read (void)
+static int irq_read (void)
 {
-#if KERNEL_LINUX
-
 #undef BUFSIZE
 #define BUFSIZE 256
 
@@ -191,9 +161,10 @@ static void irq_read (void)
 
        if ((fh = fopen ("/proc/interrupts", "r")) == NULL)
        {
-               syslog (LOG_WARNING, "irq plugin: fopen (/proc/interrupts): %s",
-                               strerror (errno));
-               return;
+               char errbuf[1024];
+               WARNING ("irq plugin: fopen (/proc/interrupts): %s",
+                               sstrerror (errno, errbuf, sizeof (errbuf)));
+               return (-1);
        }
        while (fgets (buffer, BUFSIZE, fh) != NULL)
        {
@@ -222,17 +193,15 @@ static void irq_read (void)
                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