Add ETA output control and interactivity check

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index 625b1f885e9899ea1e4d49639d73c14dcac6ec48..22efd33f2a67eea8124db55e7f4ede9aa0f2349b 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -198,7 +198,10 @@ void print_thread_status(void)
        static struct timeval rate_prev_time, disp_prev_time;
        static unsigned int rate[2];
 
        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])
                return;
 
        if (!rate_io_bytes[0] && !rate_io_bytes[1])