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 6e1f92e..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,16 +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
-};
-
 static const char *config_keys[] =
 {
        "Irq",
@@ -55,7 +41,6 @@ static const char *config_keys[] =
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
-#if IRQ_HAVE_READ
 static unsigned int *irq_list;
 static unsigned int irq_list_num;
 
@@ -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);
                }
@@ -147,7 +132,7 @@ 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);
+       strcpy (vl.host, hostname_g);
        strcpy (vl.plugin, "irq");
 
        status = snprintf (vl.type_instance, sizeof (vl.type_instance),
@@ -160,8 +145,6 @@ static void irq_submit (unsigned int irq, counter_t value)
 
 static int irq_read (void)
 {
-#if KERNEL_LINUX
-
 #undef BUFSIZE
 #define BUFSIZE 256
 
@@ -178,8 +161,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)
@@ -209,22 +193,15 @@ static int irq_read (void)
                irq_submit (irq, irq_value);
        }
        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