X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=eta.c;h=1f67301a902124e6b922ca980bc5796928525eb3;hb=79b199dfb3ae06fc91381e323f21114c73b7b39c;hp=1caee4996d399209c507f88b57801f3f35e96c64;hpb=342f4be43b2e74cf2f9a2102afdad11c8951b73f;p=fio.git diff --git a/eta.c b/eta.c index 1caee499..1f67301a 100644 --- a/eta.c +++ b/eta.c @@ -78,6 +78,7 @@ static void check_str_update(struct thread_data *td) c = 'C'; break; case TD_INITIALIZED: + case TD_SETTING_UP: c = 'I'; break; case TD_NOT_CREATED: @@ -264,7 +265,9 @@ int calc_thread_status(struct jobs_eta *je, int force) static struct timeval rate_prev_time, disp_prev_time; if (!force) { - if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER) + if (output_format != FIO_OUTPUT_NORMAL) + return 0; + if (temp_stall_ts || eta_print == FIO_ETA_NEVER) return 0; if (!isatty(STDOUT_FILENO) && (eta_print != FIO_ETA_ALWAYS)) @@ -316,7 +319,9 @@ 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_RUNNING) + } else if (td->runstate == TD_SETTING_UP) + je->nr_running++; + else if (td->runstate < TD_RUNNING) je->nr_pending++; if (je->elapsed_sec >= 3)