Add a cpuset exit function

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

diff --git a/os/os-linux.h b/os/os-linux.h
index c0f5327637bae11d572aacd315f5b018f2aa6ec3..33380461f19c0c8fe122b9577e324f22ebe66a23 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -35,11 +35,8 @@
 #define CLOCK_MONOTONIC 1
 #endif
 
-#ifdef FIO_HAVE_CPU_AFFINITY
 typedef cpu_set_t os_cpu_mask_t;
-#else
-typedef int os_cpu_mask_t;
-#endif
+
 typedef struct drand48_data os_random_state_t;
 
 /*
@@ -54,7 +51,6 @@ typedef struct drand48_data os_random_state_t;
  * If you are on an ancient glibc (2.3.2), then define GLIBC_2_3_2 if you want
  * the affinity helpers to work.
  */
-#ifdef FIO_HAVE_CPU_AFFINITY
 #ifndef GLIBC_2_3_2
 #define fio_setaffinity(td)            \
        sched_setaffinity((td)->pid, sizeof((td)->o.cpumask), &(td)->o.cpumask)
@@ -66,7 +62,13 @@ typedef struct drand48_data os_random_state_t;
 #define fio_getaffinity(pid, ptr)      \
        sched_getaffinity((pid), (ptr))
 #endif
-#endif
+
+#define fio_cpu_clear(mask, cpu)       CPU_CLR((cpu), (mask))
+#define fio_cpu_set(mask, cpu)         CPU_SET((cpu), (mask))
+#define fio_cpuset_init(td)            CPU_ZERO(&(td)->o.cpumask)
+#define fio_cpuset_exit(td)            do { } while (0)
+
+#define FIO_MAX_CPUS                   CPU_SETSIZE
 
 static inline int ioprio_set(int which, int who, int ioprio)
 {