X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos-solaris.h;h=5029d38f356e5983992bb58ae04cfffa77773a5d;hp=9e243e8a82fdb9da4631aabcd88abddd00666280;hb=a1c58075279454a91ec43366846b93e8dcf9753c;hpb=f022ddb71f93b5d9e32261491284b9881fceaf0c

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 9e243e8a..5029d38f 100644
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -1,29 +1,37 @@
 #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;
 
-/*
- * FIXME
- */
 static inline int blockdev_size(int fd, unsigned long long *bytes)
 {
-	return EINVAL;
+	off_t end = lseek(fd, 0, SEEK_END);
+
+	if (end < 0)
+		return errno;
+
+	*bytes = end;
+	return 0;
 }
 
 static inline int blockdev_invalidate_cache(int fd)
@@ -61,4 +69,47 @@ static inline int fio_set_odirect(int fd)
 	return 0;
 }
 
+/*
+ * pset binding hooks for fio
+ */
+#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;
+	}
+
+	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