X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos-solaris.h;h=e6612118ace4baf7afcae38eb9a7126ca45af10e;hp=7fa0bb50e1b06f1b3642cbb5cab4a060bab71015;hb=da52c582b76a8752ad3dd113696c9debcb3449e8;hpb=417f006858ec66f0b410c83c2e13da54662048e0

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 7fa0bb50..e6612118 100644
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -1,58 +1,136 @@
 #ifndef FIO_OS_SOLARIS_H
 #define FIO_OS_SOLARIS_H
 
-#undef FIO_HAVE_LIBAIO
-#define FIO_HAVE_POSIXAIO
-#define FIO_HAVE_SOLARISAIO
-#undef FIO_HAVE_FADVISE
-#undef FIO_HAVE_CPU_AFFINITY
-#undef FIO_HAVE_DISK_UTIL
-#undef FIO_HAVE_SGIO
-#undef FIO_HAVE_ODIRECT
+#define	FIO_OS	os_solaris
 
-#define OS_MAP_ANON		(MAP_ANON)
+#include <errno.h>
+#include <malloc.h>
+#include <sys/types.h>
+#include <sys/fcntl.h>
+#include <sys/pset.h>
+#include <sys/mman.h>
+#include <sys/dkio.h>
+#include <sys/byteorder.h>
 
-typedef unsigned long os_cpu_mask_t;
-typedef unsigned int os_random_state_t;
+#include "../file.h"
 
-/*
- * FIXME
- */
-static inline int blockdev_size(int fd, unsigned long long *bytes)
+#define FIO_HAVE_CPU_AFFINITY
+#define FIO_HAVE_PSHARED_MUTEX
+#define FIO_HAVE_CHARDEV_SIZE
+#define FIO_USE_GENERIC_BDEV_SIZE
+#define FIO_USE_GENERIC_INIT_RANDOM_STATE
+#define FIO_HAVE_GETTID
+
+#define OS_MAP_ANON		MAP_ANON
+#define OS_RAND_MAX		2147483648UL
+
+#define fio_swap16(x)	BSWAP_16(x)
+#define fio_swap32(x)	BSWAP_32(x)
+#define fio_swap64(x)	BSWAP_64(x)
+
+struct solaris_rand_seed {
+	unsigned short r[3];
+};
+
+#ifndef POSIX_MADV_SEQUENTIAL
+#define posix_madvise	madvise
+#define POSIX_MADV_SEQUENTIAL	MADV_SEQUENTIAL
+#define POSIX_MADV_DONTNEED	MADV_DONTNEED
+#define POSIX_MADV_RANDOM	MADV_RANDOM
+#endif
+
+#define os_ctime_r(x, y, z)     ctime_r((x), (y), (z))
+#define FIO_OS_HAS_CTIME_R
+
+typedef psetid_t os_cpu_mask_t;
+typedef struct solaris_rand_seed os_random_state_t;
+
+static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)
 {
-	return EINVAL;
+	struct dk_minfo info;
+
+	*bytes = 0;
+
+	if (ioctl(f->fd, DKIOCGMEDIAINFO, &info) < 0)
+		return errno;
+
+	*bytes = info.dki_lbsize * info.dki_capacity;
+	return 0;
 }
 
-static inline int blockdev_invalidate_cache(int fd)
+static inline int blockdev_invalidate_cache(struct fio_file *f)
 {
-	return EINVAL;
+	return 0;
 }
 
 static inline unsigned long long os_phys_mem(void)
 {
-#if 0
-	int mib[2] = { CTL_HW, HW_PHYSMEM };
-	unsigned long long mem;
-	size_t len = sizeof(mem);
-
-	sysctl(mib, 2, &mem, &len, NULL, 0);
-	return mem;
-#else
 	return 0;
-#endif
 }
 
 static inline void os_random_seed(unsigned long seed, os_random_state_t *rs)
 {
-	srand(seed);
+	rs->r[0] = seed & 0xffff;
+	seed >>= 16;
+	rs->r[1] = seed & 0xffff;
+	seed >>= 16;
+	rs->r[2] = seed & 0xffff;
+	seed48(rs->r);
 }
 
 static inline long os_random_long(os_random_state_t *rs)
 {
-	long val;
+	return nrand48(rs->r);
+}
+
+#define FIO_OS_DIRECTIO
+extern int directio(int, int);
+static inline int fio_set_odirect(int fd)
+{
+	if (directio(fd, DIRECTIO_ON) < 0)
+		return errno;
 
-	val = rand_r(rs);
-	return val;
+	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)
+{
+	if (pset_create(mask) < 0)
+		return -1;
+
+	return 0;
+}
+
+static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
+{
+	if (pset_destroy(*mask) < 0)
+		return -1;
+
+	return 0;
+}
+
+static inline int gettid(void)
+{
+	return pthread_self();
+}
+
+/*
+ * 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