projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pull/collectd-4.1' into collectd-4.1
[collectd.git]
/
src
/
entropy.c
diff --git
a/src/entropy.c
b/src/entropy.c
index
7e0a817
..
5f9eb53
100644
(file)
--- a/
src/entropy.c
+++ b/
src/entropy.c
@@
-1,6
+1,6
@@
/**
* collectd - src/entropy.c
/**
* collectd - src/entropy.c
- * Copyright (C) 200
5,2006
Florian octo Forster
+ * Copyright (C) 200
7
Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-23,25
+23,12
@@
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#if KERNEL_LINUX
-# define ENTROPY_HAVE_READ 1
-#else
-# define ENTROPY_HAVE_READ 0
+#if !KERNEL_LINUX
+# error "No applicable input method."
#endif
#define ENTROPY_FILE "/proc/sys/kernel/random/entropy_avail"
#endif
#define ENTROPY_FILE "/proc/sys/kernel/random/entropy_avail"
-static data_source_t dsrc[1] =
-{
- {"entropy", DS_TYPE_GAUGE, 0.0, 4294967295.0}
-};
-
-static data_set_t ds =
-{
- "entropy", 1, dsrc
-};
-
-#if ENTROPY_HAVE_READ
static void entropy_submit (double entropy)
{
value_t values[1];
static void entropy_submit (double entropy)
{
value_t values[1];
@@
-52,7
+39,7
@@
static void entropy_submit (double entropy)
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- strcpy (vl.host, hostname);
+ strcpy (vl.host, hostname
_g
);
strcpy (vl.plugin, "entropy");
strcpy (vl.plugin_instance, "");
strcpy (vl.type_instance, "");
strcpy (vl.plugin, "entropy");
strcpy (vl.plugin_instance, "");
strcpy (vl.type_instance, "");
@@
-62,7
+49,6
@@
static void entropy_submit (double entropy)
static int entropy_read (void)
{
static int entropy_read (void)
{
-#if KERNEL_LINUX
double entropy;
FILE *fh;
char buffer[64];
double entropy;
FILE *fh;
char buffer[64];
@@
-82,16
+68,11
@@
static int entropy_read (void)
if (entropy > 0.0)
entropy_submit (entropy);
if (entropy > 0.0)
entropy_submit (entropy);
-#endif /* KERNEL_LINUX */
return (0);
}
return (0);
}
-#endif /* ENTROPY_HAVE_READ */
void module_register (void)
{
void module_register (void)
{
- plugin_register_data_set (&ds);
-#if ENTROPY_HAVE_READ
plugin_register_read ("entropy", entropy_read);
plugin_register_read ("entropy", entropy_read);
-#endif
-}
+} /* void module_register */