From 9353a9805555db17cfb9e8c1f4cda14d679711e1 Mon Sep 17 00:00:00 2001 From: Han Pingtian Date: Thu, 20 Jan 2011 19:47:07 +0800 Subject: [PATCH] --- yaml --- r: 232299 b: refs/heads/master c: ffb5e0fb44d0829021a51f972df90166bc9b700e h: refs/heads/master i: 232297: db65efd2462995f9d24dfd37155bbfc22ad8b4f6 232295: 8f7a903fbdb9326217219c9c69347055bab9e2b9 v: v3 --- [refs] | 2 +- trunk/tools/perf/builtin-test.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d44ffb2e9ffa..1228c018e642 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2f8fb237e9cc407a02aca401369c15babae35dd +refs/heads/master: ffb5e0fb44d0829021a51f972df90166bc9b700e diff --git a/trunk/tools/perf/builtin-test.c b/trunk/tools/perf/builtin-test.c index ed5696198d3d..02958d6a807f 100644 --- a/trunk/tools/perf/builtin-test.c +++ b/trunk/tools/perf/builtin-test.c @@ -380,13 +380,18 @@ static int test__open_syscall_event_on_all_cpus(void) for (cpu = 0; cpu < cpus->nr; ++cpu) { unsigned int ncalls = nr_open_calls + cpu; - CPU_SET(cpu, cpu_set); - sched_setaffinity(0, cpu_set_size, cpu_set); + CPU_SET_S(cpus->map[cpu], cpu_set_size, cpu_set); + if (sched_setaffinity(0, cpu_set_size, cpu_set) < 0) { + pr_debug("sched_setaffinity() failed on CPU %d: %s ", + cpus->map[cpu], + strerror(errno)); + goto out_close_fd; + } for (i = 0; i < ncalls; ++i) { fd = open("/etc/passwd", O_RDONLY); close(fd); } - CPU_CLR(cpu, cpu_set); + CPU_CLR_S(cpus->map[cpu], cpu_set_size, cpu_set); } /* @@ -410,7 +415,7 @@ static int test__open_syscall_event_on_all_cpus(void) expected = nr_open_calls + cpu; if (evsel->counts->cpu[cpu].val != expected) { pr_debug("perf_evsel__read_on_cpu: expected to intercept %d calls on cpu %d, got %Ld\n", - expected, cpu, evsel->counts->cpu[cpu].val); + expected, cpus->map[cpu], evsel->counts->cpu[cpu].val); goto out_close_fd; } }