From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 16 Mar 2007 09:24:07 +0000 (+0100)
Subject: If the rate setting is based on IOPS, reflect that in eta output
X-Git-Tag: fio-1.15~79
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=ac71feb12023e3fadb793cc30636af1c982ce106;ds=sidebyside

If the rate setting is based on IOPS, reflect that in eta output

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

diff --git a/eta.c b/eta.c
index 09d7daa4..3089e3f3 100644
--- a/eta.c
+++ b/eta.c
@@ -180,6 +180,7 @@ void print_thread_status(void)
 {
 	unsigned long elapsed = mtime_since_genesis() / 1000;
 	int i, nr_running, nr_pending, t_rate, m_rate, *eta_secs, eta_sec;
+	int t_iops, m_iops;
 	struct thread_data *td;
 	char eta_str[128];
 	double perc = 0.0;
@@ -204,7 +205,7 @@ void print_thread_status(void)
 	memset(eta_secs, 0, thread_number * sizeof(int));
 
 	io_bytes[0] = io_bytes[1] = 0;
-	nr_pending = nr_running = t_rate = m_rate = 0;
+	nr_pending = nr_running = t_rate = m_rate = t_iops = m_iops = 0;
 	bw_avg_time = ULONG_MAX;
 	for_each_td(td, i) {
 		if (td->o.bw_avg_time < bw_avg_time)
@@ -214,6 +215,8 @@ void print_thread_status(void)
 			nr_running++;
 			t_rate += td->o.rate;
 			m_rate += td->o.ratemin;
+			t_iops += td->o.rate_iops;
+			m_iops += td->o.rate_iops_min;
 		} else if (td->runstate < TD_RUNNING)
 			nr_pending++;
 
@@ -272,6 +275,8 @@ void print_thread_status(void)
 	printf("Jobs: %d", nr_running);
 	if (m_rate || t_rate)
 		printf(", CR=%d/%d KiB/s", t_rate, m_rate);
+	else if (m_iops || t_iops)
+		printf(", CR=%d/%d IOPS", t_iops, m_iops);
 	if (eta_sec != INT_MAX && nr_running) {
 		perc *= 100.0;
 		printf(": [%s] [%3.1f%% done] [%6u/%6u kb/s] [eta %s]", run_str, perc, rate[0], rate[1], eta_str);