X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=60261ffa9b26f2fd27e7cf88ff25a6a773d29f96;hp=5a99318ed4b4e89fa355b4a80b40082c631dd2ca;hb=5afda955b4dbdc9938655ad5cb843191d5828226;hpb=a3efc919b0dcc27d65a6e84edca209b91cee173d diff --git a/fio.c b/fio.c index 5a99318e..60261ffa 100644 --- a/fio.c +++ b/fio.c @@ -22,34 +22,14 @@ * */ #include -#include -#include -#include -#include -#include #include -#include #include -#include -#include -#include -#include -#include #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; + +uintptr_t page_mask = 0; +uintptr_t page_size = 0; static int endian_check(void) { @@ -65,10 +45,10 @@ static int endian_check(void) else if (u.c[0] == 0x12) le = 1; -#if defined(FIO_LITTLE_ENDIAN) +#if defined(CONFIG_LITTLE_ENDIAN) if (be) return 1; -#elif defined(FIO_BIG_ENDIAN) +#elif defined(CONFIG_BIG_ENDIAN) if (le) return 1; #else @@ -91,6 +71,10 @@ int main(int argc, char *argv[], char *envp[]) return 1; } +#if !defined(CONFIG_GETTIMEOFDAY) && !defined(CONFIG_CLOCK_GETTIME) +#error "No available clock source!" +#endif + arch_init(envp); sinit(); @@ -116,6 +100,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