Messages in this thread Patch in this message | | | Date | Fri, 26 Jun 2015 01:43:27 -0700 | From | tip-bot for Srikar Dronamraju <> | Subject | [tip:perf/urgent] perf bench numa: Fix to show proper convergence stats |
| |
Commit-ID: 2b42b09b88c831ba4da2d669581dde371c38c2af Gitweb: http://git.kernel.org/tip/2b42b09b88c831ba4da2d669581dde371c38c2af Author: Srikar Dronamraju <srikar@linux.vnet.ibm.com> AuthorDate: Wed, 24 Jun 2015 16:40:04 +0530 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Thu, 25 Jun 2015 12:28:35 -0300
perf bench numa: Fix to show proper convergence stats
With commit: e1e455f4f4d3 (perf tools: Work around lack of sched_getcpu in glibc < 2.6), perf_bench numa mem with -c or -m option is not able to correctly calculate convergence.
With the above commit, sched_getcpu always seems to return -1. The intention of commit e1e455f was to add a sched_getcpu in glibc < 2.6. Hence keep the sched_getcpu definition under an ifdef.
This regression happened occurred between v4.0 and v4.1
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Acked-by: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Vinson Lee <vlee@twitter.com> Fixes: e1e455f4f4d3 ("perf tools: Work around lack of sched_getcpu in glibc < 2.6") Link: http://lkml.kernel.org/r/20150624111004.GA5220@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/cloexec.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/tools/perf/util/cloexec.c b/tools/perf/util/cloexec.c index 85b5238..2babdda 100644 --- a/tools/perf/util/cloexec.c +++ b/tools/perf/util/cloexec.c @@ -7,11 +7,15 @@ static unsigned long flag = PERF_FLAG_FD_CLOEXEC; +#ifdef __GLIBC_PREREQ +#if !__GLIBC_PREREQ(2, 6) int __weak sched_getcpu(void) { errno = ENOSYS; return -1; } +#endif +#endif static int perf_flag_probe(void) {
| |