X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos-solaris.h;h=ff8d6f25d6ca6a02497d7cab081873dad376a6c5;hp=a53fb40fe8dd15de18ff5aebc19a792f20279ee6;hb=792d551747e83601121afce033a66f357c9fc439;hpb=4a3c7b90413beb215dae12a26701ccbefa4bc847;ds=sidebyside

diff --git a/os/os-solaris.h b/os/os-solaris.h
index a53fb40f..ff8d6f25 100644
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -1,6 +1,7 @@
 #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>
@@ -10,6 +11,8 @@
 #define FIO_HAVE_FALLOCATE
 #define FIO_HAVE_POSIXAIO_FSYNC
 #define FIO_HAVE_CPU_AFFINITY
+#define FIO_HAVE_PSHARED_MUTEX
+#define FIO_USE_GENERIC_BDEV_SIZE
 
 #define OS_MAP_ANON		MAP_ANON
 #define OS_RAND_MAX		2147483648UL
@@ -21,14 +24,6 @@ struct solaris_rand_seed {
 typedef psetid_t os_cpu_mask_t;
 typedef struct solaris_rand_seed os_random_state_t;
 
-/*
- * FIXME
- */
-static inline int blockdev_size(int fd, unsigned long long *bytes)
-{
-	return EINVAL;
-}
-
 static inline int blockdev_invalidate_cache(int fd)
 {
 	return EINVAL;
@@ -67,12 +62,12 @@ static inline int fio_set_odirect(int fd)
 /*
  * 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_setaffinity(pid, cpumask)		\
+	pset_bind((cpumask), P_PID, (pid), NULL)
+#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)
+#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)
 {
@@ -103,4 +98,8 @@ static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
  */
 #define FIO_MAX_CPUS			16384
 
+#ifdef MADV_FREE
+#define FIO_MADV_FREE	MADV_FREE
+#endif
+
 #endif