X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos.h;h=a6fde1fd27f6cab60020b4eb71af1ebe4363a7ff;hp=0b182c4a6058a5e4e881538ddbb0de55f02a7ca7;hb=40f61ec7193682a332587095f76ff8f1293efb2a;hpb=9a0ac6c7b69355ea095f06c6b0a08115c946dd61 diff --git a/os/os.h b/os/os.h index 0b182c4a..a6fde1fd 100644 --- a/os/os.h +++ b/os/os.h @@ -7,6 +7,7 @@ #include #include #include +#include #include "../arch/arch.h" /* IWYU pragma: export */ #include "../lib/types.h" @@ -32,9 +33,7 @@ typedef enum { } cpu_features; /* IWYU pragma: begin_exports */ -#if defined(__ANDROID__) -#include "os-android.h" -#elif defined(__linux__) +#if defined(__linux__) #include "os-linux.h" #elif defined(__FreeBSD__) #include "os-freebsd.h" @@ -58,6 +57,10 @@ typedef enum { #error "unsupported os" #endif +#ifndef EDQUOT +#define EDQUOT EIO +#endif + #ifdef CONFIG_POSIXAIO #include #ifndef FIO_OS_HAVE_AIOCB_TYPEDEF @@ -112,8 +115,16 @@ static inline int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu_index) extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu); #endif +#ifndef FIO_HAVE_IOPRIO_CLASS +#define ioprio_value_is_class_rt(prio) (false) +#define IOPRIO_MIN_PRIO_CLASS 0 +#define IOPRIO_MAX_PRIO_CLASS 0 +#endif #ifndef FIO_HAVE_IOPRIO +#define ioprio_value(prioclass, prio) (0) #define ioprio_set(which, who, prioclass, prio) (0) +#define IOPRIO_MIN_PRIO 0 +#define IOPRIO_MAX_PRIO 0 #endif #ifndef FIO_HAVE_ODIRECT @@ -152,10 +163,6 @@ extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu); #define OS_RAND_MAX RAND_MAX #endif -#ifndef FIO_HAVE_RAWBIND -#define fio_lookup_raw(dev, majdev, mindev) 1 -#endif - #ifndef FIO_PREFERRED_ENGINE #define FIO_PREFERRED_ENGINE "psync" #endif @@ -172,10 +179,6 @@ extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu); #endif #endif -#ifndef FIO_MAX_JOBS -#define FIO_MAX_JOBS 4096 -#endif - #ifndef CONFIG_SOCKLEN_T typedef unsigned int socklen_t; #endif @@ -210,19 +213,27 @@ static inline uint64_t fio_swap64(uint64_t val) #ifndef FIO_HAVE_BYTEORDER_FUNCS #ifdef CONFIG_LITTLE_ENDIAN +#define __be16_to_cpu(x) fio_swap16(x) +#define __be32_to_cpu(x) fio_swap32(x) #define __be64_to_cpu(x) fio_swap64(x) #define __le16_to_cpu(x) (x) #define __le32_to_cpu(x) (x) #define __le64_to_cpu(x) (x) +#define __cpu_to_be16(x) fio_swap16(x) +#define __cpu_to_be32(x) fio_swap32(x) #define __cpu_to_be64(x) fio_swap64(x) #define __cpu_to_le16(x) (x) #define __cpu_to_le32(x) (x) #define __cpu_to_le64(x) (x) #else +#define __be16_to_cpu(x) (x) +#define __be32_to_cpu(x) (x) #define __be64_to_cpu(x) (x) #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_be16(x) (x) +#define __cpu_to_be32(x) (x) #define __cpu_to_be64(x) (x) #define __cpu_to_le16(x) fio_swap16(x) #define __cpu_to_le32(x) fio_swap32(x) @@ -231,6 +242,14 @@ static inline uint64_t fio_swap64(uint64_t val) #endif /* FIO_HAVE_BYTEORDER_FUNCS */ #ifdef FIO_INTERNAL +#define be16_to_cpu(val) ({ \ + typecheck(uint16_t, val); \ + __be16_to_cpu(val); \ +}) +#define be32_to_cpu(val) ({ \ + typecheck(uint32_t, val); \ + __be32_to_cpu(val); \ +}) #define be64_to_cpu(val) ({ \ typecheck(uint64_t, val); \ __be64_to_cpu(val); \ @@ -249,6 +268,14 @@ static inline uint64_t fio_swap64(uint64_t val) }) #endif +#define cpu_to_be16(val) ({ \ + typecheck(uint16_t, val); \ + __cpu_to_be16(val); \ +}) +#define cpu_to_be32(val) ({ \ + typecheck(uint32_t, val); \ + __cpu_to_be32(val); \ +}) #define cpu_to_be64(val) ({ \ typecheck(uint64_t, val); \ __cpu_to_be64(val); \ @@ -299,7 +326,7 @@ static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes) #endif #ifdef FIO_USE_GENERIC_INIT_RANDOM_STATE -static inline int init_random_seeds(unsigned long *rand_seeds, int size) +static inline int init_random_seeds(uint64_t *rand_seeds, int size) { int fd; @@ -325,10 +352,10 @@ static inline unsigned long long get_fs_free_size(const char *path) } #endif -#ifndef FIO_HAVE_CPU_ONLINE_SYSCONF -static inline unsigned int cpus_online(void) +#ifndef FIO_HAVE_CPU_CONF_SYSCONF +static inline unsigned int cpus_configured(void) { - return sysconf(_SC_NPROCESSORS_ONLN); + return sysconf(_SC_NPROCESSORS_CONF); } #endif @@ -336,7 +363,7 @@ static inline unsigned int cpus_online(void) #ifdef FIO_HAVE_CPU_AFFINITY static inline int CPU_COUNT(os_cpu_mask_t *mask) { - int max_cpus = cpus_online(); + int max_cpus = cpus_configured(); int nr_cpus, i; for (i = 0, nr_cpus = 0; i < max_cpus; i++) @@ -349,11 +376,13 @@ static inline int CPU_COUNT(os_cpu_mask_t *mask) #endif #ifndef FIO_HAVE_GETTID +#ifndef CONFIG_HAVE_GETTID static inline int gettid(void) { return getpid(); } #endif +#endif #ifndef FIO_HAVE_SHM_ATTACH_REMOVED static inline int shm_attach_to_open_removed(void) @@ -371,7 +400,7 @@ static inline bool fio_fallocate(struct fio_file *f, uint64_t offset, uint64_t l #endif #if defined(CONFIG_POSIX_FALLOCATE) || defined(FIO_HAVE_NATIVE_FALLOCATE) -# define FIO_HAVE_ANY_FALLOCATE +# define FIO_HAVE_DEFAULT_FALLOCATE #endif #ifndef FIO_HAVE_CPU_HAS @@ -381,4 +410,17 @@ static inline bool os_cpu_has(cpu_features feature) } #endif +#ifndef FIO_EMULATED_MKDIR_TWO +# define fio_mkdir(path, mode) mkdir(path, mode) #endif + +#ifdef _SC_CLK_TCK +static inline void os_clk_tck(long *clk_tck) +{ + *clk_tck = sysconf(_SC_CLK_TCK); +} +#else +extern void os_clk_tck(long *clk_tck); +#endif + +#endif /* FIO_OS_H */