X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=9adc29aee47bbbfe9198a67458fc17c5d8b456b1;hp=f0a8ee2636d015116055d69148a0f524dfc50f40;hb=e5aa68b3dc01f4188c31091d1c561d3cb7c5af03;hpb=2e1df07d1ea30e0304cc65370f3ed161a6f22cd4

diff --git a/fio.c b/fio.c
index f0a8ee26..9adc29ae 100644
--- a/fio.c
+++ b/fio.c
@@ -22,119 +22,32 @@
  *
  */
 #include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <limits.h>
-#include <signal.h>
-#include <time.h>
 #include <locale.h>
-#include <assert.h>
 #include <time.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/mman.h>
 
 #include "fio.h"
-#include "hash.h"
 #include "smalloc.h"
-#include "verify.h"
-#include "trim.h"
-#include "diskutil.h"
-#include "cgroup.h"
-#include "profile.h"
-#include "lib/rand.h"
-#include "memalign.h"
-#include "server.h"
-
-unsigned long page_mask;
-unsigned long page_size;
-
-int groupid = 0;
-unsigned int thread_number = 0;
-unsigned int nr_process = 0;
-unsigned int nr_thread = 0;
-int shm_id = 0;
-int temp_stall_ts;
-unsigned long done_secs = 0;
-
-/*
- * Just expose an empty list, if the OS does not support disk util stats
- */
-#ifndef FIO_HAVE_DISK_UTIL
-FLIST_HEAD(disk_list);
-#endif
-
-unsigned long arch_flags = 0;
-
-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");
+#if !defined(CONFIG_GETTIMEOFDAY) && !defined(CONFIG_CLOCK_GETTIME)
+#error "No available clock source!"
+#endif
 
-	ps = sysconf(_SC_PAGESIZE);
-	if (ps < 0) {
-		log_err("Failed to get page size\n");
+	if (parse_options(argc, argv))
 		return 1;
-	}
 
-	page_size = ps;
-	page_mask = ps - 1;
+	fio_time_init();
 
-	fio_keywords_init();
-
-	if (parse_options(argc, argv))
-		return 1;
+	if (nr_clients) {
+		set_genesis_time();
 
-	if (nr_clients)
-		return fio_handle_clients();
-	else
+		if (fio_start_all_clients())
+			return 1;
+		return fio_handle_clients(&fio_client_ops);
+	} else
 		return fio_backend();
 }