projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
t/fio-verify-state: pretty up output a bit
[fio.git]
/
os
/
os-solaris.h
diff --git
a/os/os-solaris.h
b/os/os-solaris.h
index c8896b8c8c01b87d66b3699fa37e1cab14250bdd..5b78cc2cc43cb384fb8d5e6e1f952bd6f618c1b6 100644
(file)
--- a/
os/os-solaris.h
+++ b/
os/os-solaris.h
@@
-5,6
+5,7
@@
#include <errno.h>
#include <malloc.h>
#include <errno.h>
#include <malloc.h>
+#include <unistd.h>
#include <sys/types.h>
#include <sys/fcntl.h>
#include <sys/pset.h>
#include <sys/types.h>
#include <sys/fcntl.h>
#include <sys/pset.h>
@@
-105,7
+106,8
@@
static inline int fio_set_odirect(int fd)
static inline int fio_cpu_isset(os_cpu_mask_t *mask, int cpu)
{
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;
processorid_t *cpus;
int i, ret;
@@
-117,7
+119,7
@@
static inline int fio_cpu_isset(os_cpu_mask_t *mask, int cpu)
}
ret = 0;
}
ret = 0;
- for (i = 0; i <
max
_cpus; i++) {
+ for (i = 0; i <
num
_cpus; i++) {
if (cpus[i] == cpu) {
ret = 1;
break;
if (cpus[i] == cpu) {
ret = 1;
break;
@@
-128,15
+130,7
@@
static inline int fio_cpu_isset(os_cpu_mask_t *mask, int cpu)
return ret;
}
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;
{
unsigned int num_cpus;
@@
-146,6
+140,14
@@
static inline int fio_cpuset_count(os_cpu_mask_t *mask)
return num_cpus;
}
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)
static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
{
if (pset_destroy(*mask) < 0)