X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos.h;h=a6bc17f09b5797632697de1b4c434f8f1a68482f;hp=cbb476fe532a63375d7bcea6cc9d99f978194381;hb=c2acfbac7e9eb8ac5407ac024c0fd000614c77e2;hpb=b9fd788f0e8adacc33316107594e9eb0463743d7 diff --git a/os/os.h b/os/os.h index cbb476fe..a6bc17f0 100644 --- a/os/os.h +++ b/os/os.h @@ -3,10 +3,13 @@ #include #include +#include #include #include #include +#include "../arch/arch.h" + enum { os_linux = 1, os_aix, @@ -14,16 +17,22 @@ enum { os_hpux, os_mac, os_netbsd, + os_openbsd, os_solaris, os_windows, + os_android, os_nr, }; -#if defined(__linux__) +#if defined(__ANDROID__) +#include "os-android.h" +#elif defined(__linux__) #include "os-linux.h" #elif defined(__FreeBSD__) #include "os-freebsd.h" +#elif defined(__OpenBSD__) +#include "os-openbsd.h" #elif defined(__NetBSD__) #include "os-netbsd.h" #elif defined(__sun__) @@ -34,17 +43,13 @@ enum { #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; @@ -56,7 +61,7 @@ typedef struct aiocb os_aiocb_t; #include #endif -#ifndef FIO_HAVE_STRSEP +#ifndef CONFIG_STRSEP #include "../lib/strsep.h" #endif @@ -64,26 +69,25 @@ 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) #define fio_getaffinity(pid, mask) do { } while (0) #define fio_cpu_clear(mask, cpu) do { } while (0) #define fio_cpuset_exit(mask) (-1) +#define fio_cpus_split(mask, cpu) (0) typedef unsigned long os_cpu_mask_t; +#else +extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu); #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 @@ -92,8 +96,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 @@ -103,6 +114,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 @@ -111,12 +126,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 @@ -129,12 +138,24 @@ typedef unsigned long os_cpu_mask_t; #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 -#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 +#define os_ctime_r(x, y, z) (void) ctime_r((x), (y)) #endif #ifdef FIO_USE_GENERIC_SWAP @@ -161,7 +182,8 @@ static inline uint64_t fio_swap64(uint64_t val) } #endif -#ifdef FIO_LITTLE_ENDIAN +#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) @@ -176,6 +198,7 @@ static inline uint64_t fio_swap64(uint64_t val) #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); \ @@ -203,12 +226,13 @@ static inline uint64_t fio_swap64(uint64_t val) }) #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; -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; } @@ -263,6 +287,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) {