X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fserial.c;h=9bd885dbbf0bec28aeacbe8ae06624a06bf0a98e;hb=4fd631aa4fc9aa2e5339a1531dc74915676844a4;hp=c278672086b64d3b6b7474f96241f1975855a27d;hpb=dc80c73c20ef0e69c3850fd9679a827ad79e61a1;p=collectd.git

diff --git a/src/serial.c b/src/serial.c
index c2786720..9bd885db 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -25,52 +25,37 @@
 #include "common.h"
 #include "plugin.h"
 
-#if defined(KERNEL_LINUX)
-# define SERIAL_HAVE_READ 1
-#else
-# define SERIAL_HAVE_READ 0
+#if !KERNEL_LINUX
+# error "No applicable input method."
 #endif
 
-static data_source_t octets_dsrc[2] =
-{
-	{"rx", DS_TYPE_COUNTER, 0, 4294967295.0},
-	{"tx", DS_TYPE_COUNTER, 0, 4294967295.0}
-};
-
-static data_set_t octets_ds =
-{
-	"serial_octets", 2, octets_dsrc
-};
-
-#if SERIAL_HAVE_READ
 static void serial_submit (const char *type_instance,
-		counter_t rx, counter_t tx)
+		derive_t rx, derive_t tx)
 {
 	value_t values[2];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].counter = rx;
-	values[1].counter = tx;
+	values[0].derive = rx;
+	values[1].derive = tx;
 
 	vl.values = values;
 	vl.values_len = 2;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "serial");
-	strncpy (vl.type_instance, type_instance,
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "serial", sizeof (vl.plugin));
+	sstrncpy (vl.type, "serial_octets", sizeof (vl.type));
+	sstrncpy (vl.type_instance, type_instance,
 			sizeof (vl.type_instance));
 
-	plugin_dispatch_values ("serial_octets", &vl);
+	plugin_dispatch_values (&vl);
 }
 
 static int serial_read (void)
 {
-#ifdef KERNEL_LINUX
 	FILE *fh;
 	char buffer[1024];
 
-	counter_t rx = 0;
-	counter_t tx = 0;
+	derive_t rx = 0;
+	derive_t tx = 0;
 	
 	char *fields[16];
 	int i, numfields;
@@ -132,17 +117,9 @@ static int serial_read (void)
 
 	fclose (fh);
 	return (0);
-#endif /* KERNEL_LINUX */
 } /* int serial_read */
-#endif /* SERIAL_HAVE_READ */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
-	if (load & MR_DATASETS)
-		plugin_register_data_set (&octets_ds);
-
-#if SERIAL_HAVE_READ
-	if (load & MR_READ)
-		plugin_register_read ("serial", serial_read);
-#endif /* SERIAL_HAVE_READ */
+	plugin_register_read ("serial", serial_read);
 } /* void module_register */