From: Shaozhi Shawn Ye <yeshao@google.com>
Date: Wed, 10 Sep 2008 07:09:37 +0000 (+0200)
Subject: eta: fix bugs withe fill_device and exitall_on_terminate
X-Git-Tag: fio-1.22-rc1~2
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=9c5a3854b03356e8dfe929477bf1ea67afcb8ad3;ds=sidebyside

eta: fix bugs withe fill_device and exitall_on_terminate

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

diff --git a/eta.c b/eta.c
index 766f6509..47e9e339 100644
--- a/eta.c
+++ b/eta.c
@@ -115,6 +115,9 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed)
 	if (td->o.zone_size && td->o.zone_skip)
 		bytes_total /= (td->o.zone_skip / td->o.zone_size);
 
+	if (td->o.fill_device && td->o.size  == -1ULL)
+		return 0;
+
 	if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
 		double perc, perc_t;
 
@@ -247,8 +250,13 @@ void print_thread_status(void)
 		eta_sec = 0;
 
 	for_each_td(td, i) {
-		if (eta_secs[i] != INT_MAX)
-			eta_sec += eta_secs[i];
+		if (exitall_on_terminate) {
+			if (eta_secs[i] < eta_sec)
+				eta_sec = eta_secs[i];
+		} else {
+			if (eta_secs[i] > eta_sec)
+				eta_sec = eta_secs[i];
+		}
 	}
 
 	free(eta_secs);