Fio 3.1

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

diff --git a/os/os-dragonfly.h b/os/os-dragonfly.h
index 57958ca689dc36ea199f935ebaeeea6a6821ab2e..423b2369a071bd2de9096178ee2d3c118decabb2 100644 (file)
--- a/os/os-dragonfly.h
+++ b/os/os-dragonfly.h
@@ -5,12 +5,14 @@
 
 #include <errno.h>
 #include <unistd.h>
+#include <sys/endian.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/statvfs.h>
 #include <sys/diskslice.h>
 #include <sys/ioctl_compat.h>
 #include <sys/usched.h>
+#include <sys/resource.h>
 
 #include "../file.h"
 
@@ -22,6 +24,8 @@
 #define FIO_HAVE_CHARDEV_SIZE
 #define FIO_HAVE_GETTID
 #define FIO_HAVE_CPU_AFFINITY
+#define FIO_HAVE_IOPRIO
+#define FIO_HAVE_SHM_ATTACH_REMOVED
 
 #define OS_MAP_ANON            MAP_ANON
 
@@ -68,8 +72,7 @@ typedef cpumask_t os_cpu_mask_t;
 
 /*
  * Define USCHED_GET_CPUMASK as the macro didn't exist until release 4.5.
- * usched_set(2) returns EINVAL if the kernel doesn't support it, though
- * fio_getaffinity() returns void.
+ * usched_set(2) returns EINVAL if the kernel doesn't support it.
  *
  * Also note usched_set(2) works only for the current thread regardless of
  * the command type. It doesn't work against another thread regardless of
@@ -80,6 +83,9 @@ typedef cpumask_t os_cpu_mask_t;
 #define USCHED_GET_CPUMASK     5
 #endif
 
+/* No CPU_COUNT(), but use the default function defined in os/os.h */
+#define fio_cpu_count(mask)             CPU_COUNT((mask))
+
 static inline int fio_cpuset_init(os_cpu_mask_t *mask)
 {
        CPUMASK_ASSZERO(*mask);
@@ -109,17 +115,6 @@ static inline int fio_cpu_isset(os_cpu_mask_t *mask, int cpu)
        return 0;
 }
 
-static inline int fio_cpu_count(os_cpu_mask_t *mask)
-{
-       int i, n = 0;
-
-       for (i = 0; i < FIO_MAX_CPUS; i++)
-               if (CPUMASK_TESTBIT(*mask, i))
-                       n++;
-
-       return n;
-}
-
 static inline int fio_setaffinity(int pid, os_cpu_mask_t mask)
 {
        int i, firstcall = 1;
@@ -143,14 +138,33 @@ static inline int fio_setaffinity(int pid, os_cpu_mask_t mask)
        return 0;
 }
 
-static inline void fio_getaffinity(int pid, os_cpu_mask_t *mask)
+static inline int fio_getaffinity(int pid, os_cpu_mask_t *mask)
 {
        /* 0 for the current thread, see BUGS in usched_set(2) */
        pid = 0;
 
-       usched_set(pid, USCHED_GET_CPUMASK, mask, sizeof(*mask));
+       if (usched_set(pid, USCHED_GET_CPUMASK, mask, sizeof(*mask)))
+               return -1;
+
+       return 0;
 }
 
+/* fio code is Linux based, so rename macros to Linux style */
+#define IOPRIO_WHO_PROCESS     PRIO_PROCESS
+#define IOPRIO_WHO_PGRP                PRIO_PGRP
+#define IOPRIO_WHO_USER                PRIO_USER
+
+#define IOPRIO_MIN_PRIO                1       /* lowest priority */
+#define IOPRIO_MAX_PRIO                10      /* highest priority */
+
+/*
+ * Prototypes declared in sys/sys/resource.h are preventing from defining
+ * ioprio_set() with 4 arguments, so define fio's ioprio_set() as a macro.
+ * Note that there is no idea of class within ioprio_set(2) unlike Linux.
+ */
+#define ioprio_set(which, who, ioprio_class, ioprio)   \
+       ioprio_set(which, who, ioprio)
+
 static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
 {
        struct partinfo pi;
@@ -171,7 +185,7 @@ static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)
 
 static inline int blockdev_invalidate_cache(struct fio_file *f)
 {
-       return EINVAL;
+       return ENOTSUP;
 }
 
 static inline unsigned long long os_phys_mem(void)
@@ -202,7 +216,7 @@ static inline unsigned long long get_fs_free_size(const char *path)
        return ret;
 }
 
-static inline int os_trim(int fd, unsigned long long start,
+static inline int os_trim(struct fio_file *f, unsigned long long start,
                          unsigned long long len)
 {
        off_t range[2];
@@ -210,7 +224,7 @@ static inline int os_trim(int fd, unsigned long long start,
        range[0] = start;
        range[1] = len;
 
-       if (!ioctl(fd, IOCTLTRIM, range))
+       if (!ioctl(f->fd, IOCTLTRIM, range))
                return 0;
 
        return errno;
@@ -220,4 +234,15 @@ static inline int os_trim(int fd, unsigned long long start,
 #define FIO_MADV_FREE  MADV_FREE
 #endif
 
+static inline int shm_attach_to_open_removed(void)
+{
+       int x;
+       size_t len = sizeof(x);
+
+       if (sysctlbyname("kern.ipc.shm_allow_removed", &x, &len, NULL, 0) < 0)
+               return 0;
+
+       return x > 0 ? 1 : 0;
+}
+
 #endif