Include transfer size in the clat/slat measurements

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index bac3ddfdd05c287e814fbf789cbc49e6d80edcc5..5a5188f1378d9010ed8f8576cfd3c2f56dc0168c 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -23,6 +23,9 @@ static void check_str_update(struct thread_data *td)
        case TD_EXITED:
                c = 'E';
                break;
+       case TD_RAMP:
+               c = '/';
+               break;
        case TD_RUNNING:
                if (td_rw(td)) {
                        if (td_random(td))
@@ -66,13 +69,11 @@ static void check_str_update(struct thread_data *td)
 /*
  * Convert seconds to a printable string.
  */
-static void eta_to_str(char *str, int eta_sec)
+static void eta_to_str(char *str, unsigned long eta_sec)
 {
        unsigned int d, h, m, s;
        int disp_hour = 0;
 
-       d = h = m = s = 0;
-
        s = eta_sec % 60;
        eta_sec /= 60;
        m = eta_sec % 60;
@@ -96,10 +97,13 @@ static void eta_to_str(char *str, int eta_sec)
 /*
  * Best effort calculation of the estimated pending runtime of a job.
  */
-static int thread_eta(struct thread_data *td, unsigned long elapsed)
+static int thread_eta(struct thread_data *td)
 {
        unsigned long long bytes_total, bytes_done;
        unsigned long eta_sec = 0;
+       unsigned long elapsed;
+
+       elapsed = (mtime_since_now(&td->epoch) + 999) / 1000;
 
        bytes_total = td->total_io_size;
 
@@ -117,6 +121,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;
 
@@ -137,15 +144,26 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed)
                    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) {
+                       || td->runstate == TD_INITIALIZED
+                       || td->runstate == TD_RAMP) {
                int t_eta = 0, r_eta = 0;
 
                /*
                 * We can only guess - assume it'll run the full timeout
                 * if given, otherwise assume it'll run at the specified rate.
                 */
-               if (td->o.timeout)
+               if (td->o.timeout) {
                        t_eta = td->o.timeout + td->o.start_delay;
+
+                       if (in_ramp_time(td)) {
+                               unsigned long ramp_left;
+
+                               ramp_left = mtime_since_now(&td->start);
+                               ramp_left = (ramp_left + 999) / 1000;
+                               if (ramp_left <= t_eta)
+                                       t_eta -= ramp_left;
+                       }
+               }
                if (td->o.rate) {
                        r_eta = (bytes_total / 1024) / td->o.rate;
                        r_eta += td->o.start_delay;
@@ -184,8 +202,8 @@ 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;
+       unsigned long elapsed = (mtime_since_genesis() + 999) / 1000;
+       int i, nr_ramp, nr_running, nr_pending, t_rate, m_rate;
        int t_iops, m_iops, files_open;
        struct thread_data *td;
        char eta_str[128];
@@ -199,6 +217,7 @@ void print_thread_status(void)
        static struct timeval rate_prev_time, disp_prev_time;
        static unsigned int rate[2];
        static int linelen_last;
+       static int eta_good;
 
        if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
                return;
@@ -216,6 +235,7 @@ void print_thread_status(void)
 
        io_bytes[0] = io_bytes[1] = 0;
        nr_pending = nr_running = t_rate = m_rate = t_iops = m_iops = 0;
+       nr_ramp = 0;
        bw_avg_time = ULONG_MAX;
        files_open = 0;
        for_each_td(td, i) {
@@ -229,17 +249,23 @@ void print_thread_status(void)
                        t_iops += td->o.rate_iops;
                        m_iops += td->o.rate_iops_min;
                        files_open += td->nr_open_files;
+               } else if (td->runstate == TD_RAMP) {
+                       nr_running++;
+                       nr_ramp++;
                } else if (td->runstate < TD_RUNNING)
                        nr_pending++;
 
                if (elapsed >= 3)
-                       eta_secs[i] = thread_eta(td, elapsed);
+                       eta_secs[i] = thread_eta(td);
                else
                        eta_secs[i] = INT_MAX;
 
                check_str_update(td);
-               io_bytes[0] += td->io_bytes[0];
-               io_bytes[1] += td->io_bytes[1];
+
+               if (td->runstate > TD_RAMP) {
+                       io_bytes[0] += td->io_bytes[0];
+                       io_bytes[1] += td->io_bytes[1];
+               }
        }
 
        if (exitall_on_terminate)
@@ -248,8 +274,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);
@@ -262,11 +293,11 @@ 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 && !in_ramp_time(td)) {
                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);
+               add_agg_sample(rate[DDIR_READ], DDIR_READ, 0);
+               add_agg_sample(rate[DDIR_WRITE], DDIR_WRITE, 0);
        }
 
        disp_time = mtime_since(&disp_prev_time, &now);
@@ -285,11 +316,19 @@ 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) {
+               char perc_str[32];
                int ll;
 
-               perc *= 100.0;
-               ll = printf(": [%s] [%3.1f%% done] [%6u/%6u kb/s] [eta %s]",
-                                run_str, perc, rate[0], rate[1], eta_str);
+               if ((!eta_sec && !eta_good) || nr_ramp == nr_running)
+                       strcpy(perc_str, "-.-% done");
+               else {
+                       eta_good = 1;
+                       perc *= 100.0;
+                       sprintf(perc_str, "%3.1f%% done", perc);
+               }
+
+               ll = printf(": [%s] [%s] [%6u/%6u kb/s] [eta %s]",
+                                run_str, perc_str, rate[0], rate[1], eta_str);
                if (ll >= 0 && ll < linelen_last)
                        printf("%*s", linelen_last - ll, "");
                linelen_last = ll;