1 files changed, 11 insertions, 7 deletions

diff --git a/tools/perf/bench/futex-wake.c b/tools/perf/bench/futex-wake.c
index 8c5c0b6b5c97..e8181ad7d088 100644
--- a/tools/perf/bench/futex-wake.c
+++ b/tools/perf/bench/futex-wake.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include "bench.h"
 #include "futex.h"
+#include "cpumap.h"
 
 #include <err.h>
 #include <stdlib.h>
@@ -89,19 +90,19 @@ static void print_summary(void)
 }
 
 static void block_threads(pthread_t *w,
-                          pthread_attr_t thread_attr)
+                          pthread_attr_t thread_attr, struct cpu_map *cpu)
 {
-        cpu_set_t cpu;
+        cpu_set_t cpuset;
         unsigned int i;
 
         threads_starting = nthreads;
 
         /* create and block all threads */
         for (i = 0; i < nthreads; i++) {
-                CPU_ZERO(&cpu);
-                CPU_SET(i % ncpus, &cpu);
+                CPU_ZERO(&cpuset);
+                CPU_SET(cpu->map[i % cpu->nr], &cpuset);
 
-                if (pthread_attr_setaffinity_np(&thread_attr, sizeof(cpu_set_t), &cpu))
+                if (pthread_attr_setaffinity_np(&thread_attr, sizeof(cpu_set_t), &cpuset))
                         err(EXIT_FAILURE, "pthread_attr_setaffinity_np");
 
                 if (pthread_create(&w[i], &thread_attr, workerfn, NULL))
@@ -122,6 +123,7 @@ int bench_futex_wake(int argc, const char **argv)
         unsigned int i, j;
         struct sigaction act;
         pthread_attr_t thread_attr;
+        struct cpu_map *cpu;
 
         argc = parse_options(argc, argv, options, bench_futex_wake_usage, 0);
         if (argc) {
@@ -129,7 +131,9 @@ int bench_futex_wake(int argc, const char **argv)
                 exit(EXIT_FAILURE);
         }
 
-        ncpus = sysconf(_SC_NPROCESSORS_ONLN);
+        cpu = cpu_map__new(NULL);
+        if (!cpu)
+                err(EXIT_FAILURE, "calloc");
 
         sigfillset(&act.sa_mask);
         act.sa_sigaction = toggle_done;
@@ -161,7 +165,7 @@ int bench_futex_wake(int argc, const char **argv)
                 struct timeval start, end, runtime;
 
                 /* create, launch & block all threads */
-                block_threads(worker, thread_attr);
+                block_threads(worker, thread_attr, cpu);
 
                 /* make sure all threads are already blocked */
                 pthread_mutex_lock(&thread_lock);