backend: don't dereference ->io_ops in reap_threads()

[fio.git] / os / os-openbsd.h

diff --git a/os/os-openbsd.h b/os/os-openbsd.h
index 7def4326786d9b8e9d24f5f69b3d6fa0dd556462..b4c02c9bf236803227cdb053f35975bb2b6f26d6 100644 (file)
--- a/os/os-openbsd.h
+++ b/os/os-openbsd.h
@@ -9,23 +9,23 @@
 #include <sys/ioctl.h>
 #include <sys/dkio.h>
 #include <sys/disklabel.h>
-/* XXX hack to avoid conflicts between rbtree.h and <sys/tree.h> */
+#include <sys/endian.h>
+#include <sys/utsname.h>
 #include <sys/sysctl.h>
+
+/* XXX hack to avoid conflicts between rbtree.h and <sys/tree.h> */
 #undef RB_BLACK
 #undef RB_RED
 #undef RB_ROOT
 
 #include "../file.h"
 
-#undef  FIO_HAVE_ODIRECT
 #define FIO_USE_GENERIC_RAND
 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_FS_STAT
 #define FIO_HAVE_GETTID
 #define FIO_HAVE_SHM_ATTACH_REMOVED
 
-#undef FIO_HAVE_CPU_AFFINITY   /* XXX notyet */
-
 #define OS_MAP_ANON            MAP_ANON
 
 #ifndef PTHREAD_STACK_MIN
@@ -68,7 +68,7 @@ static inline unsigned long long os_phys_mem(void)
 
 static inline int gettid(void)
 {
-       return (int) pthread_self();
+       return (int)(intptr_t) pthread_self();
 }
 
 static inline unsigned long long get_fs_free_size(const char *path)
@@ -90,9 +90,31 @@ static inline unsigned long long get_fs_free_size(const char *path)
 
 static inline int shm_attach_to_open_removed(void)
 {
+       struct utsname uts;
+       int major, minor;
+
+       if (uname(&uts) == -1)
+               return 0;
+
        /*
-        * XXX: Return 1 if >= OpenBSD 5.1 according to 97900ebf.
+        * Return 1 if >= OpenBSD 5.1 according to 97900ebf,
+        * assuming both major/minor versions are < 10.
         */
+       if (uts.release[0] > '9' || uts.release[0] < '0')
+               return 0;
+       if (uts.release[1] != '.')
+               return 0;
+       if (uts.release[2] > '9' || uts.release[2] < '0')
+               return 0;
+
+       major = uts.release[0] - '0';
+       minor = uts.release[2] - '0';
+
+       if (major > 5)
+               return 1;
+       if (major == 5 && minor >= 1)
+               return 1;
+
        return 0;
 }