projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modbus plugin: Implement the "Dataset" config option.
[collectd.git]
/
src
/
irq.c
diff --git
a/src/irq.c
b/src/irq.c
index
6c30e95
..
94e4253
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);
}
@@
-100,9
+85,7
@@
static int irq_config (const char *key, const char *value)
}
else if (strcasecmp (key, "IgnoreSelected") == 0)
{
}
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;
irq_list_action = 1;
else
irq_list_action = 0;
@@
-126,14
+109,14
@@
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);
return (1 - irq_list_action);
}
if (irq == irq_list[i])
return (irq_list_action);
return (1 - irq_list_action);
}
-static void irq_submit (unsigned int irq,
counter
_t value)
+static void irq_submit (unsigned int irq,
derive
_t value)
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
@@
-142,54
+125,52
@@
static void irq_submit (unsigned int irq, counter_t value)
if (check_ignore_irq (irq))
return;
if (check_ignore_irq (irq))
return;
- values[0].
counter
= value;
+ values[0].
derive
= value;
vl.values = values;
vl.values_len = 1;
vl.values = values;
vl.values_len = 1;
-
vl.time = time (NULL
);
- s
trcpy (vl.host, hostname_g
);
- s
trcpy (vl.plugin, "irq"
);
+
sstrncpy (vl.host, hostname_g, sizeof (vl.host)
);
+ s
strncpy (vl.plugin, "irq", sizeof (vl.plugin)
);
+ s
strncpy (vl.type, "irq", sizeof (vl.type)
);
- status = snprintf (vl.type_instance, sizeof (vl.type_instance),
+ status = s
s
nprintf (vl.type_instance, sizeof (vl.type_instance),
"%u", irq);
"%u", irq);
- if ((status < 1) || (status >= sizeof (vl.type_instance)))
+ if ((status < 1) || (
(unsigned int)
status >= sizeof (vl.type_instance)))
return;
return;
- plugin_dispatch_values (
"irq",
&vl);
+ plugin_dispatch_values (&vl);
} /* void irq_submit */
static int irq_read (void)
{
} /* void irq_submit */
static int irq_read (void)
{
-#if KERNEL_LINUX
-
-#undef BUFSIZE
-#define BUFSIZE 256
-
FILE *fh;
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));
+ char errbuf[1024];
+ ERROR ("irq plugin: fopen (/proc/interrupts): %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
return (-1);
}
return (-1);
}
+
while (fgets (buffer, BUFSIZE, fh) != NULL)
{
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 */
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;
if ((endptr == fields[0]) || (errno != 0) || (*endptr != ':'))
continue;
@@
-197,34
+178,33
@@
static int irq_read (void)
irq_value = 0;
for (i = 1; i < fields_num; i++)
{
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;
break;
- irq_value += v
alu
e;
+ irq_value += v
.deriv
e;
} /* for (i) */
} /* for (i) */
+ if (i < fields_num)
+ continue;
+
irq_submit (irq, irq_value);
}
irq_submit (irq, irq_value);
}
+
fclose (fh);
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