Add write barriers
[fio.git] / eta.c
diff --git a/eta.c b/eta.c
index 339f656..bac3ddf 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];
 
@@ -18,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->sequential)
-                                       c = 'M';
-                               else
-                                       c = 'm';
-                       } else if (td_read(td)) {
-                               if (td->sequential)
-                                       c = 'R';
-                               else
-                                       c = 'r';
-                       } else {
-                               if (td->sequential)
-                                       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;
@@ -70,7 +69,7 @@ static void check_str_update(struct thread_data *td)
 static void eta_to_str(char *str, int eta_sec)
 {
        unsigned int d, h, m, s;
-       static int always_d, always_h;
+       int disp_hour = 0;
 
        d = h = m = s = 0;
 
@@ -82,17 +81,16 @@ static void eta_to_str(char *str, int eta_sec)
        eta_sec /= 24;
        d = eta_sec;
 
-       if (d || always_d) {
-               always_d = 1;
-               str += sprintf(str, "%02dd:", d);
-       }
-       if (h || always_h) {
-               always_h = 1;
-               str += sprintf(str, "%02dh:", h);
+       if (d) {
+               disp_hour = 1;
+               str += sprintf(str, "%02ud:", d);
        }
 
-       str += sprintf(str, "%02dm:", m);
-       str += sprintf(str, "%02ds", s);
+       if (h || disp_hour)
+               str += sprintf(str, "%02uh:", h);
+
+       str += sprintf(str, "%02um:", m);
+       str += sprintf(str, "%02us", s);
 }
 
 /*
@@ -101,7 +99,7 @@ static void eta_to_str(char *str, int eta_sec)
 static int thread_eta(struct thread_data *td, unsigned long elapsed)
 {
        unsigned long long bytes_total, bytes_done;
-       unsigned int eta_sec = 0;
+       unsigned long eta_sec = 0;
 
        bytes_total = td->total_io_size;
 
@@ -109,28 +107,35 @@ 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->verify) {
+       if (td->o.do_verify && td->o.verify && td_write(td)) {
                if (td_rw(td))
                        bytes_total = bytes_total * 3 / 2;
                else
                        bytes_total <<= 1;
        }
 
-       if (td->zone_size && td->zone_skip)
-               bytes_total /= (td->zone_skip / td->zone_size);
+       if (td->o.zone_size && td->o.zone_skip)
+               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;
 
-               eta_sec = (elapsed * (1.0 / perc)) - elapsed;
+               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->timeout && eta_sec > (td->timeout - elapsed))
-                       eta_sec = td->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;
@@ -139,11 +144,11 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed)
                 * We can only guess - assume it'll run the full timeout
                 * if given, otherwise assume it'll run at the specified rate.
                 */
-               if (td->timeout)
-                       t_eta = td->timeout + td->start_delay - elapsed;
-               if (td->rate) {
-                       r_eta = (bytes_total / 1024) / td->rate;
-                       r_eta += td->start_delay - elapsed;
+               if (td->o.timeout)
+                       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;
                }
 
                if (r_eta && t_eta)
@@ -164,6 +169,15 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed)
        return eta_sec;
 }
 
+static void calc_rate(unsigned long mtime, unsigned long long *io_bytes,
+                     unsigned long long *prev_io_bytes, unsigned int *rate)
+{
+       rate[0] = (io_bytes[0] - prev_io_bytes[0]) / mtime;
+       rate[1] = (io_bytes[1] - prev_io_bytes[1]) / mtime;
+       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.
@@ -171,34 +185,50 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed)
 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[32];
+       char eta_str[128];
        double perc = 0.0;
-
-       static unsigned long long prev_io_bytes[2];
-       static struct timeval prev_time;
-       static unsigned int r_rate, w_rate;
        unsigned long long io_bytes[2];
-       unsigned long mtime;
+       unsigned long rate_time, disp_time, bw_avg_time, *eta_secs, eta_sec;
+       struct timeval now;
 
-       if (temp_stall_ts || terse_output)
+       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 (!isatty(STDOUT_FILENO) && (eta_print != FIO_ETA_ALWAYS))
                return;
 
-       if (!prev_io_bytes[0] && !prev_io_bytes[1])
-               fill_start_time(&prev_time);
+       if (!rate_io_bytes[0] && !rate_io_bytes[1])
+               fill_start_time(&rate_prev_time);
+       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 = 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->runstate == TD_RUNNING || td->runstate == TD_VERIFYING||
-                   td->runstate == TD_FSYNCING) {
+               if (td->o.bw_avg_time < bw_avg_time)
+                       bw_avg_time = td->o.bw_avg_time;
+               if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING
+                   || td->runstate == TD_FSYNCING) {
                        nr_running++;
-                       t_rate += td->rate;
-                       m_rate += td->ratemin;
+                       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++;
 
@@ -218,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);
@@ -234,23 +259,40 @@ void print_thread_status(void)
                eta_to_str(eta_str, eta_sec);
        }
 
-       mtime = mtime_since_now(&prev_time);
-       if (mtime > 1000) {
-               r_rate = (io_bytes[0] - prev_io_bytes[0]) / mtime;
-               w_rate = (io_bytes[1] - prev_io_bytes[1]) / mtime;
-               gettimeofday(&prev_time, NULL);
-               memcpy(prev_io_bytes, io_bytes, sizeof(io_bytes));
+       fio_gettime(&now, NULL);
+       rate_time = mtime_since(&rate_prev_time, &now);
+
+       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);
+               add_agg_sample(rate[DDIR_WRITE], DDIR_WRITE);
        }
 
+       disp_time = mtime_since(&disp_prev_time, &now);
+       if (disp_time < 1000)
+               return;
+
+       calc_rate(disp_time, io_bytes, disp_io_bytes, rate);
+       memcpy(&disp_prev_time, &now, sizeof(now));
+
        if (!nr_running && !nr_pending)
                return;
 
-       printf("Threads running: %d", nr_running);
+       printf("Jobs: %d (f=%d)", nr_running, files_open);
        if (m_rate || t_rate)
-               printf(", commitrate %d/%dKiB/sec", t_rate, m_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) {
+               int ll;
+
                perc *= 100.0;
-               printf(": [%s] [%3.2f%% done] [%6u/%6u kb/s] [eta %s]", run_str, perc, r_rate, w_rate, 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);