X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdisk.c;h=8feaa8dff6fe77d8127c20c9afdaa9fd2530d14d;hb=ccf62a092bb5f2c010afaab3d1c1e7f25c5e8606;hp=38c161f58d6b0009fb61f9ddc3d01ec397a01dbe;hpb=14b7c735bf93b5a6260a0e064bccc28dc7581c7f;p=collectd.git

diff --git a/src/disk.c b/src/disk.c
index 38c161f5..8feaa8df 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -58,13 +58,6 @@
 #  define UINT_MAX 4294967295U
 #endif
 
-#if HAVE_IOKIT_IOKITLIB_H || KERNEL_LINUX || HAVE_LIBKSTAT
-# define DISK_HAVE_READ 1
-#else
-# define DISK_HAVE_READ 0
-#endif
-
-#if DISK_HAVE_READ
 #if HAVE_IOKIT_IOKITLIB_H
 static mach_port_t io_master_port = MACH_PORT_NULL;
 /* #endif HAVE_IOKIT_IOKITLIB_H */
@@ -102,7 +95,11 @@ static diskstats_t *disklist;
 extern kstat_ctl_t *kc;
 static kstat_t *ksp[MAX_NUMDISK];
 static int numdisk = 0;
-#endif /* HAVE_LIBKSTAT */
+/* #endif HAVE_LIBKSTAT */
+
+#else
+# error "No applicable input method."
+#endif
 
 static int disk_init (void)
 {
@@ -234,22 +231,14 @@ static int disk_read (void)
 	int  disk_minor;
 	char disk_name[64];
 
-	static complain_t complain_obj;
-
 	/* Get the list of all disk objects. */
 	if (IOServiceGetMatchingServices (io_master_port,
 				IOServiceMatching (kIOBlockStorageDriverClass),
 				&disk_list) != kIOReturnSuccess)
 	{
-		plugin_complain (LOG_ERR, &complain_obj, "disk plugin: "
-				"IOServiceGetMatchingServices failed.");
+		ERROR ("disk plugin: IOServiceGetMatchingServices failed.");
 		return (-1);
 	}
-	else if (complain_obj.interval != 0)
-	{
-		plugin_relief (LOG_NOTICE, &complain_obj, "disk plugin: "
-				"IOServiceGetMatchingServices succeeded.");
-	}
 
 	while ((disk = IOIteratorNext (disk_list)) != 0)
 	{
@@ -389,15 +378,12 @@ static int disk_read (void)
 
 	diskstats_t *ds, *pre_ds;
 
-	static complain_t complain_obj;
-
 	if ((fh = fopen ("/proc/diskstats", "r")) == NULL)
 	{
-		if ((fh = fopen ("/proc/partitions", "r")) == NULL)
+		fh = fopen ("/proc/partitions", "r");
+		if (fh == NULL)
 		{
-			plugin_complain (LOG_ERR, &complain_obj,
-					"disk plugin: Failed to open /proc/"
-					"{diskstats,partitions}.");
+			ERROR ("disk plugin: fopen (/proc/{diskstats,partitions}) failed.");
 			return (-1);
 		}
 
@@ -405,9 +391,6 @@ static int disk_read (void)
 		fieldshift = 1;
 	}
 
-	plugin_relief (LOG_NOTICE, &complain_obj, "disk plugin: "
-			"Succeeded to open /proc/{diskstats,partitions}.");
-
 	while (fgets (buffer, sizeof (buffer), fh) != NULL)
 	{
 		char *disk_name;
@@ -579,9 +562,8 @@ static int disk_read (void)
 
 		if (is_disk)
 		{
-			if ((read_merged != -1LL) || (write_merged != -1LL))
-				disk_submit (disk_name, "disk_merged",
-						read_merged, write_merged);
+			disk_submit (disk_name, "disk_merged",
+					read_merged, write_merged);
 		} /* if (is_disk) */
 	} /* while (fgets (buffer, sizeof (buffer), fh) != NULL) */
 
@@ -639,12 +621,9 @@ static int disk_read (void)
 
 	return (0);
 } /* int disk_read */
-#endif /* DISK_HAVE_READ */
 
 void module_register (void)
 {
-#if DISK_HAVE_READ
 	plugin_register_init ("disk", disk_init);
 	plugin_register_read ("disk", disk_read);
-#endif /* DISK_HAVE_READ */
 } /* void module_register */