X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdisk.c;h=8830403ea60b8533211e7f2c2475d4967f20e362;hb=cedb6f147e94d0e952449f731313412ef4d67904;hp=cdf2816d24237025e5a649bdbb9e9890a8e676c6;hpb=2fbb0afbb4b6a1bb186da71e982187dc4c667351;p=collectd.git

diff --git a/src/disk.c b/src/disk.c
index cdf2816d..8830403e 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -272,6 +272,48 @@ static void disk_submit (const char *plugin_instance,
 } /* void disk_submit */
 
 #if KERNEL_LINUX
+static void submit_in_progress (char const *disk_name, gauge_t in_progress)
+{
+	value_t v;
+	value_list_t vl = VALUE_LIST_INIT;
+
+	if (ignorelist_match (ignorelist, disk_name) != 0)
+	  return;
+
+	v.gauge = in_progress;
+
+	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, disk_name, sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, "pending_operations", sizeof (vl.type));
+
+	plugin_dispatch_values (&vl);
+}
+
+static void submit_io_time (char const *plugin_instance, derive_t io_time, derive_t weighted_time)
+{
+	value_t values[2];
+	value_list_t vl = VALUE_LIST_INIT;
+
+	if (ignorelist_match (ignorelist, plugin_instance) != 0)
+	  return;
+
+	values[0].derive = io_time;
+	values[1].derive = weighted_time;
+
+	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, plugin_instance, sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, "disk_io_time", sizeof (vl.type));
+
+	plugin_dispatch_values (&vl);
+}
+
+
 static counter_t disk_calc_time_incr (counter_t delta_time, counter_t delta_ops)
 {
 	double interval = CDTIME_T_TO_DOUBLE (plugin_get_interval ());
@@ -539,6 +581,9 @@ static int disk_read (void)
 	derive_t write_ops     = 0;
 	derive_t write_merged  = 0;
 	derive_t write_time    = 0;
+	gauge_t in_progress    = NAN;
+	derive_t io_time       = 0;
+	derive_t weighted_time = 0;
 	int is_disk = 0;
 
 	diskstats_t *ds, *pre_ds;
@@ -620,6 +665,11 @@ static int disk_read (void)
 				read_time    = atoll (fields[6 + fieldshift]);
 				write_merged = atoll (fields[8 + fieldshift]);
 				write_time   = atoll (fields[10+ fieldshift]);
+
+				in_progress = atof (fields[11 + fieldshift]);
+
+				io_time       = atof (fields[12 + fieldshift]);
+				weighted_time = atof (fields[13 + fieldshift]);
 			}
 		}
 		else
@@ -743,6 +793,8 @@ static int disk_read (void)
 		{
 			disk_submit (output_name, "disk_merged",
 					read_merged, write_merged);
+			submit_in_progress (output_name, in_progress);
+			submit_io_time (output_name, io_time, weighted_time);
 		} /* if (is_disk) */
 
 		/* release udev-based alternate name, if allocated */
@@ -807,7 +859,12 @@ static int disk_read (void)
 
 #elif defined(HAVE_LIBSTATGRAB)
 	sg_disk_io_stats *ds;
-	int disks, counter;
+# if HAVE_LIBSTATGRAB_0_90
+	size_t disks;
+# else
+	int disks;
+#endif
+	int counter;
 	char name[DATA_MAX_NAME_LEN];
 	
 	if ((ds = sg_get_disk_io_stats(&disks)) == NULL)