projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.2' into collectd-4.3
[collectd.git]
/
src
/
irq.c
diff --git
a/src/irq.c
b/src/irq.c
index
6c30e95
..
9eb1de4
100644
(file)
--- a/
src/irq.c
+++ b/
src/irq.c
@@
-25,12
+25,8
@@
#include "plugin.h"
#include "configfile.h"
#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
#endif
#define BUFSIZE 128
@@
-38,17
+34,6
@@
/*
* (Module-)Global variables
*/
/*
* (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",
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");
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;
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);
{
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);
}
"number: `%s'", value);
return (1);
}
@@
-126,7
+111,7
@@
static int check_ignore_irq (const unsigned int irq)
if (irq_list_num < 1)
return (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);
if (irq == irq_list[i])
return (irq_list_action);
@@
-152,7
+137,7
@@
static void irq_submit (unsigned int irq, counter_t value)
status = snprintf (vl.type_instance, sizeof (vl.type_instance),
"%u", irq);
status = snprintf (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);
return;
plugin_dispatch_values ("irq", &vl);
@@
-160,8
+145,6
@@
static void irq_submit (unsigned int irq, counter_t value)
static int irq_read (void)
{
static int irq_read (void)
{
-#if KERNEL_LINUX
-
#undef BUFSIZE
#define BUFSIZE 256
#undef BUFSIZE
#define BUFSIZE 256
@@
-178,8
+161,9
@@
static int irq_read (void)
if ((fh = fopen ("/proc/interrupts", "r")) == NULL)
{
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)
return (-1);
}
while (fgets (buffer, BUFSIZE, fh) != NULL)
@@
-209,22
+193,15
@@
static int irq_read (void)
irq_submit (irq, irq_value);
}
fclose (fh);
irq_submit (irq, irq_value);
}
fclose (fh);
-#endif /* KERNEL_LINUX */
return (0);
} /* int irq_read */
return (0);
} /* int irq_read */
-#endif /* IRQ_HAVE_READ */
void module_register (void)
{
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);
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 BUFSIZE
-#undef MODULE_NAME