Add write barriers
[fio.git] / eta.c
diff --git a/eta.c b/eta.c
index 39241c5..bac3ddf 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -17,47 +17,47 @@ static void check_str_update(struct thread_data *td)
        char c = run_str[td->thread_number - 1];
 
        switch (td->runstate) {
-               case TD_REAPED:
-                       c = '_';
-                       break;
-               case TD_EXITED:
-                       c = 'E';
-                       break;
-               case TD_RUNNING:
-                       if (td_rw(td)) {
-                               if (td_random(td))
-                                       c = 'm';
-                               else
-                                       c = 'M';
-                       } else if (td_read(td)) {
-                               if (td_random(td))
-                                       c = 'r';
-                               else
-                                       c = 'R';
-                       } else {
-                               if (td_random(td))
-                                       c = 'w';
-                               else
-                                       c = 'W';
-                       }
-                       break;
-               case TD_VERIFYING:
-                       c = 'V';
-                       break;
-               case TD_FSYNCING:
-                       c = 'F';
-                       break;
-               case TD_CREATED:
-                       c = 'C';
-                       break;
-               case TD_INITIALIZED:
-                       c = 'I';
-                       break;
-               case TD_NOT_CREATED:
-                       c = 'P';
-                       break;
-               default:
-                       log_err("state %d\n", td->runstate);
+       case TD_REAPED:
+               c = '_';
+               break;
+       case TD_EXITED:
+               c = 'E';
+               break;
+       case TD_RUNNING:
+               if (td_rw(td)) {
+                       if (td_random(td))
+                               c = 'm';
+                       else
+                               c = 'M';
+               } else if (td_read(td)) {
+                       if (td_random(td))
+                               c = 'r';
+                       else
+                               c = 'R';
+               } else {
+                       if (td_random(td))
+                               c = 'w';
+                       else
+                               c = 'W';
+               }
+               break;
+       case TD_VERIFYING:
+               c = 'V';
+               break;
+       case TD_FSYNCING:
+               c = 'F';
+               break;
+       case TD_CREATED:
+               c = 'C';
+               break;
+       case TD_INITIALIZED:
+               c = 'I';
+               break;
+       case TD_NOT_CREATED:
+               c = 'P';
+               break;
+       default:
+               log_err("state %d\n", td->runstate);
        }
 
        run_str[td->thread_number - 1] = 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
@@ -133,8 +133,9 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed)
 
                eta_sec = (unsigned long) (elapsed * (1.0 / perc)) - elapsed;
 
-               if (td->o.timeout && eta_sec > (td->o.timeout - elapsed))
-                       eta_sec = td->o.timeout - elapsed;
+               if (td->o.timeout &&
+                   eta_sec > (td->o.timeout + done_secs - elapsed))
+                       eta_sec = td->o.timeout + done_secs - elapsed;
        } else if (td->runstate == TD_NOT_CREATED || td->runstate == TD_CREATED
                        || td->runstate == TD_INITIALIZED) {
                int t_eta = 0, r_eta = 0;
@@ -144,10 +145,10 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed)
                 * if given, otherwise assume it'll run at the specified rate.
                 */
                if (td->o.timeout)
-                       t_eta = td->o.timeout + td->o.start_delay - elapsed;
+                       t_eta = td->o.timeout + td->o.start_delay;
                if (td->o.rate) {
                        r_eta = (bytes_total / 1024) / td->o.rate;
-                       r_eta += td->o.start_delay - elapsed;
+                       r_eta += td->o.start_delay;
                }
 
                if (r_eta && t_eta)
@@ -176,7 +177,7 @@ static void calc_rate(unsigned long mtime, unsigned long long *io_bytes,
        prev_io_bytes[0] = io_bytes[0];
        prev_io_bytes[1] = io_bytes[1];
 }
-       
+
 /*
  * Print status of the jobs we know about. This includes rate estimates,
  * ETA, thread state, etc.
@@ -184,21 +185,25 @@ static void calc_rate(unsigned long mtime, unsigned long long *io_bytes,
 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 i, nr_running, nr_pending, t_rate, m_rate;
        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;
+       unsigned long rate_time, disp_time, bw_avg_time, *eta_secs, eta_sec;
        struct timeval now;
 
        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])
@@ -206,8 +211,8 @@ void print_thread_status(void)
        if (!disp_io_bytes[0] && !disp_io_bytes[1])
                fill_start_time(&disp_prev_time);
 
-       eta_secs = malloc(thread_number * sizeof(int));
-       memset(eta_secs, 0, thread_number * sizeof(int));
+       eta_secs = malloc(thread_number * sizeof(unsigned long));
+       memset(eta_secs, 0, thread_number * sizeof(unsigned long));
 
        io_bytes[0] = io_bytes[1] = 0;
        nr_pending = nr_running = t_rate = m_rate = t_iops = m_iops = 0;
@@ -243,13 +248,8 @@ void print_thread_status(void)
                eta_sec = 0;
 
        for_each_td(td, 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];
-               }
+               if (eta_secs[i] != INT_MAX)
+                       eta_sec += eta_secs[i];
        }
 
        free(eta_secs);
@@ -262,7 +262,7 @@ void print_thread_status(void)
        fio_gettime(&now, NULL);
        rate_time = mtime_since(&rate_prev_time, &now);
 
-       if (write_bw_log && rate_time> bw_avg_time) {
+       if (write_bw_log && rate_time > bw_avg_time) {
                calc_rate(rate_time, io_bytes, rate_io_bytes, rate);
                memcpy(&rate_prev_time, &now, sizeof(now));
                add_agg_sample(rate[DDIR_READ], DDIR_READ);
@@ -285,8 +285,14 @@ void print_thread_status(void)
        else if (m_iops || t_iops)
                printf(", CR=%d/%d IOPS", t_iops, m_iops);
        if (eta_sec != INT_MAX && nr_running) {
+               int ll;
+
                perc *= 100.0;
-               printf(": [%s] [%3.1f%% done] [%6u/%6u kb/s] [eta %s]", run_str, perc, rate[0], rate[1], eta_str);
+               ll = printf(": [%s] [%3.1f%% done] [%6u/%6u kb/s] [eta %s]",
+                                run_str, perc, rate[0], rate[1], eta_str);
+               if (ll >= 0 && ll < linelen_last)
+                       printf("%*s", linelen_last - ll, "");
+               linelen_last = ll;
        }
        printf("\r");
        fflush(stdout);