X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=eta.c;h=3c2316284909c88867c5981db71b93918e1ffef6;hb=e3bab463d4397e3378d8c7437e31de8aaf861a4f;hp=79836458a9724720c306e91693fd354ebe32e40b;hpb=46fda8d0fe3332c17ef845da6de9e3241b8cb77a;p=fio.git diff --git a/eta.c b/eta.c index 79836458..3c231628 100644 --- 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; @@ -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) {