Fix spurious eta output

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index 09d7daa4d5d40915c8072749f8b01a961bc983b9..d38553252a51087a4e40f5580d6d0fe3a5aa3f36 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -6,7 +6,6 @@
 #include <string.h>
 
 #include "fio.h"
-#include "os.h"
 
 static char run_str[MAX_JOBS + 1];
 
@@ -108,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
@@ -119,13 +118,19 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed)
                bytes_total /= (td->o.zone_skip / td->o.zone_size);
 
        if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
-               double perc;
+               double perc, perc_t;
 
                bytes_done = td->io_bytes[DDIR_READ] + td->io_bytes[DDIR_WRITE];
                perc = (double) bytes_done / (double) bytes_total;
                if (perc > 1.0)
                        perc = 1.0;
 
+               if (td->o.time_based) {
+                       perc_t = (double) elapsed / (double) td->o.timeout;
+                       if (perc_t < perc)
+                               perc = perc_t;
+               }
+
                eta_sec = (unsigned long) (elapsed * (1.0 / perc)) - elapsed;
 
                if (td->o.timeout && eta_sec > (td->o.timeout - elapsed))
@@ -180,19 +185,25 @@ 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, files_open;
        struct thread_data *td;
        char eta_str[128];
        double perc = 0.0;
        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 || eta_print == FIO_ETA_NEVER)
+               return;
 
-       if (temp_stall_ts || terse_output)
+       if (!isatty(STDOUT_FILENO) && (eta_print != FIO_ETA_ALWAYS))
                return;
 
        if (!rate_io_bytes[0] && !rate_io_bytes[1])
@@ -204,8 +215,9 @@ 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;
+       files_open = 0;
        for_each_td(td, i) {
                if (td->o.bw_avg_time < bw_avg_time)
                        bw_avg_time = td->o.bw_avg_time;
@@ -214,6 +226,9 @@ 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;
+                       files_open += td->nr_open_files;
                } else if (td->runstate < TD_RUNNING)
                        nr_pending++;
 
@@ -269,12 +284,18 @@ void print_thread_status(void)
        if (!nr_running && !nr_pending)
                return;
 
-       printf("Jobs: %d", nr_running);
+       printf("Jobs: %d (f=%d)", nr_running, files_open);
        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);
+               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);