client: use temp buffer for single output flush for json/disk util

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 9a6c31a65d912ba39a44f2cae1ce9ec8378146a6..f19db1be6f024b0a0420f8a298eca863851a01e4 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -18,37 +18,50 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include <unistd.h>
-#include <locale.h>
-#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;
+
+       compiletime_assert(TD_NR <= TD_ENG_FLAG_SHIFT, "TD_ENG_FLAG_SHIFT");
+
        if (initialize_fio(envp))
                return 1;
 
+#if !defined(CONFIG_GETTIMEOFDAY) && !defined(CONFIG_CLOCK_GETTIME)
+#error "No available clock source!"
+#endif
+
+       if (fio_server_create_sk_key())
+               goto done;
+
        if (parse_options(argc, argv))
-               return 1;
+               goto done_key;
+
+       /*
+        * 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_key;
+               ret = fio_handle_clients(&fio_client_ops);
        } else
-               return fio_backend();
+               ret = fio_backend(NULL);
+
+done_key:
+       fio_server_destroy_sk_key();
+done:
+       deinitialize_fio();
+       return ret;
 }