X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=eta.c;h=22efd33f2a67eea8124db55e7f4ede9aa0f2349b;hp=79836458a9724720c306e91693fd354ebe32e40b;hb=8b850243258107412710cd38252f0cfb8802593d;hpb=46fda8d0fe3332c17ef845da6de9e3241b8cb77a

diff --git a/eta.c b/eta.c
index 79836458..22efd33f 100644
--- a/eta.c
+++ b/eta.c
@@ -6,7 +6,6 @@
 #include <string.h>
 
 #include "fio.h"
-#include "os.h"
 
 static char run_str[MAX_JOBS + 1];
 
@@ -26,20 +25,20 @@ static void check_str_update(struct thread_data *td)
 			break;
 		case TD_RUNNING:
 			if (td_rw(td)) {
-				if (td->sequential)
-					c = 'M';
-				else
+				if (td_random(td))
 					c = 'm';
-			} else if (td_read(td)) {
-				if (td->sequential)
-					c = 'R';
 				else
+					c = 'M';
+			} else if (td_read(td)) {
+				if (td_random(td))
 					c = 'r';
-			} else {
-				if (td->sequential)
-					c = 'W';
 				else
+					c = 'R';
+			} else {
+				if (td_random(td))
 					c = 'w';
+				else
+					c = 'W';
 			}
 			break;
 		case TD_VERIFYING:
@@ -108,28 +107,34 @@ 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->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 <<= 1;
 	}
 
-	if (td->zone_size && td->zone_skip)
-		bytes_total /= (td->zone_skip / td->zone_size);
+	if (td->o.zone_size && td->o.zone_skip)
+		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->timeout && eta_sec > (td->timeout - elapsed))
-			eta_sec = td->timeout - elapsed;
+		if (td->o.timeout && eta_sec > (td->o.timeout - elapsed))
+			eta_sec = td->o.timeout - elapsed;
 	} else if (td->runstate == TD_NOT_CREATED || td->runstate == TD_CREATED
 			|| td->runstate == TD_INITIALIZED) {
 		int t_eta = 0, r_eta = 0;
@@ -138,11 +143,11 @@ static int thread_eta(struct thread_data *td, unsigned long elapsed)
 		 * We can only guess - assume it'll run the full timeout
 		 * if given, otherwise assume it'll run at the specified rate.
 		 */
-		if (td->timeout)
-			t_eta = td->timeout + td->start_delay - elapsed;
-		if (td->rate) {
-			r_eta = (bytes_total / 1024) / td->rate;
-			r_eta += td->start_delay - elapsed;
+		if (td->o.timeout)
+			t_eta = td->o.timeout + td->o.start_delay - elapsed;
+		if (td->o.rate) {
+			r_eta = (bytes_total / 1024) / td->o.rate;
+			r_eta += td->o.start_delay - elapsed;
 		}
 
 		if (r_eta && t_eta)
@@ -180,8 +185,9 @@ void print_thread_status(void)
 {
 	unsigned long elapsed = mtime_since_genesis() / 1000;
 	int i, nr_running, nr_pending, t_rate, m_rate, *eta_secs, eta_sec;
+	int t_iops, m_iops, files_open;
 	struct thread_data *td;
-	char eta_str[32];
+	char eta_str[128];
 	double perc = 0.0;
 	unsigned long long io_bytes[2];
 	unsigned long rate_time, disp_time, bw_avg_time;
@@ -192,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])
@@ -204,16 +213,20 @@ void print_thread_status(void)
 	memset(eta_secs, 0, thread_number * sizeof(int));
 
 	io_bytes[0] = io_bytes[1] = 0;
-	nr_pending = nr_running = t_rate = m_rate = 0;
+	nr_pending = nr_running = t_rate = m_rate = t_iops = m_iops = 0;
 	bw_avg_time = ULONG_MAX;
+	files_open = 0;
 	for_each_td(td, i) {
-		if (td->bw_avg_time < bw_avg_time)
-			bw_avg_time = td->bw_avg_time;
+		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) {
 			nr_running++;
-			t_rate += td->rate;
-			m_rate += td->ratemin;
+			t_rate += td->o.rate;
+			m_rate += td->o.ratemin;
+			t_iops += td->o.rate_iops;
+			m_iops += td->o.rate_iops_min;
+			files_open += td->nr_open_files;
 		} else if (td->runstate < TD_RUNNING)
 			nr_pending++;
 
@@ -269,9 +282,11 @@ void print_thread_status(void)
 	if (!nr_running && !nr_pending)
 		return;
 
-	printf("Threads: %d", nr_running);
+	printf("Jobs: %d (f=%d)", nr_running, files_open);
 	if (m_rate || t_rate)
 		printf(", CR=%d/%d KiB/s", t_rate, m_rate);
+	else if (m_iops || t_iops)
+		printf(", CR=%d/%d IOPS", t_iops, m_iops);
 	if (eta_sec != INT_MAX && nr_running) {
 		perc *= 100.0;
 		printf(": [%s] [%3.1f%% done] [%6u/%6u kb/s] [eta %s]", run_str, perc, rate[0], rate[1], eta_str);