X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdisk.c;h=bafc82e042274d9f7da4eadca94d48ad6543dc90;hb=50345eec33951b964e2829e83c30399b71f2baba;hp=85b2329945e929baf6dc733a8510d557382a63a3;hpb=2df75b141dc7474a72ce949bd0ce1ca5739e6fef;p=collectd.git

diff --git a/src/disk.c b/src/disk.c
index 85b23299..bafc82e0 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -293,44 +293,46 @@ static void disk_submit (const char *plugin_instance,
 	plugin_dispatch_values (&vl);
 } /* void disk_submit */
 
-#if KERNEL_LINUX
-static void submit_in_progress (char const *disk_name, gauge_t in_progress)
+#if KERNEL_FREEBSD || KERNEL_LINUX
+static void submit_io_time (char const *plugin_instance, derive_t io_time, derive_t weighted_time)
 {
-	value_t v;
+	value_t values[2];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	if (ignorelist_match (ignorelist, disk_name) != 0)
+	if (ignorelist_match (ignorelist, plugin_instance) != 0)
 	  return;
 
-	v.gauge = in_progress;
+	values[0].derive = io_time;
+	values[1].derive = weighted_time;
 
-	vl.values = &v;
-	vl.values_len = 1;
+	vl.values = values;
+	vl.values_len = 2;
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "disk", sizeof (vl.plugin));
-	sstrncpy (vl.plugin_instance, disk_name, sizeof (vl.plugin_instance));
-	sstrncpy (vl.type, "pending_operations", sizeof (vl.type));
+	sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, "disk_io_time", sizeof (vl.type));
 
 	plugin_dispatch_values (&vl);
-}
+} /* void submit_io_time */
+#endif /* KERNEL_FREEBSD || KERNEL_LINUX */
 
-static void submit_io_time (char const *plugin_instance, derive_t io_time, derive_t weighted_time)
+#if KERNEL_LINUX
+static void submit_in_progress (char const *disk_name, gauge_t in_progress)
 {
-	value_t values[2];
+	value_t v;
 	value_list_t vl = VALUE_LIST_INIT;
 
-	if (ignorelist_match (ignorelist, plugin_instance) != 0)
+	if (ignorelist_match (ignorelist, disk_name) != 0)
 	  return;
 
-	values[0].derive = io_time;
-	values[1].derive = weighted_time;
+	v.gauge = in_progress;
 
-	vl.values = values;
-	vl.values_len = 2;
+	vl.values = &v;
+	vl.values_len = 1;
 	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, "disk_io_time", sizeof (vl.type));
+	sstrncpy (vl.plugin_instance, disk_name, sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, "pending_operations", sizeof (vl.type));
 
 	plugin_dispatch_values (&vl);
 }
@@ -536,7 +538,7 @@ static int disk_read (void)
 	struct gident *geom_id;
 
 	const char *disk_name;
-	long double read_time, write_time;
+	long double read_time, write_time, busy_time, total_duration;
 
 	for (retry = 0, dirty = 1; retry < 5 && dirty == 1; retry++) {
 		if (snap != NULL)
@@ -631,6 +633,16 @@ static int disk_read (void)
 			disk_submit (disk_name, "disk_time",
 					(derive_t)(read_time*1000), (derive_t)(write_time*1000));
 		}
+		if (devstat_compute_statistics(snap_iter, NULL, 1.0,
+		    DSM_TOTAL_BUSY_TIME, &busy_time,
+		    DSM_TOTAL_DURATION, &total_duration,
+		    DSM_NONE) != 0) {
+			WARNING("%s", devstat_errbuf);
+		}
+		else
+		{
+			submit_io_time(disk_name, busy_time, total_duration);
+		}
 	}
 	geom_stats_snapshot_free(snap);