X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=eta.c;h=2c15b24e812ab580e32c8f2ca58808a374835d83;hp=1e61b7e90c1c55a4c2c3b291fcb5c87ce550018b;hb=b75a394fd0e9455ab71912d4462aaae7e6e4366b;hpb=b0f65863844b4de92d10fefaabde80ea5bc3e5cc

diff --git a/eta.c b/eta.c
index 1e61b7e9..2c15b24e 100644
--- a/eta.c
+++ b/eta.c
@@ -7,7 +7,7 @@
 
 #include "fio.h"
 
-static char run_str[MAX_JOBS + 1];
+static char run_str[REAL_MAX_JOBS + 1];
 
 /*
  * Sets the status of the 'td' in the printed status map.
@@ -28,10 +28,21 @@ static void check_str_update(struct thread_data *td)
 		break;
 	case TD_RUNNING:
 		if (td_rw(td)) {
-			if (td_random(td))
-				c = 'm';
-			else
-				c = 'M';
+			if (td_random(td)) {
+				if (td->o.rwmix[DDIR_READ] == 100)
+					c = 'r';
+				else if (td->o.rwmix[DDIR_WRITE] == 100)
+					c = 'w';
+				else
+					c = 'm';
+			} else {
+				if (td->o.rwmix[DDIR_READ] == 100)
+					c = 'R';
+				else if (td->o.rwmix[DDIR_WRITE] == 100)
+					c = 'W';
+				else
+					c = 'M';
+			}
 		} else if (td_read(td)) {
 			if (td_random(td))
 				c = 'r';
@@ -110,6 +121,13 @@ static int thread_eta(struct thread_data *td)
 
 	bytes_total = td->total_io_size;
 
+	if (td->o.fill_device && td->o.size  == -1ULL) {
+		if (!td->fill_device_size || td->fill_device_size == -1ULL)
+			return 0;
+
+		bytes_total = td->fill_device_size;
+	}
+
 	/*
 	 * if writing, bytes_total will be twice the size. If mixing,
 	 * assume a 50/50 split and thus bytes_total will be 50% larger.
@@ -124,9 +142,6 @@ static int thread_eta(struct thread_data *td)
 	if (td->o.zone_size && td->o.zone_skip)
 		bytes_total /= (td->o.zone_skip / td->o.zone_size);
 
-	if (td->o.fill_device && td->o.size  == -1ULL)
-		return 0;
-
 	if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
 		double perc, perc_t;
 
@@ -157,19 +172,21 @@ static int thread_eta(struct thread_data *td)
 		 * if given, otherwise assume it'll run at the specified rate.
 		 */
 		if (td->o.timeout) {
-			t_eta = td->o.timeout + td->o.start_delay;
+			t_eta = td->o.timeout + td->o.start_delay +
+					td->o.ramp_time;
 
 			if (in_ramp_time(td)) {
 				unsigned long ramp_left;
 
-				ramp_left = mtime_since_now(&td->start);
+				ramp_left = mtime_since_now(&td->epoch);
 				ramp_left = (ramp_left + 999) / 1000;
 				if (ramp_left <= t_eta)
 					t_eta -= ramp_left;
 			}
 		}
-		if (td->o.rate) {
-			r_eta = (bytes_total / 1024) / td->o.rate;
+		if (td->o.rate[0] || td->o.rate[1]) {
+			r_eta = (bytes_total / 1024) /
+					(td->o.rate[0] + td->o.rate[1]);
 			r_eta += td->o.start_delay;
 		}
 
@@ -200,34 +217,39 @@ 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.
  */
-void print_thread_status(void)
+int calc_thread_status(struct jobs_eta *je)
 {
-	unsigned long elapsed = (mtime_since_genesis() + 999) / 1000;
-	int i, nr_ramp, nr_running, nr_pending, t_rate, m_rate;
-	int t_iops, m_iops, files_open;
 	struct thread_data *td;
-	char eta_str[128];
-	double perc = 0.0;
+	int i;
+	unsigned long rate_time, disp_time, bw_avg_time, *eta_secs;
 	unsigned long long io_bytes[2];
-	unsigned long rate_time, disp_time, bw_avg_time, *eta_secs, eta_sec;
+	unsigned long long io_iops[2];
 	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 int linelen_last;
-	static int eta_good;
+	int i2p = 0;
 
 	if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
-		return;
+		return 0;
 
 	if (!isatty(STDOUT_FILENO) && (eta_print != FIO_ETA_ALWAYS))
-		return;
+		return 0;
 
 	if (!rate_io_bytes[0] && !rate_io_bytes[1])
 		fill_start_time(&rate_prev_time);
@@ -237,30 +259,31 @@ void print_thread_status(void)
 	eta_secs = malloc(thread_number * sizeof(unsigned long));
 	memset(eta_secs, 0, thread_number * sizeof(unsigned long));
 
+	je->elapsed_sec = (mtime_since_genesis() + 999) / 1000;
+
 	io_bytes[0] = io_bytes[1] = 0;
-	nr_pending = nr_running = t_rate = m_rate = t_iops = m_iops = 0;
-	nr_ramp = 0;
+	io_iops[0] = io_iops[1] = 0;
 	bw_avg_time = ULONG_MAX;
-	files_open = 0;
 	for_each_td(td, i) {
 		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_PRE_READING) {
-			nr_running++;
-			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;
+			je->nr_running++;
+			je->t_rate += td->o.rate[0] + td->o.rate[1];
+			je->m_rate += td->o.ratemin[0] + td->o.ratemin[1];
+			je->t_iops += td->o.rate_iops[0] + td->o.rate_iops[1];
+			je->m_iops += td->o.rate_iops_min[0] +
+					td->o.rate_iops_min[1];
+			je->files_open += td->nr_open_files;
 		} else if (td->runstate == TD_RAMP) {
-			nr_running++;
-			nr_ramp++;
+			je->nr_running++;
+			je->nr_ramp++;
 		} else if (td->runstate < TD_RUNNING)
-			nr_pending++;
+			je->nr_pending++;
 
-		if (elapsed >= 3)
+		if (je->elapsed_sec >= 3)
 			eta_secs[i] = thread_eta(td);
 		else
 			eta_secs[i] = INT_MAX;
@@ -270,61 +293,97 @@ 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];
 		}
 	}
 
 	if (exitall_on_terminate)
