Fix spurious eta output

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index 39241c5aaf5a529dee695e86ef09c5c17d1efb15..d38553252a51087a4e40f5580d6d0fe3a5aa3f36 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -107,7 +107,7 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed)
         * if writing, bytes_total will be twice the size. If mixing,
         * assume a 50/50 split and thus bytes_total will be 50% larger.
         */
-       if (td->o.verify) {
+       if (td->o.do_verify && td->o.verify && td_write(td)) {
                if (td_rw(td))
                        bytes_total = bytes_total * 3 / 2;
                else
@@ -192,13 +192,18 @@ void print_thread_status(void)
        unsigned long long io_bytes[2];
        unsigned long rate_time, disp_time, bw_avg_time;
        struct timeval now;
+       int linelen;
 
        static unsigned long long rate_io_bytes[2];
        static unsigned long long disp_io_bytes[2];
        static struct timeval rate_prev_time, disp_prev_time;
        static unsigned int rate[2];
+       static int linelen_last;
 
-       if (temp_stall_ts || terse_output)
+       if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
+               return;
+
+       if (!isatty(STDOUT_FILENO) && (eta_print != FIO_ETA_ALWAYS))
                return;
 
        if (!rate_io_bytes[0] && !rate_io_bytes[1])
@@ -286,7 +291,11 @@ void print_thread_status(void)
                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);
+               linelen = printf(": [%s] [%3.1f%% done] [%6u/%6u kb/s] [eta %s]",
+                                run_str, perc, rate[0], rate[1], eta_str);
+               if (linelen >= 0 && linelen < linelen_last)
+                       printf("%*s", linelen_last-linelen, "");
+               linelen_last = linelen;
        }
        printf("\r");
        fflush(stdout);