Ensure that buffer contents are random across jobs as well

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index 608e0dd4cfa59a130c35bf39d0e3918618aca893..e1cced4643873a1e1388ac3c9b27bc0eeb904e26 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -7,7 +7,7 @@
 
 #include "fio.h"
 
-static char run_str[MAX_JOBS + 1];
+static char run_str[REAL_MAX_JOBS + 1];
 
 /*
  * Sets the status of the 'td' in the printed status map.
@@ -161,12 +161,13 @@ 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;
+                       t_eta = td->o.timeout + td->o.start_delay +
+                                       td->o.ramp_time;
 
                        if (in_ramp_time(td)) {
                                unsigned long ramp_left;
 
-                               ramp_left = mtime_since_now(&td->start);
+                               ramp_left = mtime_since_now(&td->epoch);
                                ramp_left = (ramp_left + 999) / 1000;
                                if (ramp_left <= t_eta)
                                        t_eta -= ramp_left;
@@ -390,7 +391,7 @@ void print_thread_status(void)
        fflush(stdout);
 }
 
-void print_status_init(int thread_number)
+void print_status_init(int thr_number)
 {
-       run_str[thread_number] = 'P';
+       run_str[thr_number] = 'P';
 }