os: make fio_cpu_isset() return a bool

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/os/os-dragonfly.h b/os/os-dragonfly.h
index 423b2369a071bd2de9096178ee2d3c118decabb2..713046f53543442a89d21c55ace2cbcd05839d4b 100644 (file)
--- a/os/os-dragonfly.h
+++ b/os/os-dragonfly.h
@@ -15,6 +15,7 @@
 #include <sys/resource.h>
 
 #include "../file.h"
+#include "../lib/types.h"
 
 #define FIO_HAVE_ODIRECT
 #define FIO_USE_GENERIC_RAND
@@ -107,12 +108,9 @@ static inline void fio_cpu_set(os_cpu_mask_t *mask, int cpu)
        CPUMASK_ORBIT(*mask, cpu);
 }
 
-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)
 {
-       if (CPUMASK_TESTBIT(*mask, cpu))
-               return 1;
-
-       return 0;
+       return CPUMASK_TESTBIT(*mask, cpu) != 0;
 }
 
 static inline int fio_setaffinity(int pid, os_cpu_mask_t mask)

diff --git a/os/os-freebsd.h b/os/os-freebsd.h
index 4a7cdeb7daaf2cef234c5a0c0ec551c7e72e4dad..97bc8ae5f4e2658d99d590d90f2919098df7ed96 100644 (file)
--- a/os/os-freebsd.h
+++ b/os/os-freebsd.h
@@ -37,7 +37,7 @@ typedef cpuset_t os_cpu_mask_t;
 
 #define fio_cpu_clear(mask, cpu)        (void) CPU_CLR((cpu), (mask))
 #define fio_cpu_set(mask, cpu)          (void) CPU_SET((cpu), (mask))
-#define fio_cpu_isset(mask, cpu)       CPU_ISSET((cpu), (mask))
+#define fio_cpu_isset(mask, cpu)       (CPU_ISSET((cpu), (mask)) != 0)
 #define fio_cpu_count(mask)            CPU_COUNT((mask))
 
 static inline int fio_cpuset_init(os_cpu_mask_t *mask)

diff --git a/os/os-linux.h b/os/os-linux.h
index 1ad6ebd28497e3257e52c58353881357b0c90f8e..894dc850904f0717d745ac61ce2805e349aff210 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -71,7 +71,7 @@ typedef struct drand48_data os_random_state_t;
 
 #define fio_cpu_clear(mask, cpu)       (void) CPU_CLR((cpu), (mask))
 #define fio_cpu_set(mask, cpu)         (void) CPU_SET((cpu), (mask))
-#define fio_cpu_isset(mask, cpu)       CPU_ISSET((cpu), (mask))
+#define fio_cpu_isset(mask, cpu)       (CPU_ISSET((cpu), (mask)) != 0)
 #define fio_cpu_count(mask)            CPU_COUNT((mask))
 
 static inline int fio_cpuset_init(os_cpu_mask_t *mask)

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 2f137234ca3266288cb34d763982da191806cfb3..db03546c9b7560e04225d129a9ddf9ecd30dc79c 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.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
@@ -126,24 +127,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);
        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;
                }
        }

diff --git a/os/os-windows.h b/os/os-windows.h
index 1b87771d2d7498a0ec6c2a1b49cb8bc0059f9965..9b045794f1de2884649dac818bd5b489354af846 100644 (file)
--- a/os/os-windows.h
+++ b/os/os-windows.h
@@ -17,6 +17,7 @@
 #include "../log.h"
 #include "../lib/hweight.h"
 #include "../oslib/strcasestr.h"
+#include "../lib/types.h"
 
 #include "windows/posix.h"
 
@@ -219,7 +220,7 @@ static inline void fio_cpu_set(os_cpu_mask_t *mask, int cpu)
 
 static inline int fio_cpu_isset(os_cpu_mask_t *mask, int cpu)
 {
-       return (*mask & (1ULL << cpu)) > 0;
+       return (*mask & (1ULL << cpu)) != 0;
 }
 
 static inline int fio_cpu_count(os_cpu_mask_t *mask)