Add check for invariant TSC on x86 and use TSC is default clock if reliable

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 8a79ebed013e3a55f153a64939357a3382ba358a..f44273f483c59103ece4a3d4681496e663698f66 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -22,19 +22,8 @@
  *
  */
 #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"
@@ -47,8 +36,8 @@
 #include "memalign.h"
 #include "server.h"
 
-unsigned long page_mask;
-unsigned long page_size;
+uintptr_t page_mask;
+uintptr_t page_size;
 
 static int endian_check(void)
 {
@@ -115,6 +104,8 @@ int main(int argc, char *argv[], char *envp[])
        if (parse_options(argc, argv))
                return 1;
 
+       fio_time_init();
+
        if (nr_clients)
                return fio_handle_clients();
        else