X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=9a6c31a65d912ba39a44f2cae1ce9ec8378146a6;hp=ac026fba8117ed09995ba4cfd398ab1f10bf19d3;hb=f982d35f5ae88f728c6853aaf57448db8f5fcf98;hpb=7078106dbbc524b6a3b2c39ddd04a9f676b10e53

diff --git a/fio.c b/fio.c
index ac026fba..9a6c31a6 100644
--- a/fio.c
+++ b/fio.c
@@ -34,78 +34,21 @@
 #include "profile.h"
 #include "lib/rand.h"
 #include "memalign.h"
+#include "client.h"
 #include "server.h"
 
-uintptr_t page_mask;
-uintptr_t page_size;
-
-static int endian_check(void)
-{
-	union {
-		uint8_t c[8];
-		uint64_t v;
-	} u;
-	int le = 0, be = 0;
-
-	u.v = 0x12;
-	if (u.c[7] == 0x12)
-		be = 1;
-	else if (u.c[0] == 0x12)
-		le = 1;
-
-#if defined(FIO_LITTLE_ENDIAN)
-	if (be)
-		return 1;
-#elif defined(FIO_BIG_ENDIAN)
-	if (le)
-		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");
+	if (initialize_fio(envp))
 		return 1;
-	}
-
-	arch_init(envp);
-
-	sinit();
-
-	/*
-	 * We need locale for number printing, if it isn't set then just
-	 * go with the US format.
-	 */
-	if (!getenv("LC_NUMERIC"))
-		setlocale(LC_NUMERIC, "en_US");
-
-	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_keywords_init();
 
 	if (parse_options(argc, argv))
 		return 1;
 
-	if (nr_clients)
-		return fio_handle_clients();
-	else
+	if (nr_clients) {
+		if (fio_start_all_clients())
+			return 1;
+		return fio_handle_clients(&fio_client_ops);
+	} else
 		return fio_backend();
 }