change fio_set_odirect() prototype not to use int fd

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

diff --git a/os/os-solaris.h b/os/os-solaris.h
index c8896b8c8c01b87d66b3699fa37e1cab14250bdd..6af25d2aee69f2306875fd0c59a2af29b3ff512d 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -5,6 +5,7 @@
 
 #include <errno.h>
 #include <malloc.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/fcntl.h>
 #include <sys/pset.h>
@@ -15,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
@@ -60,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)
@@ -85,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;
@@ -105,7 +105,8 @@ static inline int fio_set_odirect(int fd)
 
 static inline int fio_cpu_isset(os_cpu_mask_t *mask, int cpu)
 {
-       const unsigned int max_cpus = cpus_online();
+       const unsigned int max_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+       unsigned int num_cpus;
        processorid_t *cpus;
        int i, ret;
 
@@ -117,7 +118,7 @@ static inline int fio_cpu_isset(os_cpu_mask_t *mask, int cpu)
        }
 
        ret = 0;
-       for (i = 0; i < max_cpus; i++) {
+       for (i = 0; i < num_cpus; i++) {
                if (cpus[i] == cpu) {
                        ret = 1;
                        break;
@@ -128,15 +129,7 @@ static inline int fio_cpu_isset(os_cpu_mask_t *mask, int cpu)
        return ret;
 }
 
-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_count(os_cpu_mask_t *mask)
+static inline int fio_cpu_count(os_cpu_mask_t *mask)
 {
        unsigned int num_cpus;
 
@@ -146,6 +139,14 @@ static inline int fio_cpuset_count(os_cpu_mask_t *mask)
        return num_cpus;
 }
 
+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)