perf auxtrace: Uninline functions that touch perf_session
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the perf/core branch of tip:
Commit-ID: f2a39fe84901df2b3d1bec3459b65cee3e8db57c Gitweb: https://git.kernel.org/tip/f2a39fe84901df2b3d1bec3459b65cee3e8db57c Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Fri, 30 Aug 2019 14:45:20 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Sat, 31 Aug 2019 22:24:10 -03:00
perf auxtrace: Uninline functions that touch perf_session
So that we don't carry the session.h include directive in auxtrace.h, which in turn opens a can of worms of files that were getting all sorts of things via that include, fix them all.
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/arm/annotate/instructions.c | 1 +- tools/perf/arch/arm/util/cs-etm.c | 1 +- tools/perf/arch/arm64/annotate/instructions.c | 1 +- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 1 +- tools/perf/builtin-ftrace.c | 1 +- tools/perf/tests/backward-ring-buffer.c | 1 +- tools/perf/tests/bpf.c | 1 +- tools/perf/tests/builtin-test.c | 1 +- tools/perf/tests/code-reading.c | 6 +++- tools/perf/tests/event-times.c | 1 +- tools/perf/tests/event_update.c | 2 +- tools/perf/tests/keep-tracking.c | 1 +- tools/perf/tests/mmap-basic.c | 1 +- tools/perf/tests/parse-events.c | 1 +- tools/perf/tests/switch-tracking.c | 1 +- tools/perf/ui/browsers/hists.c | 1 +- tools/perf/ui/browsers/res_sample.c | 2 +- tools/perf/ui/browsers/scripts.c | 1 +- tools/perf/ui/hist.c | 2 +- tools/perf/ui/stdio/hist.c | 1 +- tools/perf/util/annotate.c | 3 +- tools/perf/util/auxtrace.c | 33 ++++++++++++++- tools/perf/util/auxtrace.h | 43 ++---------------- tools/perf/util/bpf-loader.c | 1 +- tools/perf/util/cgroup.c | 2 +- tools/perf/util/config.c | 1 +- tools/perf/util/cs-etm.c | 1 +- tools/perf/util/cs-etm.h | 3 +- tools/perf/util/dso.c | 2 +- tools/perf/util/evlist.c | 1 +- tools/perf/util/evsel.c | 1 +- tools/perf/util/machine.c | 2 +- tools/perf/util/mmap.c | 3 +- tools/perf/util/mmap.h | 1 +- tools/perf/util/python.c | 2 +- tools/perf/util/record.c | 2 +- tools/perf/util/s390-sample-raw.c | 1 +- tools/perf/util/sort.c | 1 +- tools/perf/util/stat-display.c | 1 +- tools/perf/util/stat.c | 3 +- tools/perf/util/top.h | 1 +- 41 files changed, 98 insertions(+), 38 deletions(-)
tools/perf/arch/arm/annotate/instructions.c +1 -0
@@ -3,6 +3,7 @@#include <linux/zalloc.h> #include <sys/types.h> #include <regex.h> +#include <stdlib.h> struct arm_annotate { regex_t call_insn,
tools/perf/arch/arm/util/cs-etm.c +1 -0
@@ -26,6 +26,7 @@#include "../../util/pmu.h" #include "../../util/cs-etm.h" #include "../../util/util.h" +#include "../../util/session.h" #include <errno.h> #include <stdlib.h>
tools/perf/arch/arm64/annotate/instructions.c +1 -0
@@ -2,6 +2,7 @@#include <linux/compiler.h> #include <sys/types.h> #include <regex.h> +#include <stdlib.h> struct arm64_annotate { regex_t call_insn,
tools/perf/arch/x86/tests/perf-time-to-tsc.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <errno.h> #include <inttypes.h> +#include <limits.h> #include <stdbool.h> #include <stdio.h> #include <unistd.h>
tools/perf/builtin-ftrace.c +1 -0
@@ -10,6 +10,7 @@#include <errno.h> #include <unistd.h> #include <signal.h> +#include <stdlib.h> #include <fcntl.h> #include <poll.h> #include <linux/capability.h>
tools/perf/tests/backward-ring-buffer.c +1 -0
@@ -9,6 +9,7 @@#include "record.h" #include "tests.h" #include "debug.h" +#include "parse-events.h" #include <errno.h> #include <linux/string.h>
tools/perf/tests/bpf.c +1 -0
@@ -18,6 +18,7 @@#include "tests.h" #include "llvm.h" #include "debug.h" +#include "parse-events.h" #define NR_ITERS 111#define PERF_TEST_BPF_PATH "/sys/fs/bpf/perf_test"
tools/perf/tests/builtin-test.c +1 -0
@@ -8,6 +8,7 @@#include <errno.h> #include <unistd.h> #include <string.h> +#include <stdlib.h> #include <sys/types.h> #include <dirent.h> #include <sys/wait.h>
tools/perf/tests/code-reading.c +6 -0
@@ -13,7 +13,9 @@#include "debug.h" #include "dso.h" +#include "env.h" #include "parse-events.h" +#include "trace-event.h" #include "evlist.h" #include "evsel.h" #include "thread_map.h"
@@ -496,6 +498,10 @@ static void fs_something(void) } } +#ifdef __s390x__ +#include "header.h" // for get_cpuid() +#endif +static const char *do_determine_event (bool excl_kernel) {const char *event = excl_kernel ?"cycles:u" :"cycles" ;
tools/perf/tests/event-times.c +1 -0
@@ -11,6 +11,7 @@#include "evsel.h" #include "util.h" #include "debug.h" +#include "parse-events.h" #include "thread_map.h" #include "target.h"
tools/perf/tests/event_update.c +2 -0
@@ -1,8 +1,10 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> #include <perf/cpumap.h> +#include <string.h> #include "evlist.h" #include "evsel.h" +#include "header.h" #include "machine.h" #include "tool.h" #include "tests.h"
tools/perf/tests/keep-tracking.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/types.h> +#include <limits.h> #include <unistd.h> #include <sys/prctl.h> #include <perf/cpumap.h>
tools/perf/tests/mmap-basic.c +1 -0
@@ -3,6 +3,7 @@#include <inttypes.h> /* For the CLR_() macros */ #include <pthread.h> +#include <stdlib.h> #include <perf/cpumap.h> #include "debug.h"
tools/perf/tests/parse-events.c +1 -0
@@ -5,6 +5,7 @@#include <api/fs/fs.h> #include "tests.h" #include "debug.h" +#include "pmu.h" #include "util.h" #include <dirent.h> #include <errno.h>
tools/perf/tests/switch-tracking.c +1 -0
@@ -2,6 +2,7 @@#include <sys/time.h> #include <sys/prctl.h> #include <errno.h> +#include <limits.h> #include <time.h> #include <stdlib.h> #include <linux/zalloc.h>
tools/perf/ui/browsers/hists.c +1 -0
@@ -16,6 +16,7 @@#include "../../util/callchain.h" #include "../../util/evsel.h" #include "../../util/evlist.h" +#include "../../util/header.h" #include "../../util/hist.h" #include "../../util/map.h" #include "../../util/symbol.h"
tools/perf/ui/browsers/res_sample.c +2 -0
@@ -9,6 +9,8 @@#include "../util.h" #include "../../util/util.h" #include "../../perf.h" +#include <stdlib.h> +#include <string.h> #include <linux/time64.h> #include <linux/zalloc.h>
tools/perf/ui/browsers/scripts.c +1 -0
@@ -10,6 +10,7 @@#include "config.h" #include <linux/string.h> #include <linux/zalloc.h> +#include <stdlib.h> #define SCRIPT_NAMELEN 128#define SCRIPT_MAX_NO 64
tools/perf/ui/hist.c +2 -0
@@ -1,6 +1,8 @@// SPDX-License-Identifier: GPL-2.0 #include <inttypes.h> #include <math.h> +#include <stdlib.h> +#include <string.h> #include <linux/compiler.h> #include "../util/callchain.h"
tools/perf/ui/stdio/hist.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #include <stdio.h> +#include <stdlib.h> #include <linux/string.h> #include "../../util/callchain.h"
tools/perf/util/annotate.c +3 -0
@@ -9,6 +9,7 @@#include <errno.h> #include <inttypes.h> #include <libgen.h> +#include <stdlib.h> #include <bpf/bpf.h> #include <bpf/btf.h> #include <bpf/libbpf.h>
@@ -20,7 +21,9 @@#include "color.h" #include "config.h" #include "dso.h" +#include "env.h" #include "map.h" +#include "map_groups.h" #include "symbol.h" #include "srcline.h" #include "units.h"
tools/perf/util/auxtrace.c +33 -0
@@ -2196,3 +2196,36 @@ int auxtrace_parse_filters(struct evlist *evlist)return 0 ; } + +int auxtrace__process_event (struct perf_session *session,union perf_event *event, +struct perf_sample *sample,struct perf_tool *tool) +{ +if (!session->auxtrace) +return 0 ; + +return session->auxtrace->process_event (session, event, sample, tool); +} + +int auxtrace__flush_events (struct perf_session *session,struct perf_tool *tool) +{ +if (!session->auxtrace) +return 0 ; + +return session->auxtrace->flush_events (session, tool); +} + +void auxtrace__free_events (struct perf_session *session) +{ +if (!session->auxtrace) +return ; + +return session->auxtrace->free_events (session); +} + +void auxtrace__free (struct perf_session *session) +{ +if (!session->auxtrace) +return ; + +return session->auxtrace->free (session); +}
tools/perf/util/auxtrace.h +7 -36
61 lines not on this page · raw message
tools/perf/util/bpf-loader.c +1 -0
@@ -14,6 +14,7 @@#include <linux/string.h> #include <linux/zalloc.h> #include <errno.h> +#include <stdlib.h> #include "debug.h" #include "evlist.h" #include "bpf-loader.h"
tools/perf/util/cgroup.c +2 -0
@@ -8,6 +8,8 @@#include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> +#include <stdlib.h> +#include <string.h> int nr_cgroups;
tools/perf/util/config.c +1 -0
@@ -23,6 +23,7 @@#include "debug.h" #include <sys/types.h> #include <sys/stat.h> +#include <stdlib.h> #include <unistd.h> #include <linux/string.h> #include <linux/zalloc.h>
tools/perf/util/cs-etm.c +1 -0
@@ -27,6 +27,7 @@#include "machine.h" #include "map.h" #include "perf.h" +#include "session.h" #include "symbol.h" #include "tool.h" #include "thread.h"
tools/perf/util/cs-etm.h +2 -1
@@ -8,9 +8,10 @@#define INCLUDE__UTIL_PERF_CS_ETM_H__ #include "util/event.h" -#include "util/session.h" #include <linux/bits.h> +struct perf_session ; +/* Versionning header in case things need tro change in the future. That way * decoding of old snapshot is still possible. */
tools/perf/util/dso.c +2 -0
@@ -10,9 +10,11 @@#include <unistd.h> #include <errno.h> #include <fcntl.h> +#include <stdlib.h> #include <bpf/libbpf.h> #include "bpf-event.h" #include "compress.h" +#include "env.h" #include "namespaces.h" #include "path.h" #include "map.h"
tools/perf/util/evlist.c +1 -0
@@ -23,6 +23,7 @@#include <signal.h> #include <unistd.h> #include <sched.h> +#include <stdlib.h> #include "parse-events.h" #include <subcmd/parse-options.h>
tools/perf/util/evsel.c +1 -0
@@ -22,6 +22,7 @@#include <sys/resource.h> #include <sys/types.h> #include <dirent.h> +#include <stdlib.h> #include <perf/evsel.h> #include "asm/bug.h" #include "callchain.h"
tools/perf/util/machine.c +2 -0
@@ -3,9 +3,11 @@#include <errno.h> #include <inttypes.h> #include <regex.h> +#include <stdlib.h> #include "callchain.h" #include "debug.h" #include "dso.h" +#include "env.h" #include "event.h" #include "evsel.h" #include "hist.h"
tools/perf/util/mmap.c +3 -0
@@ -10,9 +10,12 @@#include <inttypes.h> #include <asm/bug.h> #include <linux/zalloc.h> +#include <stdlib.h> +#include <string.h> #ifdef HAVE_LIBNUMA_SUPPORT #include <numaif.h> #endif +#include "cpumap.h" #include "debug.h" #include "event.h" #include "mmap.h"
tools/perf/util/mmap.h +1 -0
@@ -6,6 +6,7 @@#include <linux/types.h> #include <linux/ring_buffer.h> #include <stdbool.h> +#include <pthread.h> // for cpu_set_t #ifdef HAVE_AIO_SUPPORT #include <aio.h> #endif
tools/perf/util/python.c +2 -0
@@ -5,6 +5,7 @@#include <poll.h> #include <linux/err.h> #include <perf/cpumap.h> +#include <traceevent/event-parse.h> #include "debug.h" #include "evlist.h" #include "callchain.h"
@@ -13,6 +14,7 @@#include "cpumap.h" #include "print_binary.h" #include "thread_map.h" +#include "trace-event.h" #include "mmap.h" #include "util.h" #include "../perf-sys.h"
tools/perf/util/record.c +2 -0
@@ -5,6 +5,8 @@#include "cpumap.h" #include "parse-events.h" #include <errno.h> +#include <limits.h> +#include <stdlib.h> #include <api/fs/fs.h> #include <subcmd/parse-options.h> #include <perf/cpumap.h>
tools/perf/util/s390-sample-raw.c +0 -1
@@ -23,7 +23,6 @@#include "debug.h" #include "util.h" -#include "auxtrace.h" #include "session.h" #include "evlist.h" #include "config.h"
tools/perf/util/sort.c +1 -0
@@ -2,6 +2,7 @@#include <errno.h> #include <inttypes.h> #include <regex.h> +#include <stdlib.h> #include <linux/mman.h> #include <linux/time64.h> #include "debug.h"
tools/perf/util/stat-display.c +1 -0
@@ -1,3 +1,4 @@ +#include <stdlib.h> #include <stdio.h> #include <inttypes.h> #include <linux/string.h>
tools/perf/util/stat.c +3 -0
@@ -2,9 +2,12 @@#include <errno.h> #include <inttypes.h> #include <math.h> +#include <string.h> #include "counts.h" #include "debug.h" +#include "header.h" #include "stat.h" +#include "session.h" #include "target.h" #include "evlist.h" #include "evsel.h"
tools/perf/util/top.h +1 -0
@@ -5,6 +5,7 @@#include "tool.h" #include "evswitch.h" #include "annotate.h" +#include "ordered-events.h" #include "record.h" #include <linux/types.h> #include <stddef.h>