X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fentropy.c;h=5f9eb530caf33bf95e364199312f310d2e0fe8d8;hb=9d5a7847b03d78a94b6a0b153abeb630b4b94ddd;hp=7e0a8174cf36ff6b62d18102fa85afd531939581;hpb=e5bee85b6d9b15a57a4d555cde72a994e2dc73b1;p=collectd.git

diff --git a/src/entropy.c b/src/entropy.c
index 7e0a8174..5f9eb530 100644
--- a/src/entropy.c
+++ b/src/entropy.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/entropy.c
- * Copyright (C) 2005,2006  Florian octo Forster
+ * Copyright (C) 2007  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
@@ -23,25 +23,12 @@
 #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"
 
-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];
@@ -52,7 +39,7 @@ static void entropy_submit (double entropy)
 	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, "");
@@ -62,7 +49,6 @@ static void entropy_submit (double entropy)
 
 static int entropy_read (void)
 {
-#if KERNEL_LINUX
 	double entropy;
 	FILE *fh;
 	char buffer[64];
@@ -82,16 +68,11 @@ static int entropy_read (void)
 	
 	if (entropy > 0.0)
 		entropy_submit (entropy);
-#endif /* KERNEL_LINUX */
 
 	return (0);
 }
-#endif /* ENTROPY_HAVE_READ */
 
 void module_register (void)
 {
-	plugin_register_data_set (&ds);
-#if ENTROPY_HAVE_READ
 	plugin_register_read ("entropy", entropy_read);
-#endif
-}
+} /* void module_register */