-		eta_sec = INT_MAX;
+		je->eta_sec = INT_MAX;
 	else
-		eta_sec = 0;
+		je->eta_sec = 0;
 
 	for_each_td(td, i) {
+		if (!i2p && is_power_of_2(td->o.kb_base))
+			i2p = 1;
 		if (exitall_on_terminate) {
-			if (eta_secs[i] < eta_sec)
-				eta_sec = eta_secs[i];
+			if (eta_secs[i] < je->eta_sec)
+				je->eta_sec = eta_secs[i];
 		} else {
-			if (eta_secs[i] > eta_sec)
-				eta_sec = eta_secs[i];
+			if (eta_secs[i] > je->eta_sec)
+				je->eta_sec = eta_secs[i];
 		}
 	}
 
 	free(eta_secs);
 
-	if (eta_sec != INT_MAX && elapsed) {
-		perc = (double) elapsed / (double) (elapsed + eta_sec);
-		eta_to_str(eta_str, eta_sec);
-	}
-
 	fio_gettime(&now, NULL);
 	rate_time = mtime_since(&rate_prev_time, &now);
 
 	if (write_bw_log && rate_time > bw_avg_time && !in_ramp_time(td)) {
-		calc_rate(rate_time, io_bytes, rate_io_bytes, rate);
+		calc_rate(rate_time, io_bytes, rate_io_bytes, je->rate);
 		memcpy(&rate_prev_time, &now, sizeof(now));
-		add_agg_sample(rate[DDIR_READ], DDIR_READ, 0);
-		add_agg_sample(rate[DDIR_WRITE], DDIR_WRITE, 0);
+		add_agg_sample(je->rate[DDIR_READ], DDIR_READ, 0);
+		add_agg_sample(je->rate[DDIR_WRITE], DDIR_WRITE, 0);
 	}
 
 	disp_time = mtime_since(&disp_prev_time, &now);
-	if (disp_time < 1000)
-		return;
 
-	calc_rate(disp_time, io_bytes, disp_io_bytes, rate);
+	/*
+	 * Allow a little slack, the target is to print it every 1000 msecs
+	 */
+	if (disp_time < 900)
+		return 0;
+
+	calc_rate(disp_time, io_bytes, disp_io_bytes, je->rate);
+	calc_iops(disp_time, io_iops, disp_io_iops, je->iops);
+
 	memcpy(&disp_prev_time, &now, sizeof(now));
 
-	if (!nr_running && !nr_pending)
+	if (!je->nr_running && !je->nr_pending)
+		return 0;
+
+	return 1;
+}
+
+void print_thread_status(void)
+{
+	struct jobs_eta je;
+	static int linelen_last;
+	static int eta_good;
+	char output[512], *p = output;
+	char eta_str[128];
+	double perc = 0.0;
+	int i2p = 0;
+
+	memset(&je, 0, sizeof(je));
+
+	if (!calc_thread_status(&je))
 		return;
 
-	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) {
+	if (je.eta_sec != INT_MAX && je.elapsed_sec) {
+		perc = (double) je.elapsed_sec / (double) (je.elapsed_sec + je.eta_sec);
+		eta_to_str(eta_str, je.eta_sec);
+	}
+
+	p += sprintf(p, "Jobs: %d (f=%d)", je.nr_running, je.files_open);
+	if (je.m_rate || je.t_rate) {
+		char *tr, *mr;
+
+		mr = num2str(je.m_rate, 4, 0, i2p);
+		tr = num2str(je.t_rate, 4, 0, i2p);
+		p += sprintf(p, ", CR=%s/%s KB/s", tr, mr);
+		free(tr);
+		free(mr);
+	} else if (je.m_iops || je.t_iops)
+		p += sprintf(p, ", CR=%d/%d IOPS", je.t_iops, je.m_iops);
+	if (je.eta_sec != INT_MAX && je.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)
+		if ((!je.eta_sec && !eta_good) || je.nr_ramp == je.nr_running)
 			strcpy(perc_str, "-.-% done");
 		else {
 			eta_good = 1;
@@ -332,17 +391,36 @@ 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(je.rate[0], 5, 10, i2p);
+		rate_str[1] = num2str(je.rate[1], 5, 10, i2p);
+
+		iops_str[0] = num2str(je.iops[0], 4, 1, 0);
+		iops_str[1] = num2str(je.iops[1], 4, 1, 0);
+
+		l = sprintf(p, ": [%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);
+		p += l;
+		if (l >= 0 && l < linelen_last)
+			p += sprintf(p, "%*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);
+	p += sprintf(p, "\r");
+
+	if (!is_backend) {
+		printf("%s", output);
+		fflush(stdout);
+	} else
+		fio_server_text_output(output, p - output);
 }
 
-void print_status_init(int thread_number)
+
+void print_status_init(int thr_number)
 {
-	run_str[thread_number] = 'P';
+	run_str[thr_number] = 'P';
 }