| From 2e18d7fc52dcf3f4b3ae0893dab9d364a1fa8509 Mon Sep 17 00:00:00 2001 |
| From: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Date: Thu, 25 Apr 2019 18:36:51 -0300 |
| Subject: perf bench numa: Add define for RUSAGE_THREAD if not present |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| [ Upstream commit bf561d3c13423fc54daa19b5d49dc15fafdb7acc ] |
| |
| While cross building perf to the ARC architecture on a fedora 30 host, |
| we were failing with: |
| |
| CC /tmp/build/perf/bench/numa.o |
| bench/numa.c: In function ‘worker_thread’: |
| bench/numa.c:1261:12: error: ‘RUSAGE_THREAD’ undeclared (first use in this function); did you mean ‘SIGEV_THREAD’? |
| getrusage(RUSAGE_THREAD, &rusage); |
| ^~~~~~~~~~~~~ |
| SIGEV_THREAD |
| bench/numa.c:1261:12: note: each undeclared identifier is reported only once for each function it appears in |
| |
| [perfbuilder@60d5802468f6 perf]$ /arc_gnu_2019.03-rc1_prebuilt_uclibc_le_archs_linux_install/bin/arc-linux-gcc --version | head -1 |
| arc-linux-gcc (ARCv2 ISA Linux uClibc toolchain 2019.03-rc1) 8.3.1 20190225 |
| [perfbuilder@60d5802468f6 perf]$ |
| |
| Trying to reproduce a report by Vineet, I noticed that, with just |
| cross-built zlib and numactl libraries, I ended up with the above |
| failure. |
| |
| So, since RUSAGE_THREAD is available as a define, check for that and |
| numactl libraries, I ended up with the above failure. |
| |
| So, since RUSAGE_THREAD is available as a define in the system headers, |
| check if it is defined in the 'perf bench numa' sources and define it if |
| not. |
| |
| Now it builds and I have to figure out if the problem reported by Vineet |
| only takes place if we have libelf or some other library available. |
| |
| Cc: Arnd Bergmann <arnd@arndb.de> |
| Cc: Jiri Olsa <jolsa@kernel.org> |
| Cc: linux-snps-arc@lists.infradead.org |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com> |
| Link: https://lkml.kernel.org/n/tip-2wb4r1gir9xrevbpq7qp0amk@git.kernel.org |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/perf/bench/numa.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c |
| index ee9565a033f47..e58be7eeced83 100644 |
| --- a/tools/perf/bench/numa.c |
| +++ b/tools/perf/bench/numa.c |
| @@ -35,6 +35,10 @@ |
| #include <numa.h> |
| #include <numaif.h> |
| |
| +#ifndef RUSAGE_THREAD |
| +# define RUSAGE_THREAD 1 |
| +#endif |
| + |
| /* |
| * Regular printout to the terminal, supressed if -q is specified: |
| */ |
| -- |
| 2.20.1 |
| |