shuffle numa options around a bit
Signed-off-by: Clark Williams <williams@redhat.com>
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 4ff5c61..89b5295 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1703,7 +1703,9 @@
void get_cpu_affinity(struct bitmask *cpus)
{
struct bitmask *bitmask = numa_allocate_cpumask();
-#if 0
+#if NUMA
+ numa_sched_getaffinity(0, bitmask);
+#else
int i, max_cpus = numa_num_configured_cpus();
cpu_set_t mask;
int ret = sched_getaffinity(0, sizeof(mask), &mask);
@@ -1719,10 +1721,9 @@
numa_bitmask_setbit(bitmask, i);
}
}
-#else
- numa_sched_getaffinity(0, bitmask);
#endif
- cpus = bitmask;
+ /* copy the contents to our argument */
+ *cpus = *bitmask;
}
int main(int argc, char **argv)
@@ -1733,7 +1734,7 @@
int max_cpus = sysconf(_SC_NPROCESSORS_ONLN);
int i, ret = -1;
int status;
- int numa = numa_available();
+ int numa = numa_available() == 0 ? 1 : 0;
get_cpu_affinity(&allowed_cpus);
diff --git a/src/cyclictest/rt_numa.h b/src/cyclictest/rt_numa.h
index 915cb5f..9614a62 100644
--- a/src/cyclictest/rt_numa.h
+++ b/src/cyclictest/rt_numa.h
@@ -23,8 +23,6 @@
#include "rt-utils.h"
#include "error.h"
-static int numa = 0;
-
#ifdef NUMA
#include <numa.h>
