X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos.h;h=715f2260a3f6992b13e2e6f164511b7a08e54e82;hp=33baf73264e6e7b47b5213fd12ae3bc57f52a2b9;hb=d01612f3ae2515eb035d0c4ce954d8cb167a0a61;hpb=232f9b73353e0322fe135d3029beecedaed7a17b diff --git a/os/os.h b/os/os.h index 33baf732..715f2260 100644 --- a/os/os.h +++ b/os/os.h @@ -2,11 +2,31 @@ #define FIO_OS_H #include +#include +#include #include #include #include -#if defined(__linux__) +#include "../arch/arch.h" + +enum { + os_linux = 1, + os_aix, + os_freebsd, + os_hpux, + os_mac, + os_netbsd, + os_solaris, + os_windows, + os_android, + + os_nr, +}; + +#if defined(__ANDROID__) +#include "os-android.h" +#elif defined(__linux__) #include "os-linux.h" #elif defined(__FreeBSD__) #include "os-freebsd.h" @@ -20,17 +40,13 @@ #include "os-aix.h" #elif defined(__hpux) #include "os-hpux.h" -#elif defined(__CYGWIN__) +#elif defined(WIN32) #include "os-windows.h" #else #error "unsupported os" #endif -#ifdef FIO_HAVE_LIBAIO -#include -#endif - -#ifdef FIO_HAVE_POSIXAIO +#ifdef CONFIG_POSIXAIO #include #ifndef FIO_OS_HAVE_AIOCB_TYPEDEF typedef struct aiocb os_aiocb_t; @@ -42,7 +58,7 @@ typedef struct aiocb os_aiocb_t; #include #endif -#ifndef FIO_HAVE_STRSEP +#ifndef CONFIG_STRSEP #include "../lib/strsep.h" #endif @@ -50,15 +66,11 @@ typedef struct aiocb os_aiocb_t; #define OS_MSG_DONTWAIT MSG_DONTWAIT #endif -#ifndef FIO_HAVE_FADVISE -#define posix_fadvise(fd, off, len, advice) (0) - #ifndef POSIX_FADV_DONTNEED #define POSIX_FADV_DONTNEED (0) #define POSIX_FADV_SEQUENTIAL (0) #define POSIX_FADV_RANDOM (0) #endif -#endif /* FIO_HAVE_FADVISE */ #ifndef FIO_HAVE_CPU_AFFINITY #define fio_setaffinity(pid, mask) (0) @@ -69,7 +81,7 @@ typedef unsigned long os_cpu_mask_t; #endif #ifndef FIO_HAVE_IOPRIO -#define ioprio_set(which, who, prio) (0) +#define ioprio_set(which, who, prioclass, prio) (0) #endif #ifndef FIO_HAVE_ODIRECT @@ -78,8 +90,15 @@ typedef unsigned long os_cpu_mask_t; #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_HUGE_PAGE #define FIO_HUGE_PAGE 0 #endif @@ -89,6 +108,10 @@ typedef unsigned long os_cpu_mask_t; #endif #endif +#ifndef FIO_HAVE_MMAP_HUGE +#define MAP_HUGETLB 0 +#endif + #ifndef FIO_O_NOATIME #define FIO_O_NOATIME 0 #endif @@ -97,12 +120,6 @@ typedef unsigned long os_cpu_mask_t; #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 @@ -111,24 +128,44 @@ typedef unsigned long os_cpu_mask_t; #define FIO_PREFERRED_ENGINE "sync" #endif +#ifndef FIO_OS_PATH_SEPARATOR +#define FIO_OS_PATH_SEPARATOR "/" +#endif + +#ifndef FIO_PREFERRED_CLOCK_SOURCE +#ifdef CONFIG_CLOCK_GETTIME +#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 -#if 0 -static inline uint16 fio_swap16(uint16_t val) +#ifndef CONFIG_SOCKLEN_T +typedef unsigned int socklen_t; +#endif + +#ifndef FIO_OS_HAS_CTIME_R +#define os_ctime_r(x, y, z) (void) ctime_r((x), (y)) +#endif + +#ifdef FIO_USE_GENERIC_SWAP +static inline uint16_t fio_swap16(uint16_t val) { return (val << 8) | (val >> 8); } -static inline uint32_t bswap_32(uint32_t val) +static inline uint32_t fio_swap32(uint32_t val) { val = ((val & 0xff00ff00UL) >> 8) | ((val & 0x00ff00ffUL) << 8); return (val >> 16) | (val << 16); } -static inline uint64_t bswap_64(uint64_t x) +static inline uint64_t fio_swap64(uint64_t val) { val = ((val & 0xff00ff00ff00ff00ULL) >> 8) | ((val & 0x00ff00ff00ff00ffULL) << 8); @@ -139,6 +176,49 @@ static inline uint64_t bswap_64(uint64_t x) } #endif +#ifndef FIO_HAVE_BYTEORDER_FUNCS +#ifdef CONFIG_LITTLE_ENDIAN +#define __le16_to_cpu(x) (x) +#define __le32_to_cpu(x) (x) +#define __le64_to_cpu(x) (x) +#define __cpu_to_le16(x) (x) +#define __cpu_to_le32(x) (x) +#define __cpu_to_le64(x) (x) +#else +#define __le16_to_cpu(x) fio_swap16(x) +#define __le32_to_cpu(x) fio_swap32(x) +#define __le64_to_cpu(x) fio_swap64(x) +#define __cpu_to_le16(x) fio_swap16(x) +#define __cpu_to_le32(x) fio_swap32(x) +#define __cpu_to_le64(x) fio_swap64(x) +#endif +#endif /* FIO_HAVE_BYTEORDER_FUNCS */ + +#define le16_to_cpu(val) ({ \ + uint16_t *__val = &(val); \ + __le16_to_cpu(*__val); \ +}) +#define le32_to_cpu(val) ({ \ + uint32_t *__val = &(val); \ + __le32_to_cpu(*__val); \ +}) +#define le64_to_cpu(val) ({ \ + uint64_t *__val = &(val); \ + __le64_to_cpu(*__val); \ +}) +#define cpu_to_le16(val) ({ \ + uint16_t *__val = &(val); \ + __cpu_to_le16(*__val); \ +}) +#define cpu_to_le32(val) ({ \ + uint32_t *__val = &(val); \ + __cpu_to_le32(*__val); \ +}) +#define cpu_to_le64(val) ({ \ + uint64_t *__val = &(val); \ + __cpu_to_le64(*__val); \ +}) + #ifndef FIO_HAVE_BLKTRACE static inline int is_blktrace(const char *fname) { @@ -200,6 +280,32 @@ static inline long os_random_long(os_random_state_t *rs) } #endif +#ifdef FIO_USE_GENERIC_INIT_RANDOM_STATE +extern void td_fill_rand_seeds(struct thread_data *td); +/* + * Initialize the various random states we need (random io, block size ranges, + * read/write mix, etc). + */ +static inline int init_random_state(struct thread_data *td, unsigned long *rand_seeds, int size) +{ + int fd; + + fd = open("/dev/urandom", O_RDONLY); + if (fd == -1) { + return 1; + } + + if (read(fd, rand_seeds, size) < size) { + close(fd); + return 1; + } + + close(fd); + td_fill_rand_seeds(td); + return 0; +} +#endif + #ifndef FIO_HAVE_FS_STAT static inline unsigned long long get_fs_size(const char *path) {