Merge branch 'master' of ssh://git.kernel.dk/data/git/fio

[fio.git] / os / os.h

diff --git a/os/os.h b/os/os.h
index 03d1e9a14565f8481dd93db480e1896dfde184ec..7cb8121120ecd5c98c78d8d3e31b76997172c6da 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -21,6 +21,7 @@ enum {
        os_solaris,
        os_windows,
        os_android,
+       os_dragonfly,
 
        os_nr,
 };
@@ -45,6 +46,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
@@ -80,7 +83,10 @@ typedef struct aiocb os_aiocb_t;
 #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;
+#else
+extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu);
 #endif
 
 #ifndef FIO_HAVE_IOPRIO
@@ -197,29 +203,32 @@ 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
@@ -324,6 +333,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)
 {