Merge branch 'master' of ssh://router/data/git/fio

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

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 9e243e8a82fdb9da4631aabcd88abddd00666280..b58d1308efc49e4bd1cf0d530256f90e9e076afd 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -1,21 +1,26 @@
 #ifndef FIO_OS_SOLARIS_H
 #define FIO_OS_SOLARIS_H
 
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/fcntl.h>
+#include <sys/pset.h>
 
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_SOLARISAIO
 #define FIO_HAVE_FALLOCATE
 #define FIO_HAVE_POSIXAIO_FSYNC
+#define FIO_HAVE_CPU_AFFINITY
+#define FIO_HAVE_PSHARED_MUTEX
 
-#define OS_MAP_ANON            (MAP_ANON)
+#define OS_MAP_ANON            MAP_ANON
+#define OS_RAND_MAX            2147483648UL
 
 struct solaris_rand_seed {
        unsigned short r[3];
 };
 
-typedef unsigned long os_cpu_mask_t;
+typedef psetid_t os_cpu_mask_t;
 typedef struct solaris_rand_seed os_random_state_t;
 
 /*
@@ -61,4 +66,43 @@ static inline int fio_set_odirect(int fd)
        return 0;
 }
 
+/*
+ * pset binding hooks for fio
+ */
+#define fio_setaffinity(td)            \
+       pset_bind((td)->o.cpumask, P_PID, (td)->pid, NULL)
+#define fio_getaffinity(pid, ptr)      ({ 0; })
+
+#define fio_cpu_clear(mask, cpu)       pset_assign(PS_NONE, (cpu), NULL)
+#define fio_cpu_set(mask, cpu)         pset_assign(*(mask), (cpu), NULL)
+
+static inline int fio_cpuset_init(os_cpu_mask_t *mask)
+{
+       int ret;
+
+       if (pset_create(mask) < 0) {
+               ret = errno;
+               return -1;
+       }
+
+       return 0;
+}
+
+static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
+{
+       int ret;
+
+       if (pset_destroy(*mask) < 0) {
+               ret = errno;
+               return -1;
+       }
+
+       return 0;
+}
+
+/*
+ * Should be enough, not aware of what (if any) restrictions Solaris has
+ */
+#define FIO_MAX_CPUS                   16384
+
 #endif