projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use kern.cp_times sysctl for FreeBSD smp support
[collectd.git]
/
src
/
irq.c
diff --git
a/src/irq.c
b/src/irq.c
index
1c7b5ae
..
1aef344
100644
(file)
--- a/
src/irq.c
+++ b/
src/irq.c
@@
-25,10
+25,8
@@
#include "plugin.h"
#include "configfile.h"
#include "plugin.h"
#include "configfile.h"
-#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
@@
-36,7
+34,6
@@
/*
* (Module-)Global variables
*/
/*
* (Module-)Global variables
*/
-#if IRQ_HAVE_READ
static const char *config_keys[] =
{
"Irq",
static const char *config_keys[] =
{
"Irq",
@@
-114,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);
@@
-134,30
+131,28
@@
static void irq_submit (unsigned int irq, counter_t 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;
char buffer[BUFSIZE];
unsigned int irq;
#undef BUFSIZE
#define BUFSIZE 256
FILE *fh;
char buffer[BUFSIZE];
unsigned int irq;
- unsigned
int
irq_value;
- long value;
+ unsigned
long long
irq_value;
+
unsigned long
long value;
char *endptr;
int i;
char *endptr;
int i;
@@
-187,7
+182,7
@@
static int irq_read (void)
for (i = 1; i < fields_num; i++)
{
errno = 0;
for (i = 1; i < fields_num; i++)
{
errno = 0;
- value = strtol (fields[i], &endptr, 10);
+ value = strto
ul
l (fields[i], &endptr, 10);
if ((*endptr != '\0') || (errno != 0))
break;
if ((*endptr != '\0') || (errno != 0))
break;
@@
-195,22
+190,20
@@
static int irq_read (void)
irq_value += value;
} /* for (i) */
irq_value += value;
} /* for (i) */
- irq_submit (irq, irq_value);
+ /* Force 32bit wrap-around */
+ irq_submit (irq, irq_value % 4294967296ULL);
}
}
+
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)
{
-#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
} /* void module_register */
#undef BUFSIZE