#include <string.h>
#include "fio.h"
-#include "os.h"
static char run_str[MAX_JOBS + 1];
* 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
bytes_total /= (td->o.zone_skip / td->o.zone_size);
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
- double perc;
+ double perc, perc_t;
bytes_done = td->io_bytes[DDIR_READ] + td->io_bytes[DDIR_WRITE];
perc = (double) bytes_done / (double) bytes_total;
if (perc > 1.0)
perc = 1.0;
+ if (td->o.time_based) {
+ perc_t = (double) elapsed / (double) td->o.timeout;
+ if (perc_t < perc)
+ perc = perc_t;
+ }
+
eta_sec = (unsigned long) (elapsed * (1.0 / perc)) - elapsed;
if (td->o.timeout && eta_sec > (td->o.timeout - elapsed))
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])