X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=eta.c;h=1e61b7e90c1c55a4c2c3b291fcb5c87ce550018b;hb=7c9b1bce094d58c374b086bbb780c08265623ea4;hp=1c809eede5711dca2502cca46ac181fb2fb1ddec;hpb=b29ee5b3dee417016164198fb240344ef666de2b;p=fio.git

diff --git a/eta.c b/eta.c
index 1c809eed..1e61b7e9 100644
--- a/eta.c
+++ b/eta.c
@@ -44,6 +44,9 @@ static void check_str_update(struct thread_data *td)
 				c = 'W';
 		}
 		break;
+	case TD_PRE_READING:
+		c = 'p';
+		break;
 	case TD_VERIFYING:
 		c = 'V';
 		break;
@@ -145,7 +148,8 @@ static int thread_eta(struct thread_data *td)
 			eta_sec = td->o.timeout + done_secs - elapsed;
 	} else if (td->runstate == TD_NOT_CREATED || td->runstate == TD_CREATED
 			|| td->runstate == TD_INITIALIZED
-			|| td->runstate == TD_RAMP) {
+			|| td->runstate == TD_RAMP
+			|| td->runstate == TD_PRE_READING) {
 		int t_eta = 0, r_eta = 0;
 
 		/*
@@ -242,7 +246,8 @@ void print_thread_status(void)
 		if (td->o.bw_avg_time < bw_avg_time)
 			bw_avg_time = td->o.bw_avg_time;
 		if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING
-		    || td->runstate == TD_FSYNCING) {
+		    || td->runstate == TD_FSYNCING
+		    || td->runstate == TD_PRE_READING) {
 			nr_running++;
 			t_rate += td->o.rate;
 			m_rate += td->o.ratemin;
@@ -296,8 +301,8 @@ void print_thread_status(void)
 	if (write_bw_log && rate_time > bw_avg_time && !in_ramp_time(td)) {
 		calc_rate(rate_time, io_bytes, rate_io_bytes, rate);
 		memcpy(&rate_prev_time, &now, sizeof(now));
-		add_agg_sample(rate[DDIR_READ], DDIR_READ);
-		add_agg_sample(rate[DDIR_WRITE], DDIR_WRITE);
+		add_agg_sample(rate[DDIR_READ], DDIR_READ, 0);
+		add_agg_sample(rate[DDIR_WRITE], DDIR_WRITE, 0);
 	}
 
 	disp_time = mtime_since(&disp_prev_time, &now);