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 <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-7b1zvugiwak4ibfa3j6ott7f@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2019-08-29 14:59:50 -03:00
parent a774940263
commit 91854f9a07
23 changed files with 34 additions and 23 deletions

View File

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
#include "common.h" #include "common.h"
#include "../util/env.h" #include "../util/env.h"
#include "../util/debug.h" #include "../util/debug.h"

View File

@ -7,7 +7,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <linux/types.h> #include <linux/types.h>
#include "perf.h" #include "perf-sys.h"
#include "debug.h" #include "debug.h"
#include "tests/tests.h" #include "tests/tests.h"
#include "cloexec.h" #include "cloexec.h"

View File

@ -4,7 +4,7 @@
#include <regex.h> #include <regex.h>
#include <linux/zalloc.h> #include <linux/zalloc.h>
#include "../../perf.h" #include "../../perf-sys.h"
#include "../../util/perf_regs.h" #include "../../util/perf_regs.h"
#include "../../util/debug.h" #include "../../util/debug.h"

View File

@ -7,6 +7,7 @@
#include "../../../perf.h" #include "../../../perf.h"
#include <linux/types.h> #include <linux/types.h>
#include <asm/barrier.h>
#include "../../../util/debug.h" #include "../../../util/debug.h"
#include "../../../util/tsc.h" #include "../../../util/tsc.h"

View File

@ -14,6 +14,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <signal.h> #include <signal.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <sys/time.h> #include <sys/time.h>

View File

@ -63,6 +63,7 @@
/* For the CLR_() macros */ /* For the CLR_() macros */
#include <string.h> #include <string.h>
#include <pthread.h> #include <pthread.h>
#include <unistd.h>
#include <errno.h> #include <errno.h>
#include <inttypes.h> #include <inttypes.h>

View File

@ -8,7 +8,7 @@
*/ */
#include "debug.h" #include "debug.h"
#include "../perf.h" #include "../perf-sys.h"
#include <subcmd/parse-options.h> #include <subcmd/parse-options.h>
#include "../util/header.h" #include "../util/header.h"
#include "../util/cloexec.h" #include "../util/cloexec.h"
@ -20,6 +20,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include <sys/time.h> #include <sys/time.h>
#include <errno.h> #include <errno.h>
#include <linux/time64.h> #include <linux/time64.h>

View File

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "builtin.h" #include "builtin.h"
#include "perf.h" #include "perf.h"
#include "perf-sys.h"
#include "util/evlist.h" #include "util/evlist.h"
#include "util/cache.h" #include "util/cache.h"

View File

@ -5,10 +5,17 @@
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <linux/types.h>
#include <linux/compiler.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 static inline int
sys_perf_event_open(struct perf_event_attr *attr, sys_perf_event_open(struct perf_event_attr *attr,

View File

@ -19,6 +19,7 @@
#include "util/debug.h" #include "util/debug.h"
#include "util/event.h" #include "util/event.h"
#include "util/util.h" #include "util/util.h"
#include "perf-sys.h"
#include <api/fs/fs.h> #include <api/fs/fs.h>
#include <api/fs/tracing_path.h> #include <api/fs/tracing_path.h>
#include <errno.h> #include <errno.h>

View File

@ -4,18 +4,6 @@
#include <time.h> #include <time.h>
#include <stdbool.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) static inline unsigned long long rdclock(void)
{ {

View File

@ -30,7 +30,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include "../perf.h" #include "../perf-sys.h"
#include <subcmd/exec-cmd.h> #include <subcmd/exec-cmd.h>
#include "tests.h" #include "tests.h"

View File

@ -19,7 +19,7 @@
#include "tests.h" #include "tests.h"
#include "debug.h" #include "debug.h"
#include "perf.h" #include "../perf-sys.h"
#include "cloexec.h" #include "cloexec.h"
volatile long the_var; volatile long the_var;

View File

@ -25,7 +25,7 @@
#include "tests.h" #include "tests.h"
#include "debug.h" #include "debug.h"
#include "perf.h" #include "perf-sys.h"
#include "cloexec.h" #include "cloexec.h"
static int fd1; static int fd1;

View File

@ -24,7 +24,7 @@
#include "tests.h" #include "tests.h"
#include "debug.h" #include "debug.h"
#include "perf.h" #include "../perf-sys.h"
#include "cloexec.h" #include "cloexec.h"
static int overflows; static int overflows;

View File

@ -1,10 +1,12 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <linux/hw_breakpoint.h> #include <linux/hw_breakpoint.h>
#include "tests.h" #include "tests.h"
#include "debug.h" #include "debug.h"
#include "cloexec.h" #include "cloexec.h"
#include "../perf-sys.h"
#define WP_TEST_ASSERT_VAL(fd, text, val) \ #define WP_TEST_ASSERT_VAL(fd, text, val) \
do { \ do { \

View File

@ -15,6 +15,7 @@
#include <linux/perf_event.h> #include <linux/perf_event.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/bitsperlong.h> #include <asm/bitsperlong.h>
#include <asm/barrier.h>
#include "../perf.h" #include "../perf.h"
#include "event.h" #include "event.h"

View File

@ -2,7 +2,7 @@
#include <errno.h> #include <errno.h>
#include <sched.h> #include <sched.h>
#include "util.h" #include "util.h"
#include "../perf.h" #include "../perf-sys.h"
#include "cloexec.h" #include "cloexec.h"
#include "asm/bug.h" #include "asm/bug.h"
#include "debug.h" #include "debug.h"

View File

@ -41,6 +41,7 @@
#include "string2.h" #include "string2.h"
#include "memswap.h" #include "memswap.h"
#include "util.h" #include "util.h"
#include "../perf-sys.h"
#include "util/parse-branch-options.h" #include "util/parse-branch-options.h"
#include <internal/xyarray.h> #include <internal/xyarray.h>

View File

@ -14,6 +14,7 @@
#include <libelf.h> #include <libelf.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
#include <inttypes.h> #include <inttypes.h>
#include <limits.h> #include <limits.h>
#include <fcntl.h> #include <fcntl.h>
@ -25,6 +26,7 @@
#include "perf.h" #include "perf.h"
#include "genelf.h" #include "genelf.h"
#include "../util/jitdump.h" #include "../util/jitdump.h"
#include <linux/compiler.h>
#ifndef NT_GNU_BUILD_ID #ifndef NT_GNU_BUILD_ID
#define NT_GNU_BUILD_ID 3 #define NT_GNU_BUILD_ID 3

View File

@ -14,6 +14,7 @@
#include "thread_map.h" #include "thread_map.h"
#include "mmap.h" #include "mmap.h"
#include "util.h" #include "util.h"
#include "../perf-sys.h"
#if PY_MAJOR_VERSION < 3 #if PY_MAJOR_VERSION < 3
#define _PyUnicode_FromString(arg) \ #define _PyUnicode_FromString(arg) \

View File

@ -10,6 +10,7 @@
#include "util.h" #include "util.h"
#include "cloexec.h" #include "cloexec.h"
#include "record.h" #include "record.h"
#include "../perf-sys.h"
typedef void (*setup_probe_fn_t)(struct evsel *evsel); typedef void (*setup_probe_fn_t)(struct evsel *evsel);

View File

@ -4,6 +4,7 @@
#include <linux/zalloc.h> #include <linux/zalloc.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
/* /*
* Used as the default ->buf value, so that people can always assume * Used as the default ->buf value, so that people can always assume