Merge branch 'msys2' of https://github.com/sitsofe/fio into master

[fio.git] / os / os.h

diff --git a/os/os.h b/os/os.h
index 16bca6841f0c92270e5ac47150a33254039194bc..9a280e541f1b505a45622f7649279650c0c1165c 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -8,7 +8,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "../arch/arch.h"
+#include "../arch/arch.h" /* IWYU pragma: export */
 #include "../lib/types.h"
 
 enum {
@@ -27,6 +27,11 @@ enum {
        os_nr,
 };
 
+typedef enum {
+        CPU_ARM64_CRC32C,
+} cpu_features;
+
+/* IWYU pragma: begin_exports */
 #if defined(__ANDROID__)
 #include "os-android.h"
 #elif defined(__linux__)
@@ -60,11 +65,6 @@ typedef struct aiocb os_aiocb_t;
 #endif
 #endif
 
-#ifdef FIO_HAVE_SGIO
-#include <linux/fs.h>
-#include <scsi/sg.h>
-#endif
-
 #ifndef CONFIG_STRSEP
 #include "../oslib/strsep.h"
 #endif
@@ -72,6 +72,7 @@ typedef struct aiocb os_aiocb_t;
 #ifndef CONFIG_STRLCAT
 #include "../oslib/strlcat.h"
 #endif
+/* IWYU pragma: end_exports */
 
 #ifdef MSG_DONTWAIT
 #define OS_MSG_DONTWAIT        MSG_DONTWAIT
@@ -81,6 +82,7 @@ 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
@@ -159,7 +161,7 @@ extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu);
 #endif
 
 #ifndef FIO_OS_PATH_SEPARATOR
-#define FIO_OS_PATH_SEPARATOR  "/"
+#define FIO_OS_PATH_SEPARATOR  '/'
 #endif
 
 #ifndef FIO_PREFERRED_CLOCK_SOURCE
@@ -208,16 +210,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)
@@ -225,6 +239,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);                     \
@@ -239,6 +265,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);                     \
@@ -252,19 +290,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)
@@ -297,30 +322,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;
 
@@ -335,7 +338,6 @@ static inline int init_random_state(struct thread_data *td, unsigned long *rand_
        }
 
        close(fd);
-       td_fill_rand_seeds(td);
        return 0;
 }
 #endif
@@ -347,14 +349,6 @@ static inline unsigned long long get_fs_free_size(const char *path)
 }
 #endif
 
-#ifdef __powerpc64__
-#define FIO_HAVE_CPU_ONLINE_SYSCONF
-static inline unsigned int cpus_online(void)
-{
-        return sysconf(_SC_NPROCESSORS_CONF);
-}
-#endif
-
 #ifndef FIO_HAVE_CPU_ONLINE_SYSCONF
 static inline unsigned int cpus_online(void)
 {
@@ -379,10 +373,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 */