iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf tools: Make usage of test_attr__* optional for perf-sys.h

Browse Source 
For users of perf-sys.h outside perf, e.g. samples/bpf/bpf_load.c, it's
convenient not to depend on test_attr__*.

After commit 91854f9a07 ("perf tools: Move everything related to
sys_perf_event_open() to perf-sys.h"), all users of perf-sys.h will
depend on test_attr__enabled and test_attr__open.

This commit enables a user to define HAVE_ATTR_TEST to zero in order
to omit the test dependency.

Fixes: 91854f9a07 ("perf tools: Move everything related to sys_perf_event_open() to perf-sys.h")
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
Acked-by: Song Liu <songliubraving@fb.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: bpf@vger.kernel.org
Cc: netdev@vger.kernel.org
Link: http://lore.kernel.org/lkml/20191001113307.27796-2-bjorn.topel@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Björn Töpel 2019-10-01 13:33:06 +02:00 committed by Arnaldo Carvalho de Melo
parent b3700f21c2
commit 06f84d1989
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/perf/perf-sys.h
View File

@ -15,7 +15,9 @@ void test_attr__init(void);
void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu, void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu,
int fd, int group_fd, unsigned long flags); int fd, int group_fd, unsigned long flags);
#define HAVE_ATTR_TEST #ifndef HAVE_ATTR_TEST
#define HAVE_ATTR_TEST 1
#endif
static inline int static inline int
sys_perf_event_open(struct perf_event_attr *attr, sys_perf_event_open(struct perf_event_attr *attr,
@ -27,7 +29,7 @@ sys_perf_event_open(struct perf_event_attr *attr,
fd = syscall(__NR_perf_event_open, attr, pid, cpu, fd = syscall(__NR_perf_event_open, attr, pid, cpu,
group_fd, flags); group_fd, flags);
#ifdef HAVE_ATTR_TEST #if HAVE_ATTR_TEST
if (unlikely(test_attr__enabled)) if (unlikely(test_attr__enabled))
test_attr__open(attr, pid, cpu, fd, group_fd, flags); test_attr__open(attr, pid, cpu, fd, group_fd, flags);
#endif #endif