X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos.h;h=827b61e90d745211edb0635a028342ca7da42361;hp=df706ab7be4150d8589b2130e96e5c4ef1b09bb6;hb=03ec570f6e571b1731378b8fcf4843e8051db7ed;hpb=ff8039b745d59ede0ce9245ed24da14ecf2d3f38 diff --git a/os/os.h b/os/os.h index df706ab7..827b61e9 100644 --- a/os/os.h +++ b/os/os.h @@ -7,8 +7,10 @@ #include #include #include +#include -#include "../arch/arch.h" +#include "../arch/arch.h" /* IWYU pragma: export */ +#include "../lib/types.h" enum { os_linux = 1, @@ -21,10 +23,16 @@ enum { os_solaris, os_windows, os_android, + os_dragonfly, os_nr, }; +typedef enum { + CPU_ARM64_CRC32C, +} cpu_features; + +/* IWYU pragma: begin_exports */ #if defined(__ANDROID__) #include "os-android.h" #elif defined(__linux__) @@ -45,10 +53,16 @@ enum { #include "os-hpux.h" #elif defined(WIN32) #include "os-windows.h" +#elif defined (__DragonFly__) +#include "os-dragonfly.h" #else #error "unsupported os" #endif +#ifndef EDQUOT +#define EDQUOT EIO +#endif + #ifdef CONFIG_POSIXAIO #include #ifndef FIO_OS_HAVE_AIOCB_TYPEDEF @@ -56,14 +70,14 @@ typedef struct aiocb os_aiocb_t; #endif #endif -#ifdef FIO_HAVE_SGIO -#include -#include +#ifndef CONFIG_STRSEP +#include "../oslib/strsep.h" #endif -#ifndef CONFIG_STRSEP -#include "../lib/strsep.h" +#ifndef CONFIG_STRLCAT +#include "../oslib/strlcat.h" #endif +/* IWYU pragma: end_exports */ #ifdef MSG_DONTWAIT #define OS_MSG_DONTWAIT MSG_DONTWAIT @@ -73,20 +87,41 @@ typedef struct aiocb os_aiocb_t; #define POSIX_FADV_DONTNEED (0) #define POSIX_FADV_SEQUENTIAL (0) #define POSIX_FADV_RANDOM (0) +#define POSIX_FADV_NORMAL (0) #endif #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; + +static inline int fio_setaffinity(int pid, os_cpu_mask_t cpumask) +{ + return 0; +} + +static inline int fio_getaffinity(int pid, os_cpu_mask_t *cpumask) +{ + return -1; +} + +static inline int fio_cpuset_exit(os_cpu_mask_t *mask) +{ + return -1; +} + +static inline int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu_index) +{ + return 0; +} #else 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) +#endif #ifndef FIO_HAVE_IOPRIO +#define ioprio_value(prioclass, prio) (0) #define ioprio_set(which, who, prioclass, prio) (0) #endif @@ -126,16 +161,12 @@ 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 "sync" +#define FIO_PREFERRED_ENGINE "psync" #endif #ifndef FIO_OS_PATH_SEPARATOR -#define FIO_OS_PATH_SEPARATOR "/" +#define FIO_OS_PATH_SEPARATOR '/' #endif #ifndef FIO_PREFERRED_CLOCK_SOURCE @@ -146,10 +177,6 @@ extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu); #endif #endif -#ifndef FIO_MAX_JOBS -#define FIO_MAX_JOBS 2048 -#endif - #ifndef CONFIG_SOCKLEN_T typedef unsigned int socklen_t; #endif @@ -184,16 +211,28 @@ 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) #define __cpu_to_le64(x) fio_swap64(x) @@ -201,6 +240,18 @@ 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); \ +}) #define le16_to_cpu(val) ({ \ typecheck(uint16_t, val); \ __le16_to_cpu(val); \ @@ -215,6 +266,18 @@ 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); \ +}) #define cpu_to_le16(val) ({ \ typecheck(uint16_t, val); \ __cpu_to_le16(val); \ @@ -228,19 +291,6 @@ static inline uint64_t fio_swap64(uint64_t val) __cpu_to_le64(val); \ }) -#ifndef FIO_HAVE_BLKTRACE -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, - int need_swap) -{ - return 1; -} -#endif - #define FIO_DEF_CL_SIZE 128 static inline int os_cache_line_size(void) @@ -273,30 +323,8 @@ static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes) } #endif -#ifdef FIO_USE_GENERIC_RAND -typedef unsigned int os_random_state_t; - -static inline void os_random_seed(unsigned long seed, os_random_state_t *rs) -{ - srand(seed); -} - -static inline long os_random_long(os_random_state_t *rs) -{ - long val; - - val = rand_r(rs); - return val; -} -#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) +static inline int init_random_seeds(uint64_t *rand_seeds, int size) { int fd; @@ -311,13 +339,12 @@ static inline int init_random_state(struct thread_data *td, unsigned long *rand_ } 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) +static inline unsigned long long get_fs_free_size(const char *path) { return 0; } @@ -347,10 +374,42 @@ 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) +{ + return 0; +} #endif + +#ifndef FIO_HAVE_NATIVE_FALLOCATE +static inline bool fio_fallocate(struct fio_file *f, uint64_t offset, uint64_t len) +{ + errno = ENOSYS; + return false; +} +#endif + +#if defined(CONFIG_POSIX_FALLOCATE) || defined(FIO_HAVE_NATIVE_FALLOCATE) +# define FIO_HAVE_DEFAULT_FALLOCATE +#endif + +#ifndef FIO_HAVE_CPU_HAS +static inline bool os_cpu_has(cpu_features feature) +{ + return false; +} +#endif + +#ifndef FIO_EMULATED_MKDIR_TWO +# define fio_mkdir(path, mode) mkdir(path, mode) +#endif + +#endif /* FIO_OS_H */