Fio 2.8

[fio.git] / os / os.h

diff --git a/os/os.h b/os/os.h
index 4416ae482fb46a176cccf252bea8307dbc24b0c8..02ab40d38a6ca86c3b70552f797a1c6b9b28def7 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 
 #include "../arch/arch.h"
+#include "../lib/types.h"
 
 enum {
        os_linux = 1,
@@ -17,9 +18,11 @@ enum {
        os_hpux,
        os_mac,
        os_netbsd,
+       os_openbsd,
        os_solaris,
        os_windows,
        os_android,
+       os_dragonfly,
 
        os_nr,
 };
@@ -30,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__)
@@ -42,6 +47,8 @@ enum {
 #include "os-hpux.h"
 #elif defined(WIN32)
 #include "os-windows.h"
+#elif defined (__DragonFly__)
+#include "os-dragonfly.h"
 #else
 #error "unsupported os"
 #endif
@@ -59,7 +66,11 @@ typedef struct aiocb os_aiocb_t;
 #endif
 
 #ifndef CONFIG_STRSEP
-#include "../lib/strsep.h"
+#include "../oslib/strsep.h"
+#endif
+
+#ifndef CONFIG_STRLCAT
+#include "../oslib/strlcat.h"
 #endif
 
 #ifdef MSG_DONTWAIT
@@ -73,11 +84,26 @@ typedef struct aiocb os_aiocb_t;
 #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_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
@@ -90,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
@@ -188,38 +220,42 @@ 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)
+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;
 }
@@ -301,12 +337,20 @@ static inline int init_random_state(struct thread_data *td, unsigned long *rand_
 #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;
 }
 #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)
 {
@@ -314,6 +358,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)
 {