projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
values.h is obsolete: use float.h and DBL_MIN/MAX instead.
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 8a79ebed013e3a55f153a64939357a3382ba358a..af4c12cbe1815f7119511a6bdb44b39421c85161 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-22,33
+22,14
@@
*
*/
#include <unistd.h>
*
*/
#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <limits.h>
-#include <signal.h>
-#include <time.h>
#include <locale.h>
#include <locale.h>
-#include <assert.h>
#include <time.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 "fio.h"
-#include "hash.h"
#include "smalloc.h"
#include "smalloc.h"
-#include "verify.h"
-#include "trim.h"
-#include "diskutil.h"
-#include "profile.h"
-#include "lib/rand.h"
-#include "memalign.h"
-#include "server.h"
-u
nsigned long
page_mask;
-u
nsigned long
page_size;
+u
intptr_t
page_mask;
+u
intptr_t
page_size;
static int endian_check(void)
{
static int endian_check(void)
{
@@
-64,10
+45,10
@@
static int endian_check(void)
else if (u.c[0] == 0x12)
le = 1;
else if (u.c[0] == 0x12)
le = 1;
-#if defined(
FIO
_LITTLE_ENDIAN)
+#if defined(
CONFIG
_LITTLE_ENDIAN)
if (be)
return 1;
if (be)
return 1;
-#elif defined(
FIO
_BIG_ENDIAN)
+#elif defined(
CONFIG
_BIG_ENDIAN)
if (le)
return 1;
#else
if (le)
return 1;
#else
@@
-90,6
+71,10
@@
int main(int argc, char *argv[], char *envp[])
return 1;
}
return 1;
}
+#if !defined(CONFIG_GETTIMEOFDAY) && !defined(CONFIG_CLOCK_GETTIME)
+#error "No available clock source!"
+#endif
+
arch_init(envp);
sinit();
arch_init(envp);
sinit();
@@
-115,6
+100,8
@@
int main(int argc, char *argv[], char *envp[])
if (parse_options(argc, argv))
return 1;
if (parse_options(argc, argv))
return 1;
+ fio_time_init();
+
if (nr_clients)
return fio_handle_clients();
else
if (nr_clients)
return fio_handle_clients();
else