X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdisk.c;h=489770c7f9da86b9f8c0cb50d918871933c05603;hb=7658e9919a3ac9efafe4c7c2c76112ec67eeee3b;hp=536c51116ade61b606e3c10ac29cec7ef2dd948b;hpb=b42974a9e2d83e70c166cd572725a8d72bd2a1c4;p=collectd.git

diff --git a/src/disk.c b/src/disk.c
index 536c5111..489770c7 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/disk.c
- * Copyright (C) 2005-2007  Florian octo Forster
+ * Copyright (C) 2005-2008  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
@@ -22,6 +22,7 @@
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
+#include "utils_ignorelist.h"
 
 #if HAVE_MACH_MACH_TYPES_H
 #  include <mach/mach_types.h>
@@ -58,6 +59,10 @@
 #  define UINT_MAX 4294967295U
 #endif
 
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif
+
 #if HAVE_IOKIT_IOKITLIB_H
 static mach_port_t io_master_port = MACH_PORT_NULL;
 /* #endif HAVE_IOKIT_IOKITLIB_H */
@@ -97,10 +102,50 @@ static kstat_t *ksp[MAX_NUMDISK];
 static int numdisk = 0;
 /* #endif HAVE_LIBKSTAT */
 
+#elif defined(HAVE_LIBSTATGRAB)
+/* #endif HAVE_LIBKSTATGRAB */
+
 #else
 # error "No applicable input method."
 #endif
 
+static const char *config_keys[] =
+{
+	"Disk",
+	"IgnoreSelected"
+};
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
+
+static ignorelist_t *ignorelist = NULL;
+
+static int disk_config (const char *key, const char *value)
+{
+  if (ignorelist == NULL)
+    ignorelist = ignorelist_create (/* invert = */ 1);
+  if (ignorelist == NULL)
+    return (1);
+
+  if (strcasecmp ("Disk", key) == 0)
+  {
+    ignorelist_add (ignorelist, value);
+  }
+  else if (strcasecmp ("IgnoreSelected", key) == 0)
+  {
+    int invert = 1;
+    if ((strcasecmp ("True", value) == 0)
+	|| (strcasecmp ("Yes", value) == 0)
+	|| (strcasecmp ("On", value) == 0))
+      invert = 0;
+    ignorelist_set_invert (ignorelist, invert);
+  }
+  else
+  {
+    return (-1);
+  }
+
+  return (0);
+} /* int disk_config */
+
 static int disk_init (void)
 {
 #if HAVE_IOKIT_IOKITLIB_H
@@ -158,18 +203,22 @@ static void disk_submit (const char *plugin_instance,
 	value_t values[2];
 	value_list_t vl = VALUE_LIST_INIT;
 
+	/* Both `ignorelist' and `plugin_instance' may be NULL. */
+	if (ignorelist_match (ignorelist, plugin_instance) != 0)
+	  return;
+
 	values[0].counter = read;
 	values[1].counter = write;
 
 	vl.values = values;
 	vl.values_len = 2;
-	vl.time = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "disk", sizeof (vl.plugin));
-	strncpy (vl.plugin_instance, plugin_instance,
+	sstrncpy (vl.plugin_instance, plugin_instance,
 			sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, type, sizeof (vl.type));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void disk_submit */
 
 #if HAVE_IOKIT_IOKITLIB_H
@@ -326,7 +375,8 @@ static int disk_read (void)
 		write_tme = dict_get_value (stats_dict,
 				kIOBlockStorageDriverStatisticsTotalWriteTimeKey);
 
-		if (snprintf (disk_name, 64, "%i-%i", disk_major, disk_minor) >= 64)
+		if (ssnprintf (disk_name, sizeof (disk_name),
+				"%i-%i", disk_major, disk_minor) >= sizeof (disk_name))
 		{
 			DEBUG ("snprintf (major, minor) failed.");
 			CFRelease (child_dict);
@@ -617,13 +667,31 @@ static int disk_read (void)
 					kio.KIO_ROPS, kio.KIO_WOPS);
 		}
 	}
-#endif /* defined(HAVE_LIBKSTAT) */
+/* #endif defined(HAVE_LIBKSTAT) */
+
+#elif defined(HAVE_LIBSTATGRAB)
+	sg_disk_io_stats *ds;
+	int disks, counter;
+	char name[DATA_MAX_NAME_LEN];
+	
+	if ((ds = sg_get_disk_io_stats(&disks)) == NULL)
+		return (0);
+		
+	for (counter=0; counter < disks; counter++) {
+		strncpy(name, ds->disk_name, sizeof(name));
+		name[sizeof(name)-1] = '\0'; /* strncpy doesn't terminate longer strings */
+		disk_submit (name, "disk_octets", ds->read_bytes, ds->write_bytes);
+		ds++;
+	}
+#endif /* defined(HAVE_LIBSTATGRAB) */
 
 	return (0);
 } /* int disk_read */
 
 void module_register (void)
 {
-	plugin_register_init ("disk", disk_init);
-	plugin_register_read ("disk", disk_read);
+  plugin_register_config ("disk", disk_config,
+      config_keys, config_keys_num);
+  plugin_register_init ("disk", disk_init);
+  plugin_register_read ("disk", disk_read);
 } /* void module_register */