Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index 8e17d20ea745fcb59d14d57c53c87abbd9b88fce..3c2316284909c88867c5981db71b93918e1ffef6 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:
@@ -269,7 +269,7 @@ void print_thread_status(void)
        if (!nr_running && !nr_pending)
                return;
 
-       printf("Threads: %d", nr_running);
+       printf("Jobs: %d", nr_running);
        if (m_rate || t_rate)
                printf(", CR=%d/%d KiB/s", t_rate, m_rate);
        if (eta_sec != INT_MAX && nr_running) {