perf tools: Move everything related to sys_perf_event_open() to perf-sys.h
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 91854f9a077e18e43ed30ebe9c61f8089bec9166 Gitweb: https://git.kernel.org/tip/91854f9a077e18e43ed30ebe9c61f8089bec9166 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 29 Aug 2019 14:59:50 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Thu, 29 Aug 2019 17:38:32 -03:00
perf tools: Move everything related to sys_perf_event_open() to perf-sys.h
And remove unneeded include directives from perf-sys.h to prune the header dependency tree.
Fixup the fallout in places where definitions were being used without the needed include directives that were being satisfied because they were in perf-sys.h.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/arch/common.c | 1 + tools/perf/arch/x86/tests/rdpmc.c | 2 +- tools/perf/arch/x86/util/perf_regs.c | 2 +- tools/perf/arch/x86/util/tsc.c | 1 + tools/perf/bench/epoll-ctl.c | 1 + tools/perf/bench/epoll-wait.c | 1 + tools/perf/bench/mem-functions.c | 3 ++- tools/perf/builtin-sched.c | 1 + tools/perf/perf-sys.h | 13 ++++++++++--- tools/perf/perf.c | 1 + tools/perf/perf.h | 12 ------------ tools/perf/tests/attr.c | 2 +- tools/perf/tests/bp_account.c | 2 +- tools/perf/tests/bp_signal.c | 2 +- tools/perf/tests/bp_signal_overflow.c | 2 +- tools/perf/tests/wp.c | 2 ++ tools/perf/util/auxtrace.h | 1 + tools/perf/util/cloexec.c | 2 +- tools/perf/util/evsel.c | 1 + tools/perf/util/genelf.c | 2 ++ tools/perf/util/python.c | 1 + tools/perf/util/record.c | 1 + tools/perf/util/strbuf.c | 1 + 23 files changed, 34 insertions(+), 23 deletions(-)
tools/perf/arch/common.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <stdio.h> #include <stdlib.h> +#include <unistd.h> #include "common.h" #include "../util/env.h" #include "../util/debug.h"
tools/perf/arch/x86/tests/rdpmc.c +1 -1
@@ -7,7 +7,7 @@#include <sys/types.h> #include <sys/wait.h> #include <linux/types.h> -#include "perf.h" +#include "perf-sys.h" #include "debug.h" #include "tests/tests.h" #include "cloexec.h"
tools/perf/arch/x86/util/perf_regs.c +1 -1
@@ -4,7 +4,7 @@#include <regex.h> #include <linux/zalloc.h> -#include "../../perf.h" +#include "../../perf-sys.h" #include "../../util/perf_regs.h" #include "../../util/debug.h"
tools/perf/arch/x86/util/tsc.c +1 -0
@@ -7,6 +7,7 @@#include "../../../perf.h" #include <linux/types.h> +#include <asm/barrier.h> #include "../../../util/debug.h" #include "../../../util/tsc.h"
tools/perf/bench/epoll-ctl.c +1 -0
@@ -14,6 +14,7 @@#include <inttypes.h> #include <signal.h> #include <stdlib.h> +#include <unistd.h> #include <linux/compiler.h> #include <linux/kernel.h> #include <sys/time.h>
tools/perf/bench/epoll-wait.c +1 -0
@@ -63,6 +63,7 @@/* For the CLR_() macros */ #include <string.h> #include <pthread.h> +#include <unistd.h> #include <errno.h> #include <inttypes.h>
tools/perf/bench/mem-functions.c +2 -1
@@ -8,7 +8,7 @@*/ #include "debug.h" -#include "../perf.h" +#include "../perf-sys.h" #include <subcmd/parse-options.h> #include "../util/header.h" #include "../util/cloexec.h"
@@ -20,6 +20,7 @@#include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include <sys/time.h> #include <errno.h> #include <linux/time64.h>
tools/perf/builtin-sched.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include "builtin.h" #include "perf.h" +#include "perf-sys.h" #include "util/evlist.h" #include "util/cache.h"
tools/perf/perf-sys.h +10 -3
@@ -5,10 +5,17 @@#include <unistd.h> #include <sys/types.h> #include <sys/syscall.h> -#include <linux/types.h> #include <linux/compiler.h> -#include <linux/perf_event.h> -#include <asm/barrier.h> + +struct perf_event_attr ; + +extern bool test_attr__enabled; +void test_attr__ready (void ); +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 static inline int sys_perf_event_open(struct perf_event_attr *attr,
tools/perf/perf.c +1 -0
@@ -19,6 +19,7 @@#include "util/debug.h" #include "util/event.h" #include "util/util.h" +#include "perf-sys.h" #include <api/fs/fs.h> #include <api/fs/tracing_path.h> #include <errno.h>
tools/perf/perf.h +0 -12
@@ -4,18 +4,6 @@#include <time.h> #include <stdbool.h> -#include <linux/types.h> -#include <linux/stddef.h> -#include <linux/perf_event.h> - -extern bool test_attr__enabled; -void test_attr__ready (void ); -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 -#include "perf-sys.h" static inline unsigned long long rdclock (void ) {
tools/perf/tests/attr.c +1 -1
@@ -30,7 +30,7 @@#include <sys/types.h> #include <sys/stat.h> #include <unistd.h> -#include "../perf.h" +#include "../perf-sys.h" #include <subcmd/exec-cmd.h> #include "tests.h"
tools/perf/tests/bp_account.c +1 -1
@@ -19,7 +19,7 @@#include "tests.h" #include "debug.h" -#include "perf.h" +#include "../perf-sys.h" #include "cloexec.h" volatile long the_var;
tools/perf/tests/bp_signal.c +1 -1
@@ -25,7 +25,7 @@#include "tests.h" #include "debug.h" -#include "perf.h" +#include "perf-sys.h" #include "cloexec.h" static int fd1;
tools/perf/tests/bp_signal_overflow.c +1 -1
@@ -24,7 +24,7 @@#include "tests.h" #include "debug.h" -#include "perf.h" +#include "../perf-sys.h" #include "cloexec.h" static int overflows;
tools/perf/tests/wp.c +2 -0
@@ -1,10 +1,12 @@// SPDX-License-Identifier: GPL-2.0 #include <stdlib.h> +#include <unistd.h> #include <sys/ioctl.h> #include <linux/hw_breakpoint.h> #include "tests.h" #include "debug.h" #include "cloexec.h" +#include "../perf-sys.h" #define WP_TEST_ASSERT_VAL (fd, text, val) \ do { \
tools/perf/util/auxtrace.h +1 -0
@@ -15,6 +15,7 @@#include <linux/perf_event.h> #include <linux/types.h> #include <asm/bitsperlong.h> +#include <asm/barrier.h> #include "../perf.h" #include "event.h"
tools/perf/util/cloexec.c +1 -1
@@ -2,7 +2,7 @@#include <errno.h> #include <sched.h> #include "util.h" -#include "../perf.h" +#include "../perf-sys.h" #include "cloexec.h" #include "asm/bug.h" #include "debug.h"
tools/perf/util/evsel.c +1 -0
@@ -41,6 +41,7 @@#include "string2.h" #include "memswap.h" #include "util.h" +#include "../perf-sys.h" #include "util/parse-branch-options.h" #include <internal/xyarray.h>
tools/perf/util/genelf.c +2 -0
@@ -14,6 +14,7 @@#include <libelf.h> #include <string.h> #include <stdlib.h> +#include <unistd.h> #include <inttypes.h> #include <limits.h> #include <fcntl.h>
@@ -25,6 +26,7 @@#include "perf.h" #include "genelf.h" #include "../util/jitdump.h" +#include <linux/compiler.h> #ifndef NT_GNU_BUILD_ID #define NT_GNU_BUILD_ID 3
tools/perf/util/python.c +1 -0
@@ -14,6 +14,7 @@#include "thread_map.h" #include "mmap.h" #include "util.h" +#include "../perf-sys.h" #if PY_MAJOR_VERSION <3 #define _PyUnicode_FromString (arg) \
tools/perf/util/record.c +1 -0
@@ -10,6 +10,7 @@#include "util.h" #include "cloexec.h" #include "record.h" +#include "../perf-sys.h" typedef void (*setup_probe_fn_t )(struct evsel *evsel);
tools/perf/util/strbuf.c +1 -0
@@ -4,6 +4,7 @@#include <linux/zalloc.h> #include <errno.h> #include <stdlib.h> +#include <unistd.h> /* * Used as the default ->buf value, so that people can always assume