X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftape.c;h=a8e7dc45faab08bdf18ffd42fbebd242f3f3477f;hb=aff80830f1154a5b6c4da16a0b1033aafde14e24;hp=b13cdbd84e6a18db69ff6f822c9f4bc9a9a3ea69;hpb=601abecb59b6041e84f11877345a98efba7b651b;p=collectd.git

diff --git a/src/tape.c b/src/tape.c
index b13cdbd8..a8e7dc45 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -24,47 +24,23 @@
 #include "common.h"
 #include "plugin.h"
 
-#define MODULE_NAME "tape"
-
-#if defined(HAVE_LIBKSTAT)
-# define TAPE_HAVE_READ 1
-#else
-# define TAPE_HAVE_READ 0
+#if !HAVE_LIBKSTAT
+# error "No applicable input method."
 #endif
 
-static char *tape_filename_template = "tape-%s.rrd";
-
-/* 104857600 == 100 MB */
-static char *tape_ds_def[] =
-{
-	"DS:rcount:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	"DS:rmerged:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	"DS:rbytes:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	"DS:rtime:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	"DS:wcount:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	"DS:wmerged:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	"DS:wbytes:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	"DS:wtime:COUNTER:"COLLECTD_HEARTBEAT":0:U",
-	NULL
-};
-static int tape_ds_num = 8;
-
-#if defined(HAVE_LIBKSTAT)
 #define MAX_NUMTAPE 256
 extern kstat_ctl_t *kc;
 static kstat_t *ksp[MAX_NUMTAPE];
 static int numtape = 0;
-#endif /* HAVE_LIBKSTAT */
 
-static void tape_init (void)
+static int tape_init (void)
 {
-#ifdef HAVE_LIBKSTAT
 	kstat_t *ksp_chain;
 
 	numtape = 0;
 
 	if (kc == NULL)
-		return;
+		return (-1);
 
 	for (numtape = 0, ksp_chain = kc->kc_chain;
 			(numtape < MAX_NUMTAPE) && (ksp_chain != NULL);
@@ -76,62 +52,59 @@ static void tape_init (void)
 			continue;
 		ksp[numtape++] = ksp_chain;
 	}
-#endif
-
-	return;
-}
-
-static void tape_write (char *host, char *inst, char *val)
-{
-	char file[512];
-	int status;
-
-	status = snprintf (file, 512, tape_filename_template, inst);
-	if (status < 1)
-		return;
-	else if (status >= 512)
-		return;
 
-	rrd_update_file (host, file, val, tape_ds_def, tape_ds_num);
-}
-
-
-#if TAPE_HAVE_READ
-#define BUFSIZE 512
-static void tape_submit (char *tape_name,
-		unsigned long long read_count,
-		unsigned long long read_merged,
-		unsigned long long read_bytes,
-		unsigned long long read_time,
-		unsigned long long write_count,
-		unsigned long long write_merged,
-		unsigned long long write_bytes,
-		unsigned long long write_time)
+	return (0);
+} /* int tape_init */
 
+static void tape_submit (const char *plugin_instance,
+		const char *type,
+		derive_t read, derive_t write)
 {
-	char buf[BUFSIZE];
+	value_t values[2];
+	value_list_t vl = VALUE_LIST_INIT;
 
-	if (snprintf (buf, BUFSIZE, "%u:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu",
-				(unsigned int) curtime,
-				read_count, read_merged, read_bytes, read_time,
-				write_count, write_merged, write_bytes,
-				write_time) >= BUFSIZE)
-		return;
+	values[0].derive = read;
+	values[1].derive = write;
 
-	plugin_submit (MODULE_NAME, tape_name, buf);
-}
+	vl.values = values;
+	vl.values_len = 2;
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "tape", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, plugin_instance,
+			sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, type, sizeof (vl.type));
 
-#undef BUFSIZE
+	plugin_dispatch_values (&vl);
+} /* void tape_submit */
 
-static void tape_read (void)
+static int tape_read (void)
 {
 
-#if defined(HAVE_LIBKSTAT)
+#if HAVE_KSTAT_IO_T_WRITES && HAVE_KSTAT_IO_T_NWRITES && HAVE_KSTAT_IO_T_WTIME
+# define KIO_ROCTETS reads
+# define KIO_WOCTETS writes
+# define KIO_ROPS    nreads
+# define KIO_WOPS    nwrites
+# define KIO_RTIME   rtime
+# define KIO_WTIME   wtime
+#elif HAVE_KSTAT_IO_T_NWRITTEN && HAVE_KSTAT_IO_T_WRITES && HAVE_KSTAT_IO_T_WTIME
+# define KIO_ROCTETS nread
+# define KIO_WOCTETS nwritten
+# define KIO_ROPS    reads
+# define KIO_WOPS    writes
+# define KIO_RTIME   rtime
+# define KIO_WTIME   wtime
+#else
+# error "kstat_io_t does not have the required members"
+#endif
 	static kstat_io_t kio;
 	int i;
 
 	if (kc == NULL)
-		return;
+		return (-1);
+
+	if (numtape <= 0)
+		return (-1);
 
 	for (i = 0; i < numtape; i++)
 	{
@@ -139,19 +112,22 @@ static void tape_read (void)
 			continue;
 
 		if (strncmp (ksp[i]->ks_class, "tape", 4) == 0)
-			tape_submit (ksp[i]->ks_name,
-					kio.reads,  0LL, kio.nread,    kio.rtime,
-					kio.writes, 0LL, kio.nwritten, kio.wtime);
+		{
+			tape_submit (ksp[i]->ks_name, "tape_octets",
+					kio.KIO_ROCTETS, kio.KIO_WOCTETS);
+			tape_submit (ksp[i]->ks_name, "tape_ops",
+					kio.KIO_ROPS, kio.KIO_WOPS);
+			/* FIXME: Convert this to microseconds if necessary */
+			tape_submit (ksp[i]->ks_name, "tape_time",
+					kio.KIO_RTIME, kio.KIO_WTIME);
+		}
 	}
-#endif /* defined(HAVE_LIBKSTAT) */
+
+	return (0);
 }
-#else
-# define tape_read NULL
-#endif /* TAPE_HAVE_READ */
 
 void module_register (void)
 {
-	plugin_register (MODULE_NAME, tape_init, tape_read, tape_write);
+	plugin_register_init ("tape", tape_init);
+	plugin_register_read ("tape", tape_read);
 }
-
-#undef MODULE_NAME