X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=stat.c;h=2a65fed8fc2ebd61a8c4de3df97fff463fe3e23c;hb=2de615ad34e323ec7c8f0f595ed4dc5124f99a42;hp=3d7dcde10681a99dd56a6a8dd2663cf774aae4e7;hpb=a666cab8ed3d2a2fa782be345425a2e88734a007;p=fio.git

diff --git a/stat.c b/stat.c
index 3d7dcde1..2a65fed8 100644
--- a/stat.c
+++ b/stat.c
@@ -1083,9 +1083,10 @@ static struct json_object *show_thread_status_json(struct thread_stat *ts,
 
 	/* ETA Info */
 	je = get_jobs_eta(1, &size);
-	json_object_add_value_int(root, "eta", je->eta_sec);
-	json_object_add_value_int(root, "elapsed", je->elapsed_sec);
-
+	if (je) {
+		json_object_add_value_int(root, "eta", je->eta_sec);
+		json_object_add_value_int(root, "elapsed", je->elapsed_sec);
+	}
 
 	add_ddir_status_json(ts, rs, DDIR_READ, root);
 	add_ddir_status_json(ts, rs, DDIR_WRITE, root);
@@ -1400,8 +1401,6 @@ void __show_run_stats(void)
 
 	runstats = malloc(sizeof(struct group_run_stats) * (groupid + 1));
 
-	memset(output, 0, sizeof(output));
-
 	for (i = 0; i < groupid + 1; i++)
 		init_group_run_stat(&runstats[i]);
 
@@ -1560,7 +1559,7 @@ void __show_run_stats(void)
 	}
 
 	for (i = 0; i < FIO_OUTPUT_NR; i++)
-		buf_output_init(&output[i], i);
+		buf_output_init(&output[i]);
 
 	/*
 	 * don't overwrite last signal output
@@ -1629,15 +1628,14 @@ void __show_run_stats(void)
 		show_idle_prof_stats(FIO_OUTPUT_NORMAL, NULL, &output[__FIO_OUTPUT_NORMAL]);
 	}
 
-	for (i = 0; i < FIO_OUTPUT_NR; i++)
+	for (i = 0; i < FIO_OUTPUT_NR; i++) {
 		buf_output_flush(&output[i]);
+		buf_output_free(&output[i]);
+	}
 
 	log_info_flush();
 	free(runstats);
 	free(threadstats);
-
-	for (i = 0; i < FIO_OUTPUT_NR; i++)
-		buf_output_free(&output[i]);
 }
 
 void show_run_stats(void)