output_buffer: only realloc once, and memset just what we need

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 755a4d523285836b2eab8d9a9f34765569118d62..bafbd48e7ae35c00782af205308ce89a8c665d4e 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -26,19 +26,12 @@
 #include <time.h>
 
 #include "fio.h"
-#include "hash.h"
 #include "smalloc.h"
-#include "verify.h"
-#include "trim.h"
-#include "diskutil.h"
-#include "profile.h"
-#include "lib/rand.h"
-#include "memalign.h"
-#include "client.h"
-#include "server.h"
 
 int main(int argc, char *argv[], char *envp[])
 {
+       int ret = 1;
+
        if (initialize_fio(envp))
                return 1;
 
@@ -47,14 +40,26 @@ 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();
 
        if (nr_clients) {
+               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;
 }