projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various plugins: Convert more plugins to use "derive" instead of "counter".
[collectd.git]
/
src
/
irq.c
diff --git
a/src/irq.c
b/src/irq.c
index
986efaf
..
94e4253
100644
(file)
--- a/
src/irq.c
+++ b/
src/irq.c
@@
-85,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;
@@
-118,7
+116,7
@@
static int check_ignore_irq (const unsigned int irq)
return (1 - 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;
@@
-127,7
+125,7
@@
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;
@@
-145,35
+143,34
@@
static void irq_submit (unsigned int irq, counter_t value)
static int irq_read (void)
{
static int irq_read (void)
{
-#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)
{
char errbuf[1024];
{
char errbuf[1024];
-
WARNING
("irq plugin: fopen (/proc/interrupts): %s",
+
ERROR
("irq plugin: fopen (/proc/interrupts): %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
return (-1);
}
sstrerror (errno, errbuf, sizeof (errbuf)));
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;
@@
-181,17
+178,23
@@
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);
return (0);
fclose (fh);
return (0);