From 9c5a3854b03356e8dfe929477bf1ea67afcb8ad3 Mon Sep 17 00:00:00 2001 From: Shaozhi Shawn Ye Date: Wed, 10 Sep 2008 09:09:37 +0200 Subject: [PATCH] eta: fix bugs withe fill_device and exitall_on_terminate Signed-off-by: Jens Axboe --- eta.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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); -- 2.25.1