X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=eta.c;h=22efd33f2a67eea8124db55e7f4ede9aa0f2349b;hp=39241c5aaf5a529dee695e86ef09c5c17d1efb15;hb=8b850243258107412710cd38252f0cfb8802593d;hpb=cf4464ca60ce75ac241c621bc70a2500beeb782f diff --git a/eta.c b/eta.c index 39241c5a..22efd33f 100644 --- a/eta.c +++ b/eta.c @@ -107,7 +107,7 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed) * if writing, bytes_total will be twice the size. If mixing, * assume a 50/50 split and thus bytes_total will be 50% larger. */ - if (td->o.verify) { + if (td->o.do_verify && td->o.verify && td_write(td)) { if (td_rw(td)) bytes_total = bytes_total * 3 / 2; else @@ -198,7 +198,10 @@ void print_thread_status(void) static struct timeval rate_prev_time, disp_prev_time; static unsigned int rate[2]; - if (temp_stall_ts || terse_output) + if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER) + return; + + if (!isatty(STDOUT_FILENO) && (eta_print != FIO_ETA_ALWAYS)) return; if (!rate_io_bytes[0] && !rate_io_bytes[1])