cpus_allowed: use __NRPROCESSORS_CONF instead of __SC_NPROCESSORS_ONLN for non-sequen...

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

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 2f137234ca3266288cb34d763982da191806cfb3..60d4c1eca49e21e5f040e3ce810f80094f493935 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -7,7 +7,7 @@
 #include <malloc.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
 #include <sys/pset.h>
 #include <sys/mman.h>
 #include <sys/dkio.h>
@@ -16,6 +16,7 @@
 #include <pthread.h>
 
 #include "../file.h"
+#include "../lib/types.h"
 
 #define FIO_HAVE_CPU_AFFINITY
 #define FIO_HAVE_CHARDEV_SIZE
@@ -45,8 +46,13 @@ struct solaris_rand_seed {
 #define os_ctime_r(x, y, z)     ctime_r((x), (y), (z))
 #define FIO_OS_HAS_CTIME_R
 
+#ifdef CONFIG_PTHREAD_GETAFFINITY
+#define FIO_HAVE_GET_THREAD_AFFINITY
+#define fio_get_thread_affinity(mask)  \
+       pthread_getaffinity_np(pthread_self(), sizeof(mask), &(mask))
+#endif
+
 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)
 {
@@ -91,21 +97,6 @@ static inline unsigned long long get_fs_free_size(const char *path)
        return ret;
 }
 
-static inline void os_random_seed(unsigned long seed, os_random_state_t *rs)
-{
-       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)
-{
-       return nrand48(rs->r);
-}
-
 #define FIO_OS_DIRECTIO
 extern int directio(int, int);
 static inline int fio_set_odirect(struct fio_file *f)
@@ -126,24 +117,25 @@ static inline int fio_set_odirect(struct fio_file *f)
 #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_cpu_isset(os_cpu_mask_t *mask, int cpu)
+static inline bool fio_cpu_isset(os_cpu_mask_t *mask, int cpu)
 {
-       const unsigned int max_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+       const unsigned int max_cpus = sysconf(_SC_NPROCESSORS_CONF);
        unsigned int num_cpus;
        processorid_t *cpus;
-       int i, ret;
+       bool ret;
+       int i;
 
        cpus = malloc(sizeof(*cpus) * max_cpus);
 
        if (pset_info(*mask, NULL, &num_cpus, cpus) < 0) {
                free(cpus);
-               return 0;
+               return false;
        }
 
-       ret = 0;
+       ret = false;
        for (i = 0; i < num_cpus; i++) {
                if (cpus[i] == cpu) {
-                       ret = 1;
+                       ret = true;
                        break;
                }
        }
@@ -178,10 +170,12 @@ static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
        return 0;
 }
 
+#ifndef CONFIG_HAVE_GETTID
 static inline int gettid(void)
 {
        return pthread_self();
 }
+#endif
 
 /*
  * Should be enough, not aware of what (if any) restrictions Solaris has