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.10' into collectd-5.0
[collectd.git]
/
src
/
irq.c
diff --git
a/src/irq.c
b/src/irq.c
index
70d6b5a
..
7e73829
100644
(file)
--- a/
src/irq.c
+++ b/
src/irq.c
@@
-106,7
+106,7
@@
static int check_ignore_irq (const char *irq)
return (1 - irq_list_action);
}
return (1 - irq_list_action);
}
-static void irq_submit (const char *irq_name,
counter
_t value)
+static void irq_submit (const char *irq_name,
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;
@@
-114,7
+114,7
@@
static void irq_submit (const char *irq_name, counter_t value)
if (check_ignore_irq (irq_name))
return;
if (check_ignore_irq (irq_name))
return;
- values[0].
counter
= value;
+ values[0].
derive
= value;
vl.values = values;
vl.values_len = 1;
vl.values = values;
vl.values_len = 1;
@@
-130,25
+130,25
@@
static int irq_read (void)
{
FILE *fh;
char buffer[1024];
{
FILE *fh;
char buffer[1024];
- unsigned long long irq_value;
- unsigned long long value;
- char *endptr;
- int i;
- 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, sizeof (buffer), fh) != NULL)
{
char *irq_name;
size_t irq_name_len;
while (fgets (buffer, sizeof (buffer), fh) != NULL)
{
char *irq_name;
size_t irq_name_len;
+ derive_t irq_value;
+ int i;
+
+ char *fields[64];
+ int fields_num;
fields_num = strsplit (buffer, fields, 64);
if (fields_num < 2)
fields_num = strsplit (buffer, fields, 64);
if (fields_num < 2)
@@
-170,23
+170,22
@@
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;
-
endptr = NULL
;
-
value = strtoull (fields[i], &endptr, 10)
;
+ /* Per-CPU value */
+
value_t v
;
+
int status
;
- /* Ignore all fields following a non-numeric field. */
- if (
(errno != 0) || (endptr == NULL) || (*endptr != 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) */
/* No valid fields -> do not submit anything. */
if (i <= 1)
continue;
} /* for (i) */
/* No valid fields -> do not submit anything. */
if (i <= 1)
continue;
- /* Force 32bit wrap-around */
- irq_submit (irq_name, irq_value % 4294967296ULL);
+ irq_submit (irq_name, irq_value);
}
fclose (fh);
}
fclose (fh);