X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=eta.c;h=6118d1af21b5afccee8c9f106bc4cbd93b557c61;hp=e8dfd288b69241c418a62fd97dcb8e816a5f1dc2;hb=25927259f482b0288d962e36dbfd33ec90a69521;hpb=cf451d1ede3bbbd2fed3619eb43def054d5b5a5a

diff --git a/eta.c b/eta.c
index e8dfd288..6118d1af 100644
--- a/eta.c
+++ b/eta.c
@@ -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);
@@ -332,7 +334,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,9 +342,12 @@ 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;
+	memcpy(je->run_str, run_str, thread_number * sizeof(char));
+
 	return 1;
 }
 
@@ -392,8 +397,8 @@ void display_thread_status(struct jobs_eta *je)
 		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);
+				je->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, "");
@@ -412,14 +417,20 @@ void display_thread_status(struct jobs_eta *je)
 
 void print_thread_status(void)
 {
-	struct jobs_eta je;
-
-	memset(&je, 0, sizeof(je));
+	struct jobs_eta *je;
+	size_t size;
 
-	if (!calc_thread_status(&je))
+	if (!thread_number)
 		return;
 
-	display_thread_status(&je);
+	size = sizeof(*je) + thread_number * sizeof(char) + 1;
+	je = malloc(size);
+	memset(je, 0, size);
+
+	if (calc_thread_status(je, 0))
+		display_thread_status(je);
+
+	free(je);
 }
 
 void print_status_init(int thr_number)