Solaris compilation fix

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

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 759f3c1bc2cdfb33018504716cb0163e5ecf0531..a53fb40fe8dd15de18ff5aebc19a792f20279ee6 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -3,11 +3,13 @@
 
 #include <sys/types.h>
 #include <sys/fcntl.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_POSIXAIO
 #define FIO_HAVE_SOLARISAIO
 #define FIO_HAVE_FALLOCATE
 #define FIO_HAVE_POSIXAIO_FSYNC

+#define FIO_HAVE_CPU_AFFINITY

 
 #define OS_MAP_ANON            MAP_ANON
 #define OS_RAND_MAX            2147483648UL
 
 #define OS_MAP_ANON            MAP_ANON
 #define OS_RAND_MAX            2147483648UL


@@ -16,7 +18,7 @@ struct solaris_rand_seed {
        unsigned short r[3];
 };
 
        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;
 
 /*
 typedef struct solaris_rand_seed os_random_state_t;
 
 /*


@@ -62,4 +64,43 @@ static inline int fio_set_odirect(int fd)
        return 0;
 }
 
        return 0;
 }
 

+/*
+ * pset binding hooks for fio
+ */
+#define fio_setaffinity(td)            \
+       pset_bind((td)->o.cpumask, P_PID, (td)->pid)
+#define fio_getaffinity(pid, ptr)      0
+
+#define fio_cpu_clear(mask, cpu)       pset_assign(*(mask), (cpu), PS_NONE)
+#define fio_cpu_set(mask, cpu)         pset_assign(*(mask), (cpu), PS_MYID)
+
+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
 #endif