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

diff --git a/eta.c b/eta.c
index 1c809eed..a9082d04 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;
 
 		/*
@@ -196,6 +200,15 @@ static void calc_rate(unsigned long mtime, unsigned long long *io_bytes,
 	prev_io_bytes[1] = io_bytes[1];
 }
 
+static void calc_iops(unsigned long mtime, unsigned long long *io_iops,
+		      unsigned long long *prev_io_iops, unsigned int *iops)
+{
+	iops[0] = ((io_iops[0] - prev_io_iops[0]) * 1000) / mtime;
+	iops[1] = ((io_iops[1] - prev_io_iops[1]) * 1000) / mtime;
+	prev_io_iops[0] = io_iops[0];
+	prev_io_iops[1] = io_iops[1];
+}
+
 /*
  * Print status of the jobs we know about. This includes rate estimates,
  * ETA, thread state, etc.
@@ -208,14 +221,15 @@ void print_thread_status(void)
 	struct thread_data *td;
 	char eta_str[128];
 	double perc = 0.0;
-	unsigned long long io_bytes[2];
+	unsigned long long io_bytes[2], io_iops[2];
 	unsigned long rate_time, disp_time, bw_avg_time, *eta_secs, eta_sec;
 	struct timeval now;
 
 	static unsigned long long rate_io_bytes[2];
 	static unsigned long long disp_io_bytes[2];
+	static unsigned long long disp_io_iops[2];
 	static struct timeval rate_prev_time, disp_prev_time;
-	static unsigned int rate[2];
+	static unsigned int rate[2], iops[2];
 	static int linelen_last;
 	static int eta_good;
 
@@ -234,6 +248,7 @@ void print_thread_status(void)
 	memset(eta_secs, 0, thread_number * sizeof(unsigned long));
 
 	io_bytes[0] = io_bytes[1] = 0;
+	io_iops[0] = io_iops[1] = 0;
 	nr_pending = nr_running = t_rate = m_rate = t_iops = m_iops = 0;
 	nr_ramp = 0;
 	bw_avg_time = ULONG_MAX;
@@ -242,7 +257,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;
@@ -265,6 +281,8 @@ void print_thread_status(void)
 		if (td->runstate > TD_RAMP) {
 			io_bytes[0] += td->io_bytes[0];
 			io_bytes[1] += td->io_bytes[1];
+			io_iops[0] += td->io_blocks[0];
+			io_iops[1] += td->io_blocks[1];
 		}
 	}
 
@@ -296,8 +314,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);
@@ -305,6 +323,8 @@ void print_thread_status(void)
 		return;
 
 	calc_rate(disp_time, io_bytes, disp_io_bytes, rate);
+	calc_iops(disp_time, io_iops, disp_io_iops, iops);
+
 	memcpy(&disp_prev_time, &now, sizeof(now));
 
 	if (!nr_running && !nr_pending)
@@ -317,7 +337,9 @@ void print_thread_status(void)
 		printf(", CR=%d/%d IOPS", t_iops, m_iops);
 	if (eta_sec != INT_MAX && nr_running) {
 		char perc_str[32];
-		int ll;
+		char *iops_str[2];
+		char *rate_str[2];
+		int l;
 
 		if ((!eta_sec && !eta_good) || nr_ramp == nr_running)
 			strcpy(perc_str, "-.-% done");
@@ -327,11 +349,23 @@ void print_thread_status(void)
 			sprintf(perc_str, "%3.1f%% done", perc);
 		}
 
-		ll = printf(": [%s] [%s] [%6u/%6u kb/s] [eta %s]",
-				 run_str, perc_str, rate[0], rate[1], eta_str);
-		if (ll >= 0 && ll < linelen_last)
-			printf("%*s", linelen_last - ll, "");
-		linelen_last = ll;
+		rate_str[0] = num2str(rate[0], 5, 10, 1);
+		rate_str[1] = num2str(rate[1], 5, 10, 1);
+
+		iops_str[0] = num2str(iops[0], 4, 1, 0);
+		iops_str[1] = num2str(iops[1], 4, 1, 0);
+
+		l = printf(": [%s] [%s] [%s/%s /s] [%s/%s iops] [eta %s]",
+				 run_str, perc_str, rate_str[0], rate_str[1], 
+				 iops_str[0], iops_str[1], eta_str);
+		if (l >= 0 && l < linelen_last)
+			printf("%*s", linelen_last - l, "");
+		linelen_last = l;
+
+		free(rate_str[0]);
+		free(rate_str[1]);
+		free(iops_str[0]);
+		free(iops_str[1]);
 	}
 	printf("\r");
 	fflush(stdout);