X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=eta.c;h=167bf5f62b215d470e1f41d1ee95ba75968589cd;hb=6fb1bda0d0b61e2433f9ef34b4b979b2642d8706;hp=db08e2abe2e43e79b2da6447157e166b1041d29a;hpb=8a1db9a16e1075498e5d6166fa46b419cecd8af8;p=fio.git

diff --git a/eta.c b/eta.c
index db08e2ab..167bf5f6 100644
--- a/eta.c
+++ b/eta.c
@@ -555,8 +555,7 @@ void display_thread_status(struct jobs_eta *je)
 	if (!eta_new_line_init) {
 		fio_gettime(&disp_eta_new_line, NULL);
 		eta_new_line_init = 1;
-	} else if (eta_new_line &&
-		   mtime_since_now(&disp_eta_new_line) > eta_new_line * 1000) {
+	} else if (eta_new_line && mtime_since_now(&disp_eta_new_line) > eta_new_line) {
 		fio_gettime(&disp_eta_new_line, NULL);
 		eta_new_line_pending = 1;
 	}
@@ -573,9 +572,11 @@ struct jobs_eta *get_jobs_eta(int force, size_t *size)
 
 	*size = sizeof(*je) + THREAD_RUNSTR_SZ;
 	je = malloc(*size);
+	if (!je)
+		return NULL;
 	memset(je, 0, *size);
 
-	if (!calc_thread_status(je, 0)) {
+	if (!calc_thread_status(je, force)) {
 		free(je);
 		return NULL;
 	}