solaris: fixup new cpuset functions
Signed-off-by: Jens Axboe <axboe@fb.com>
diff --git a/os/os-solaris.h b/os/os-solaris.h
index c8896b8..5b78cc2 100644
--- 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>
@@ -105,7 +106,8 @@
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 +119,7 @@
}
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 +130,7 @@
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 +140,14 @@
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)