X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=os%2Fos-solaris.h;h=14164b01b47cfccfdfe45fd4c340d8a1e2313a19;hb=ecc314ba7c5f02b7e90ac1dfbce1a74cd4e6d6fe;hp=de948952f866541acf41cad840efc8fff0529769;hpb=6f7024e49e41fafcb838acbebf0c31fbcf35132f;p=fio.git

diff --git a/os/os-solaris.h b/os/os-solaris.h
index de948952..14164b01 100644
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -1,6 +1,8 @@
 #ifndef FIO_OS_SOLARIS_H
 #define FIO_OS_SOLARIS_H
 
+#include <errno.h>
+#include <malloc.h>
 #include <sys/types.h>
 #include <sys/fcntl.h>
 #include <sys/pset.h>
@@ -10,6 +12,10 @@
 #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 FIO_HAVE_FDATASYNC
+#define FIO_HAVE_CLOCK_MONOTONIC
 
 #define OS_MAP_ANON		MAP_ANON
 #define OS_RAND_MAX		2147483648UL
@@ -21,15 +27,7 @@ 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)
+static inline int blockdev_invalidate_cache(struct fio_file fio_unused *f)
 {
 	return EINVAL;
 }
@@ -67,19 +65,44 @@ 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)	\
-	sched_getaffinity((pid), sizeof(cpu_set_t), (ptr))
+#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(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;
+	}
 
-#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_cpuset_init(td)		pset_create(&(td)->o.cpumask)
-#define fio_cpuset_exit(td)		pset_destroy((td)->o.cpumask)
+	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
 
+#ifdef MADV_FREE
+#define FIO_MADV_FREE	MADV_FREE
+#endif
+
 #endif