Merge branch 'solaris-clock-setaffinity' of https://github.com/szaydel/fio

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

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 5b78cc2cc43cb384fb8d5e6e1f952bd6f618c1b6..45268b23862af2983922fca47115cf0d362c6243 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -16,7 +16,6 @@
 #include "../file.h"
 
 #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
@@ -61,7 +60,7 @@ static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)
 
 static inline int blockdev_invalidate_cache(struct fio_file *f)
 {
-       return 0;
+       return ENOTSUP;
 }
 
 static inline unsigned long long os_phys_mem(void)
@@ -86,9 +85,9 @@ static inline long os_random_long(os_random_state_t *rs)
 
 #define FIO_OS_DIRECTIO
 extern int directio(int, int);
-static inline int fio_set_odirect(int fd)
+static inline int fio_set_odirect(struct fio_file *f)
 {
-       if (directio(fd, DIRECTIO_ON) < 0)
+       if (directio(f->fd, DIRECTIO_ON) < 0)
                return errno;
 
        return 0;
@@ -98,7 +97,7 @@ static inline int fio_set_odirect(int fd)
  * pset binding hooks for fio
  */
 #define fio_setaffinity(pid, cpumask)          \
-       pset_bind((cpumask), P_PID, (pid), NULL)
+       pset_bind((cpumask), P_LWPID, (pid), NULL)
 #define fio_getaffinity(pid, ptr)      ({ 0; })
 
 #define fio_cpu_clear(mask, cpu)       pset_assign(PS_NONE, (cpu), NULL)