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

diff --git a/src/serial.c b/src/serial.c
index 78210300..c2786720 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/serial.c
- * Copyright (C) 2005  David Bacher
+ * Copyright (C) 2005,2006  David Bacher
  *
  * 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
@@ -21,64 +21,56 @@
  *   Florian octo Forster <octo at verplant.org>
  **/
 
-#include "serial.h"
-
-#if COLLECT_SERIAL
-#define MODULE_NAME "serial"
-
-#include "plugin.h"
+#include "collectd.h"
 #include "common.h"
+#include "plugin.h"
 
-static char *serial_filename_template = "serial-%s.rrd";
+#if defined(KERNEL_LINUX)
+# define SERIAL_HAVE_READ 1
+#else
+# define SERIAL_HAVE_READ 0
+#endif
 
-static char *ds_def[] =
+static data_source_t octets_dsrc[2] =
 {
-	"DS:incoming:COUNTER:25:0:U",
-	"DS:outgoing:COUNTER:25:0:U",
-	NULL
+	{"rx", DS_TYPE_COUNTER, 0, 4294967295.0},
+	{"tx", DS_TYPE_COUNTER, 0, 4294967295.0}
 };
-static int ds_num = 2;
 
-void serial_init (void)
+static data_set_t octets_ds =
 {
-}
+	"serial_octets", 2, octets_dsrc
+};
 
-void serial_write (char *host, char *inst, char *val)
+#if SERIAL_HAVE_READ
+static void serial_submit (const char *type_instance,
+		counter_t rx, counter_t tx)
 {
-	char file[512];
-	int status;
-
-	status = snprintf (file, 512, serial_filename_template, inst);
-	if (status < 1)
-		return;
-	else if (status >= 512)
-		return;
+	value_t values[2];
+	value_list_t vl = VALUE_LIST_INIT;
 
-	rrd_update_file (host, file, val, ds_def, ds_num);
-}
+	values[0].counter = rx;
+	values[1].counter = tx;
 
-#define BUFSIZE 512
-void serial_submit (char *device,
-		unsigned long long incoming,
-		unsigned long long outgoing)
-{
-	char buf[BUFSIZE];
-        
-	if (snprintf (buf, BUFSIZE, "%u:%llu:%llu", (unsigned int) curtime,
-				incoming, outgoing) >= BUFSIZE)
-		return;
+	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,
+			sizeof (vl.type_instance));
 
-	plugin_submit (MODULE_NAME, device, buf);
+	plugin_dispatch_values ("serial_octets", &vl);
 }
-#undef BUFSIZE
 
-void serial_read (void)
+static int serial_read (void)
 {
 #ifdef KERNEL_LINUX
-
 	FILE *fh;
 	char buffer[1024];
-	unsigned long long incoming, outgoing;
+
+	counter_t rx = 0;
+	counter_t tx = 0;
 	
 	char *fields[16];
 	int i, numfields;
@@ -88,11 +80,13 @@ void serial_read (void)
 	if ((fh = fopen ("/proc/tty/driver/serial", "r")) == NULL &&
 		(fh = fopen ("/proc/tty/driver/ttyS", "r")) == NULL)
 	{
-		syslog (LOG_WARNING, "serial: fopen: %s", strerror (errno));
-		return;
+		char errbuf[1024];
+		WARNING ("serial: fopen: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		return (-1);
 	}
 
-	while (fgets (buffer, 1024, fh) != NULL)
+	while (fgets (buffer, sizeof (buffer), fh) != NULL)
 	{
 		int have_rx = 0, have_tx = 0;
 
@@ -120,12 +114,12 @@ void serial_read (void)
 
 			if (strncmp (fields[i], "tx:", 3) == 0)
 			{
-				outgoing = atoll (fields[i] + 3);
+				tx = atoll (fields[i] + 3);
 				have_tx++;
 			}
 			else if (strncmp (fields[i], "rx:", 3) == 0)
 			{
-				incoming = atoll (fields[i] + 3);
+				rx = atoll (fields[i] + 3);
 				have_rx++;
 			}
 		}
@@ -133,17 +127,22 @@ void serial_read (void)
 		if ((have_rx == 0) || (have_tx == 0))
 			continue;
 
-		serial_submit (fields[0], incoming, outgoing);
+		serial_submit (fields[0], rx, tx);
 	}
 
 	fclose (fh);
+	return (0);
 #endif /* KERNEL_LINUX */
-}
+} /* int serial_read */
+#endif /* SERIAL_HAVE_READ */
 
-void module_register (void)
+void module_register (modreg_e load)
 {
-   plugin_register (MODULE_NAME, serial_init, serial_read, serial_write);
-}
-
-#undef MODULE_NAME
-#endif /* COLLECT_SERIAL */
+	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 */
+} /* void module_register */