Don't do rate checks, if no ratemin has been specified.
[fio.git] / eta.c
diff --git a/eta.c b/eta.c
index 79836458a9724720c306e91693fd354ebe32e40b..960bf4d1b9f0e53e2a1515541ae3174e7a17e87a 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -26,20 +26,20 @@ static void check_str_update(struct thread_data *td)
                        break;
                case TD_RUNNING:
                        if (td_rw(td)) {
-                               if (td->sequential)
-                                       c = 'M';
-                               else
+                               if (td_random(td))
                                        c = 'm';
-                       } else if (td_read(td)) {
-                               if (td->sequential)
-                                       c = 'R';
                                else
+                                       c = 'M';
+                       } else if (td_read(td)) {
+                               if (td_random(td))
                                        c = 'r';
-                       } else {
-                               if (td->sequential)
-                                       c = 'W';
                                else
+                                       c = 'R';
+                       } else {
+                               if (td_random(td))
                                        c = 'w';
+                               else
+                                       c = 'W';
                        }
                        break;
                case TD_VERIFYING:
@@ -181,7 +181,7 @@ 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;
        struct thread_data *td;
-       char eta_str[32];
+       char eta_str[128];
        double perc = 0.0;
        unsigned long long io_bytes[2];
        unsigned long rate_time, disp_time, bw_avg_time;