From: Jens Axboe <axboe@fb.com>
Date: Fri, 10 Oct 2014 02:05:55 +0000 (-0600)
Subject: stat: add total/short/drop ios to the json output
X-Git-Tag: fio-2.1.14~70
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=9966af7bc3b881e814d337c2417c8033a8848a66;hp=6315af9d905000f16ac9a370ae6abbe6bcebf771

stat: add total/short/drop ios to the json output

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/stat.c b/stat.c
index 536d5a9c..77e389cb 100644
--- a/stat.c
+++ b/stat.c
@@ -506,9 +506,7 @@ static void show_thread_status_normal(struct thread_stat *ts,
 	time_t time_p;
 	char time_buf[64];
 
-	if (!(ts->io_bytes[DDIR_READ] + ts->io_bytes[DDIR_WRITE] +
-	    ts->io_bytes[DDIR_TRIM]) && !(ts->total_io_u[DDIR_READ] +
-	    ts->total_io_u[DDIR_WRITE] + ts->total_io_u[DDIR_TRIM]))
+	if (!ddir_rw_sum(ts->io_bytes) && !ddir_rw_sum(ts->total_io_u))
 		return;
 
 	time(&time_p);
@@ -707,6 +705,9 @@ static void add_ddir_status_json(struct thread_stat *ts,
 	json_object_add_value_int(dir_object, "bw", bw);
 	json_object_add_value_int(dir_object, "iops", iops);
 	json_object_add_value_int(dir_object, "runtime", ts->runtime[ddir]);
+	json_object_add_value_int(dir_object, "total_ios", ts->total_io_u[ddir]);
+	json_object_add_value_int(dir_object, "short_ios", ts->short_io_u[ddir]);
+	json_object_add_value_int(dir_object, "drop_ios", ts->drop_io_u[ddir]);
 
 	if (!calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev)) {
 		min = max = 0;