projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
README: how to compile fio on Windows 64 bits
[fio.git]
/
os
/
os.h
diff --git
a/os/os.h
b/os/os.h
index 1d3a750ac526f7b016e1a166e6c6d13b4681266c..ef9f91f523b6f7c15ebe7871b717c96c9ef61a8c 100644
(file)
--- a/
os/os.h
+++ b/
os/os.h
@@
-44,11
+44,7
@@
enum {
#error "unsupported os"
#endif
#error "unsupported os"
#endif
-#ifdef FIO_HAVE_LIBAIO
-#include <libaio.h>
-#endif
-
-#ifdef FIO_HAVE_POSIXAIO
+#ifdef CONFIG_POSIXAIO
#include <aio.h>
#ifndef FIO_OS_HAVE_AIOCB_TYPEDEF
typedef struct aiocb os_aiocb_t;
#include <aio.h>
#ifndef FIO_OS_HAVE_AIOCB_TYPEDEF
typedef struct aiocb os_aiocb_t;
@@
-60,7
+56,7
@@
typedef struct aiocb os_aiocb_t;
#include <scsi/sg.h>
#endif
#include <scsi/sg.h>
#endif
-#ifndef
FIO_HAVE
_STRSEP
+#ifndef
CONFIG
_STRSEP
#include "../lib/strsep.h"
#endif
#include "../lib/strsep.h"
#endif
@@
-116,12
+112,6
@@
typedef unsigned long os_cpu_mask_t;
#define OS_RAND_MAX RAND_MAX
#endif
#define OS_RAND_MAX RAND_MAX
#endif
-#ifdef FIO_HAVE_CLOCK_MONOTONIC
-#define FIO_TIMER_CLOCK CLOCK_MONOTONIC
-#else
-#define FIO_TIMER_CLOCK CLOCK_REALTIME
-#endif
-
#ifndef FIO_HAVE_RAWBIND
#define fio_lookup_raw(dev, majdev, mindev) 1
#endif
#ifndef FIO_HAVE_RAWBIND
#define fio_lookup_raw(dev, majdev, mindev) 1
#endif
@@
-135,19
+125,19
@@
typedef unsigned long os_cpu_mask_t;
#endif
#ifndef FIO_PREFERRED_CLOCK_SOURCE
#endif
#ifndef FIO_PREFERRED_CLOCK_SOURCE
-#define FIO_PREFERRED_CLOCK_SOURCE CS_
GTOD
+#define FIO_PREFERRED_CLOCK_SOURCE CS_
CGETTIME
#endif
#ifndef FIO_MAX_JOBS
#define FIO_MAX_JOBS 2048
#endif
#endif
#ifndef FIO_MAX_JOBS
#define FIO_MAX_JOBS 2048
#endif
-#ifndef
FIO_OS_HAVE
_SOCKLEN_T
-typedef
socklen_t fio_
socklen_t;
+#ifndef
CONFIG
_SOCKLEN_T
+typedef
unsigned int
socklen_t;
#endif
#ifndef FIO_OS_HAS_CTIME_R
#endif
#ifndef FIO_OS_HAS_CTIME_R
-#define os_ctime_r(x, y, z) ctime_r((x), (y))
+#define os_ctime_r(x, y, z)
(void)
ctime_r((x), (y))
#endif
#ifdef FIO_USE_GENERIC_SWAP
#endif
#ifdef FIO_USE_GENERIC_SWAP
@@
-175,7
+165,7
@@
static inline uint64_t fio_swap64(uint64_t val)
#endif
#ifndef FIO_HAVE_BYTEORDER_FUNCS
#endif
#ifndef FIO_HAVE_BYTEORDER_FUNCS
-#ifdef
FIO
_LITTLE_ENDIAN
+#ifdef
CONFIG
_LITTLE_ENDIAN
#define __le16_to_cpu(x) (x)
#define __le32_to_cpu(x) (x)
#define __le64_to_cpu(x) (x)
#define __le16_to_cpu(x) (x)
#define __le32_to_cpu(x) (x)
#define __le64_to_cpu(x) (x)