X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.c;h=bafbd48e7ae35c00782af205308ce89a8c665d4e;hb=6d428bcd303e466403cebdedf20a5cf84f6949cd;hp=9adc29aee47bbbfe9198a67458fc17c5d8b456b1;hpb=91c0e7c5de1b4413c5fab8f5746272d1aee10f78;p=fio.git

diff --git a/fio.c b/fio.c
index 9adc29ae..bafbd48e 100644
--- a/fio.c
+++ b/fio.c
@@ -30,6 +30,8 @@
 
 int main(int argc, char *argv[], char *envp[])
 {
+	int ret = 1;
+
 	if (initialize_fio(envp))
 		return 1;
 
@@ -38,7 +40,13 @@ int main(int argc, char *argv[], char *envp[])
 #endif
 
 	if (parse_options(argc, argv))
-		return 1;
+		goto done;
+
+	/*
+	 * line buffer stdout to avoid output lines from multiple
+	 * threads getting mixed
+	 */
+	setvbuf(stdout, NULL, _IOLBF, 0);
 
 	fio_time_init();
 
@@ -46,8 +54,12 @@ int main(int argc, char *argv[], char *envp[])
 		set_genesis_time();
 
 		if (fio_start_all_clients())
-			return 1;
-		return fio_handle_clients(&fio_client_ops);
+			goto done;
+		ret = fio_handle_clients(&fio_client_ops);
 	} else
-		return fio_backend();
+		ret = fio_backend();
+
+done:
+	deinitialize_fio();
+	return ret;
 }