Unify the time handling

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index 769ac14370429e07babd4c01fb30027d9c1638e9..b0501029c2b29c2e0ea6925be1d39b66e6cd17d5 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -127,8 +127,10 @@ static int thread_eta(struct thread_data *td)
        unsigned long long bytes_total, bytes_done;
        unsigned long eta_sec = 0;
        unsigned long elapsed;
+       uint64_t timeout;
 
        elapsed = (mtime_since_now(&td->epoch) + 999) / 1000;
+       timeout = td->o.timeout / 1000000UL;
 
        bytes_total = td->total_io_size;
 
@@ -174,7 +176,7 @@ static int thread_eta(struct thread_data *td)
                        perc = 1.0;
 
                if (td->o.time_based) {
-                       perc_t = (double) elapsed / (double) td->o.timeout;
+                       perc_t = (double) elapsed / (double) timeout;
                        if (perc_t < perc)
                                perc = perc_t;
                }
@@ -182,10 +184,11 @@ static int thread_eta(struct thread_data *td)
                eta_sec = (unsigned long) (elapsed * (1.0 / perc)) - elapsed;
 
                if (td->o.timeout &&
-                   eta_sec > (td->o.timeout + done_secs - elapsed))
-                       eta_sec = td->o.timeout + done_secs - elapsed;
+                   eta_sec > (timeout + done_secs - elapsed))
+                       eta_sec = timeout + done_secs - elapsed;
        } else if (td->runstate == TD_NOT_CREATED || td->runstate == TD_CREATED
                        || td->runstate == TD_INITIALIZED
+                       || td->runstate == TD_SETTING_UP
                        || td->runstate == TD_RAMP
                        || td->runstate == TD_PRE_READING) {
                int t_eta = 0, r_eta = 0;
@@ -196,8 +199,12 @@ static int thread_eta(struct thread_data *td)
                 * if given, otherwise assume it'll run at the specified rate.
                 */
                if (td->o.timeout) {
-                       t_eta = td->o.timeout + td->o.start_delay +
-                                       td->o.ramp_time;
+                       uint64_t timeout = td->o.timeout;
+                       uint64_t start_delay = td->o.start_delay;
+                       uint64_t ramp_time = td->o.ramp_time;
+
+                       t_eta = timeout + start_delay + ramp_time;
+                       t_eta /= 1000000ULL;
 
                        if (in_ramp_time(td)) {
                                unsigned long ramp_left;
@@ -211,7 +218,7 @@ static int thread_eta(struct thread_data *td)
                rate_bytes = ddir_rw_sum(td->o.rate);
                if (rate_bytes) {
                        r_eta = (bytes_total / 1024) / rate_bytes;
-                       r_eta += td->o.start_delay;
+                       r_eta += (td->o.start_delay / 1000000ULL);
                }
 
                if (r_eta && t_eta)
@@ -349,9 +356,10 @@ int calc_thread_status(struct jobs_eta *je, int force)
                } else if (td->runstate == TD_RAMP) {
                        je->nr_running++;
                        je->nr_ramp++;
-               } else if (td->runstate == TD_SETTING_UP)
+               } else if (td->runstate == TD_SETTING_UP) {
                        je->nr_running++;
-               else if (td->runstate < TD_RUNNING)
+                       je->nr_setting_up++;
+               } else if (td->runstate < TD_RUNNING)
                        je->nr_pending++;
 
                if (je->elapsed_sec >= 3)
@@ -361,7 +369,7 @@ int calc_thread_status(struct jobs_eta *je, int force)
 
                check_str_update(td);
 
-               if (td->runstate > TD_RAMP) {
+               if (td->runstate > TD_SETTING_UP) {
                        int ddir;
 
                        for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) {
@@ -471,8 +479,13 @@ void display_thread_status(struct jobs_eta *je)
                if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running)
                        strcpy(perc_str, "-.-% done");
                else {
+                       double mult = 100.0;
+
+                       if (je->nr_setting_up && je->nr_running)
+                               mult *= (1.0 - (double) je->nr_setting_up / (double) je->nr_running);
+
                        eta_good = 1;
-                       perc *= 100.0;
+                       perc *= mult;
                        sprintf(perc_str, "%3.1f%% done", perc);
                }