Commit 6bd7cf66 authored Oct 01, 2019 by Björn Töpel Committed by Daniel Borkmann Oct 31, 2019

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



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 91854f9a ("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: 91854f9a ("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: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: bpf@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: http://lore.kernel.org/bpf/20191001113307.27796-2-bjorn.topel@gmail.com

parent 7541c87c

tools/perf/perf-sys.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,9 @@ void test_attr__init(void);
		void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu,
		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
		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,
		group_fd, flags);

		#ifdef HAVE_ATTR_TEST
		#if HAVE_ATTR_TEST
		if (unlikely(test_attr__enabled))
		test_attr__open(attr, pid, cpu, fd, group_fd, flags);
		#endif

Admin message