X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fdisk.c;h=6187459f8e93fd0088d6b5646f19b204e1e1827e;hp=c5a0cc8555c6041b1c6519888d38a24b0e8d08ea;hb=61a1fa91ba73e4fe3a34949f77c5f017056f2b7a;hpb=bab707fe46b2ef69f391864f3bb08b4dca19634e

diff --git a/src/disk.c b/src/disk.c
index c5a0cc85..6187459f 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/disk.c
  * Copyright (C) 2005-2008  Florian octo Forster
+ * Copyright (C) 2009       Manuel Sanmartin
  *
  * 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
@@ -17,6 +18,7 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Manuel Sanmartin
  **/
 
 #include "collectd.h"
@@ -63,6 +65,14 @@
 # include <statgrab.h>
 #endif
 
+#if HAVE_PERFSTAT
+# ifndef _AIXVERSION_610
+# include <sys/systemcfg.h>
+# endif
+# include <sys/protosw.h>
+# include <libperfstat.h>
+#endif
+
 #if HAVE_IOKIT_IOKITLIB_H
 static mach_port_t io_master_port = MACH_PORT_NULL;
 /* #endif HAVE_IOKIT_IOKITLIB_H */
@@ -105,6 +115,12 @@ static int numdisk = 0;
 #elif defined(HAVE_LIBSTATGRAB)
 /* #endif HAVE_LIBKSTATGRAB */
 
+#elif HAVE_PERFSTAT
+static perfstat_disk_t * stat_disk;
+static int numdisk;
+static int pnumdisk;
+/* #endif HAVE_PERFSTAT */
+
 #else
 # error "No applicable input method."
 #endif
@@ -132,9 +148,7 @@ static int disk_config (const char *key, const char *value)
   else if (strcasecmp ("IgnoreSelected", key) == 0)
   {
     int invert = 1;
-    if ((strcasecmp ("True", value) == 0)
-	|| (strcasecmp ("Yes", value) == 0)
-	|| (strcasecmp ("On", value) == 0))
+    if (IS_TRUE (value))
       invert = 0;
     ignorelist_set_invert (ignorelist, invert);
   }
@@ -150,7 +164,7 @@ static int disk_init (void)
 {
 #if HAVE_IOKIT_IOKITLIB_H
 	kern_return_t status;
-	
+
 	if (io_master_port != MACH_PORT_NULL)
 	{
 		mach_port_deallocate (mach_task_self (),
@@ -212,9 +226,8 @@ static void disk_submit (const char *plugin_instance,
 
 	vl.values = values;
 	vl.values_len = 2;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "disk");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "disk", sizeof (vl.plugin));
 	sstrncpy (vl.plugin_instance, plugin_instance,
 			sizeof (vl.plugin_instance));
 	sstrncpy (vl.type, type, sizeof (vl.type));
@@ -413,7 +426,6 @@ static int disk_read (void)
 	int numfields;
 	int fieldshift = 0;
 
-	int major = 0;
 	int minor = 0;
 
 	counter_t read_sectors  = 0;
@@ -451,10 +463,9 @@ static int disk_read (void)
 		if ((numfields != (14 + fieldshift)) && (numfields != 7))
 			continue;
 
-		major = atoll (fields[0]);
 		minor = atoll (fields[1]);
 
-		disk_name = fields[2];
+		disk_name = fields[2 + fieldshift];
 
 		for (ds = disklist, pre_ds = disklist; ds != NULL; pre_ds = ds, ds = ds->next)
 			if (strcmp (disk_name, ds->name) == 0)
@@ -684,7 +695,60 @@ static int disk_read (void)
 		disk_submit (name, "disk_octets", ds->read_bytes, ds->write_bytes);
 		ds++;
 	}
-#endif /* defined(HAVE_LIBSTATGRAB) */
+/* #endif defined(HAVE_LIBSTATGRAB) */
+
+#elif defined(HAVE_PERFSTAT)
+	counter_t read_sectors;
+	counter_t write_sectors;
+	counter_t read_time;
+	counter_t write_time;
+	counter_t read_ops;
+	counter_t write_ops;
+	perfstat_id_t firstpath;
+	int rnumdisk;
+	int i;
+
+	if ((numdisk = perfstat_disk(NULL, NULL, sizeof(perfstat_disk_t), 0)) < 0) 
+	{
+		char errbuf[1024];
+		WARNING ("disk plugin: perfstat_disk: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		return (-1);
+	}
+
+	if (numdisk != pnumdisk || stat_disk==NULL) {
+		if (stat_disk!=NULL) 
+			free(stat_disk);
+		stat_disk = (perfstat_disk_t *)calloc(numdisk, sizeof(perfstat_disk_t));
+	} 
+	pnumdisk = numdisk;
+
+	firstpath.name[0]='\0';
+	if ((rnumdisk = perfstat_disk(&firstpath, stat_disk, sizeof(perfstat_disk_t), numdisk)) < 0) 
+	{
+		char errbuf[1024];
+		WARNING ("disk plugin: perfstat_disk : %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		return (-1);
+	}
+
+	for (i = 0; i < rnumdisk; i++) 
+	{
+		read_sectors = stat_disk[i].rblks*stat_disk[i].bsize;
+		write_sectors = stat_disk[i].wblks*stat_disk[i].bsize;
+		disk_submit (stat_disk[i].name, "disk_octets", read_sectors, write_sectors);
+
+		read_ops = stat_disk[i].xrate;
+		write_ops = stat_disk[i].xfers - stat_disk[i].xrate;
+		disk_submit (stat_disk[i].name, "disk_ops", read_ops, write_ops);
+
+		read_time = stat_disk[i].rserv;
+		read_time *= ((double)(_system_configuration.Xint)/(double)(_system_configuration.Xfrac)) / 1000000.0;
+		write_time = stat_disk[i].wserv;
+		write_time *= ((double)(_system_configuration.Xint)/(double)(_system_configuration.Xfrac)) / 1000000.0;
+		disk_submit (stat_disk[i].name, "disk_time", read_time, write_time);
+	}
+#endif /* defined(HAVE_PERFSTAT) */
 
 	return (0);
 } /* int disk_read */