X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=eta.c;h=b07ae8062dbbfbd7a02a5ffd96dec0ec561021cb;hp=5b912eb7166c81b1cb310e42a5c61701ecb6e9c0;hb=0ed83bce9e699e9730e2783c9763ba976ee8bf55;hpb=1d1f45aec4bd2c1168ed5539174a821555db6f65

diff --git a/eta.c b/eta.c
index 5b912eb7..b07ae806 100644
--- a/eta.c
+++ b/eta.c
@@ -83,7 +83,7 @@ static void check_str_update(struct thread_data *td)
 /*
  * Convert seconds to a printable string.
  */
-static void eta_to_str(char *str, unsigned long eta_sec)
+void eta_to_str(char *str, unsigned long eta_sec)
 {
 	unsigned int d, h, m, s;
 	int disp_hour = 0;
@@ -230,7 +230,7 @@ static void calc_iops(unsigned long mtime, unsigned long long *io_iops,
  * Print status of the jobs we know about. This includes rate estimates,
  * ETA, thread state, etc.
  */
-int calc_thread_status(struct jobs_eta *je)
+int calc_thread_status(struct jobs_eta *je, int force)
 {
 	struct thread_data *td;
 	int i;
@@ -245,11 +245,13 @@ int calc_thread_status(struct jobs_eta *je)
 	static struct timeval rate_prev_time, disp_prev_time;
 	int i2p = 0;
 
-	if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
-		return 0;
+	if (!force) {
+		if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
+			return 0;
 
-	if (!isatty(STDOUT_FILENO) && (eta_print != FIO_ETA_ALWAYS))
-		return 0;
+		if (!isatty(STDOUT_FILENO) && (eta_print != FIO_ETA_ALWAYS))
+			return 0;
+	}
 
 	if (!rate_io_bytes[0] && !rate_io_bytes[1])
 		fill_start_time(&rate_prev_time);
@@ -271,11 +273,14 @@ int calc_thread_status(struct jobs_eta *je)
 		    || td->runstate == TD_FSYNCING
 		    || td->runstate == TD_PRE_READING) {
 			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->t_rate[0] += td->o.rate[0];
+			je->t_rate[1] += td->o.rate[1];
+			je->m_rate[0] += td->o.ratemin[0];
+			je->m_rate[1] += td->o.ratemin[1];
+			je->t_iops[0] += td->o.rate_iops[0];
+			je->t_iops[1] += td->o.rate_iops[1];
+			je->m_iops[0] += td->o.rate_iops_min[0];
+			je->m_iops[1] += td->o.rate_iops_min[1];
 			je->files_open += td->nr_open_files;
 		} else if (td->runstate == TD_RAMP) {
 			je->nr_running++;
@@ -332,7 +337,7 @@ int calc_thread_status(struct jobs_eta *je)
 	/*
 	 * Allow a little slack, the target is to print it every 1000 msecs
 	 */
-	if (disp_time < 900)
+	if (!force && disp_time < 900)
 		return 0;
 
 	calc_rate(disp_time, io_bytes, disp_io_bytes, je->rate);
@@ -340,7 +345,7 @@ int calc_thread_status(struct jobs_eta *je)
 
 	memcpy(&disp_prev_time, &now, sizeof(now));
 
-	if (!je->nr_running && !je->nr_pending)
+	if (!force && !je->nr_running && !je->nr_pending)
 		return 0;
 
 	je->nr_threads = thread_number;
@@ -364,16 +369,19 @@ void display_thread_status(struct jobs_eta *je)
 	}
 
 	p += sprintf(p, "Jobs: %d (f=%d)", je->nr_running, je->files_open);
-	if (je->m_rate || je->t_rate) {
+	if (je->m_rate[0] || je->m_rate[1] || je->t_rate[0] || je->t_rate[1]) {
 		char *tr, *mr;
 
-		mr = num2str(je->m_rate, 4, 0, i2p);
-		tr = num2str(je->t_rate, 4, 0, i2p);
+		mr = num2str(je->m_rate[0] + je->m_rate[1], 4, 0, i2p);
+		tr = num2str(je->t_rate[0] + je->t_rate[1], 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);
+	} else if (je->m_iops[0] || je->m_iops[1] || je->t_iops[0] || je->t_iops[1]) {
+		p += sprintf(p, ", CR=%d/%d IOPS",
+					je->t_iops[0] + je->t_iops[1],
+					je->m_iops[0] + je->t_iops[1]);
+	}
 	if (je->eta_sec != INT_MAX && je->nr_running) {
 		char perc_str[32];
 		char *iops_str[2];
@@ -416,12 +424,16 @@ void display_thread_status(struct jobs_eta *je)
 void print_thread_status(void)
 {
 	struct jobs_eta *je;
+	size_t size;
 
-	je = malloc(sizeof(*je) + thread_number * sizeof(char));
+	if (!thread_number)
+		return;
 
-	memset(je, 0, sizeof(*je) + thread_number * sizeof(char));
+	size = sizeof(*je) + thread_number * sizeof(char) + 1;
+	je = malloc(size);
+	memset(je, 0, size);
 
-	if (calc_thread_status(je))
+	if (calc_thread_status(je, 0))
 		display_thread_status(je);
 
 	free(je);