X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=7b3a50b6cba12df253bed9517be46cdc950fde2d;hp=2ca4fe69efef5c8cd1f02623eb69dfbf0c593967;hb=c1f50f765a0a51931605c1fb223d166e3b3a93c6;hpb=dd366728eb503e6344215ae6ec153c7ab6eafd9b

diff --git a/fio.c b/fio.c
index 2ca4fe69..7b3a50b6 100644
--- a/fio.c
+++ b/fio.c
@@ -26,87 +26,47 @@
 #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"
 
-unsigned long page_mask;
-unsigned long page_size;
-
-static int endian_check(void)
+int main(int argc, char *argv[], char *envp[])
 {
-	union {
-		uint8_t c[8];
-		uint64_t v;
-	} u;
-	int le = 0, be = 0;
+	int ret = 1;
 
-	u.v = 0x12;
-	if (u.c[7] == 0x12)
-		be = 1;
-	else if (u.c[0] == 0x12)
-		le = 1;
+	compiletime_assert(TD_NR <= TD_ENG_FLAG_SHIFT, "TD_ENG_FLAG_SHIFT");
 
-#if defined(FIO_LITTLE_ENDIAN)
-	if (be)
-		return 1;
-#elif defined(FIO_BIG_ENDIAN)
-	if (le)
+	if (initialize_fio(envp))
 		return 1;
-#else
-	return 1;
-#endif
-
-	if (!le && !be)
-		return 1;
-
-	return 0;
-}
-
-int main(int argc, char *argv[], char *envp[])
-{
-	long ps;
 
-	if (endian_check()) {
-		log_err("fio: endianness settings appear wrong.\n");
-		log_err("fio: please report this to fio@vger.kernel.org\n");
-		return 1;
-	}
+#if !defined(CONFIG_GETTIMEOFDAY) && !defined(CONFIG_CLOCK_GETTIME)
+#error "No available clock source!"
+#endif
 
-	arch_init(envp);
+	if (fio_server_create_sk_key())
+		goto done;
 
-	sinit();
+	if (parse_options(argc, argv))
+		goto done_key;
 
 	/*
-	 * We need locale for number printing, if it isn't set then just
-	 * go with the US format.
+	 * line buffer stdout to avoid output lines from multiple
+	 * threads getting mixed
 	 */
-	if (!getenv("LC_NUMERIC"))
-		setlocale(LC_NUMERIC, "en_US");
+	setvbuf(stdout, NULL, _IOLBF, 0);
 
-	ps = sysconf(_SC_PAGESIZE);
-	if (ps < 0) {
-		log_err("Failed to get page size\n");
-		return 1;
-	}
-
-	page_size = ps;
-	page_mask = ps - 1;
+	fio_time_init();
 
-	fio_keywords_init();
+	if (nr_clients) {
+		set_genesis_time();
 
-	if (parse_options(argc, argv))
-		return 1;
+		if (fio_start_all_clients())
+			goto done_key;
+		ret = fio_handle_clients(&fio_client_ops);
+	} else
+		ret = fio_backend(NULL);
 
-	if (nr_clients)
-		return fio_handle_clients(&fio_client_ops);
-	else
-		return fio_backend();
+done_key:
+	fio_server_destroy_sk_key();
+done:
+	deinitialize_fio();
+	return ret;
 }