projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blktrace: add support for non-native endian format
[fio.git]
/
os
/
os.h
diff --git
a/os/os.h
b/os/os.h
index 8ca507a68cbbede9c2f5367e49174f9ec7a2a2b6..4b5903471bf8a421c0571d3d8a2de4461d74b417 100644
(file)
--- a/
os/os.h
+++ b/
os/os.h
@@
-8,6
+8,8
@@
#include <unistd.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdlib.h>
+#include "../arch/arch.h"
+
enum {
os_linux = 1,
os_aix,
enum {
os_linux = 1,
os_aix,
@@
-44,11
+46,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
+58,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
@@
-92,6
+90,12
@@
typedef unsigned long os_cpu_mask_t;
#define OS_O_DIRECT O_DIRECT
#endif
#define OS_O_DIRECT O_DIRECT
#endif
+#ifdef OS_O_ATOMIC
+#define FIO_O_ATOMIC OS_O_ATOMIC
+#else
+#define FIO_O_ATOMIC 0
+#endif
+
#ifndef FIO_HAVE_HUGETLB
#define SHM_HUGETLB 0
#define MAP_HUGETLB 0
#ifndef FIO_HAVE_HUGETLB
#define SHM_HUGETLB 0
#define MAP_HUGETLB 0
@@
-116,12
+120,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
+133,23
@@
typedef unsigned long os_cpu_mask_t;
#endif
#ifndef FIO_PREFERRED_CLOCK_SOURCE
#endif
#ifndef FIO_PREFERRED_CLOCK_SOURCE
+#ifdef CONFIG_CLOCK_GETTIME
#define FIO_PREFERRED_CLOCK_SOURCE CS_CGETTIME
#define FIO_PREFERRED_CLOCK_SOURCE CS_CGETTIME
+#else
+#define FIO_PREFERRED_CLOCK_SOURCE CS_GTOD
+#endif
#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
+177,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)
@@
-218,12
+220,13
@@
static inline uint64_t fio_swap64(uint64_t val)
})
#ifndef FIO_HAVE_BLKTRACE
})
#ifndef FIO_HAVE_BLKTRACE
-static inline int is_blktrace(const char *fname)
+static inline int is_blktrace(const char *fname
, int *need_swap
)
{
return 0;
}
struct thread_data;
{
return 0;
}
struct thread_data;
-static inline int load_blktrace(struct thread_data *td, const char *fname)
+static inline int load_blktrace(struct thread_data *td, const char *fname,
+ int need_swap)
{
return 1;
}
{
return 1;
}