X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos.h;h=afee9f9c65456fb5e50ac5139eb6fc398d6a24f3;hp=8ca507a68cbbede9c2f5367e49174f9ec7a2a2b6;hb=2c3e17be4c7c9a737317ada414b98929652fec15;hpb=49758e11f3658686ccd1c61724a5eba142f3ee4f diff --git a/os/os.h b/os/os.h index 8ca507a6..afee9f9c 100644 --- a/os/os.h +++ b/os/os.h @@ -8,6 +8,9 @@ #include #include +#include "../arch/arch.h" +#include "../lib/types.h" + enum { os_linux = 1, os_aix, @@ -15,9 +18,11 @@ enum { os_hpux, os_mac, os_netbsd, + os_openbsd, os_solaris, os_windows, os_android, + os_dragonfly, os_nr, }; @@ -28,6 +33,8 @@ enum { #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__) @@ -40,28 +47,25 @@ enum { #include "os-hpux.h" #elif defined(WIN32) #include "os-windows.h" +#elif defined (__DragonFly__) +#include "os-dragonfly.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; #endif #endif -#ifdef FIO_HAVE_SGIO -#include -#include +#ifndef CONFIG_STRSEP +#include "../oslib/strsep.h" #endif -#ifndef FIO_HAVE_STRSEP -#include "../lib/strsep.h" +#ifndef CONFIG_STRLCAT +#include "../oslib/strlcat.h" #endif #ifdef MSG_DONTWAIT @@ -72,14 +76,34 @@ 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) 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 @@ -92,6 +116,12 @@ 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 @@ -116,18 +146,12 @@ 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 #ifndef FIO_PREFERRED_ENGINE -#define FIO_PREFERRED_ENGINE "sync" +#define FIO_PREFERRED_ENGINE "psync" #endif #ifndef FIO_OS_PATH_SEPARATOR @@ -135,19 +159,23 @@ typedef unsigned long os_cpu_mask_t; #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 +#define FIO_MAX_JOBS 4096 #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) ctime_r((x), (y)) +#define os_ctime_r(x, y, z) (void) ctime_r((x), (y)) #endif #ifdef FIO_USE_GENERIC_SWAP @@ -175,7 +203,7 @@ static inline uint64_t fio_swap64(uint64_t val) #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) @@ -192,43 +220,34 @@ static inline uint64_t fio_swap64(uint64_t val) #endif #endif /* FIO_HAVE_BYTEORDER_FUNCS */ +#ifdef FIO_INTERNAL #define le16_to_cpu(val) ({ \ - uint16_t *__val = &(val); \ - __le16_to_cpu(*__val); \ + typecheck(uint16_t, val); \ + __le16_to_cpu(val); \ }) #define le32_to_cpu(val) ({ \ - uint32_t *__val = &(val); \ - __le32_to_cpu(*__val); \ + typecheck(uint32_t, val); \ + __le32_to_cpu(val); \ }) #define le64_to_cpu(val) ({ \ - uint64_t *__val = &(val); \ - __le64_to_cpu(*__val); \ + typecheck(uint64_t, val); \ + __le64_to_cpu(val); \ }) +#endif + #define cpu_to_le16(val) ({ \ - uint16_t *__val = &(val); \ - __cpu_to_le16(*__val); \ + typecheck(uint16_t, val); \ + __cpu_to_le16(val); \ }) #define cpu_to_le32(val) ({ \ - uint32_t *__val = &(val); \ - __cpu_to_le32(*__val); \ + typecheck(uint32_t, val); \ + __cpu_to_le32(val); \ }) #define cpu_to_le64(val) ({ \ - uint64_t *__val = &(val); \ - __cpu_to_le64(*__val); \ + typecheck(uint64_t, val); \ + __cpu_to_le64(val); \ }) -#ifndef FIO_HAVE_BLKTRACE -static inline int is_blktrace(const char *fname) -{ - return 0; -} -struct thread_data; -static inline int load_blktrace(struct thread_data *td, const char *fname) -{ - return 1; -} -#endif - #define FIO_DEF_CL_SIZE 128 static inline int os_cache_line_size(void) @@ -279,12 +298,7 @@ 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) +static inline int init_random_seeds(unsigned long *rand_seeds, int size) { int fd; @@ -299,13 +313,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; } @@ -318,6 +331,22 @@ static inline unsigned int cpus_online(void) } #endif +#ifndef CPU_COUNT +#ifdef FIO_HAVE_CPU_AFFINITY +static inline int CPU_COUNT(os_cpu_mask_t *mask) +{ + int max_cpus = cpus_online(); + int nr_cpus, i; + + for (i = 0, nr_cpus = 0; i < max_cpus; i++) + if (fio_cpu_isset(mask, i)) + nr_cpus++; + + return nr_cpus; +} +#endif +#endif + #ifndef FIO_HAVE_GETTID static inline int gettid(void) { @@ -325,4 +354,19 @@ static inline int gettid(void) } #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 + #endif