Skip to contentSkip to conversation

perf bench numa: Add define for RUSAGE_THREAD if not present

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message May 3, 2019 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  bf561d3c13423fc54daa19b5d49dc15fafdb7acc
Gitweb:     https://git.kernel.org/tip/bf561d3c13423fc54daa19b5d49dc15fafdb7acc
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 25 Apr 2019 18:36:51 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 2 May 2019 16:00:20 -0400

perf bench numa: Add define for RUSAGE_THREAD if not present

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.

---
 tools/perf/bench/numa.c | 4 ++++
 1 file changed, 4 insertions(+)
tools/perf/bench/numa.c +4 -0
index 98ad783efc69..a7784554a80d 100644
@@ -39,6 +39,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:
  */