sg: 16-byte cdb support and lots of fixes

[fio.git] / os / os.h

diff --git a/os/os.h b/os/os.h
index 98b45321962309baa304c3b87b30b819c3aa0888..8e0b8e8f1d6c3deffc45d42dc1c36b19148842f8 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
@@ -65,6 +68,10 @@ typedef struct aiocb os_aiocb_t;
 #include "../lib/strsep.h"
 #endif
 
+#ifndef CONFIG_STRLCAT
+#include "../lib/strlcat.h"
+#endif
+
 #ifdef MSG_DONTWAIT
 #define OS_MSG_DONTWAIT        MSG_DONTWAIT
 #endif
@@ -76,12 +83,24 @@ 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)
-#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_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
@@ -200,22 +219,31 @@ static inline uint64_t fio_swap64(uint64_t val)
 #endif
 #endif /* FIO_HAVE_BYTEORDER_FUNCS */
 
+#ifdef FIO_INTERNAL
 #define le16_to_cpu(val) ({                    \
+       typecheck(uint16_t, val);               \
        __le16_to_cpu(val);                     \
 })
 #define le32_to_cpu(val) ({                    \
+       typecheck(uint32_t, val);               \
        __le32_to_cpu(val);                     \
 })
 #define le64_to_cpu(val) ({                    \
-       __le64_to_cpu(val);                             \
+       typecheck(uint64_t, val);               \
+       __le64_to_cpu(val);                     \
 })
+#endif
+
 #define cpu_to_le16(val) ({                    \
+       typecheck(uint16_t, val);               \
        __cpu_to_le16(val);                     \
 })
 #define cpu_to_le32(val) ({                    \
+       typecheck(uint32_t, val);               \
        __cpu_to_le32(val);                     \
 })
 #define cpu_to_le64(val) ({                    \
+       typecheck(uint64_t, val);               \
        __cpu_to_le64(val);                     \
 })
 
@@ -308,7 +336,7 @@ 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;
 }