perf symbols: Move mem_info and branch_info out of symbol.h
The following commit has been merged into the perf/core branch of tip:
Commit-ID: d3300a3c4e76ccecf4daa889327e340a870c550b Gitweb: https://git.kernel.org/tip/d3300a3c4e76ccecf4daa889327e340a870c550b Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Fri, 30 Aug 2019 15:09:54 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Sat, 31 Aug 2019 22:27:48 -03:00
perf symbols: Move mem_info and branch_info out of symbol.h
The mem_info struct goes to mem-events.h and branch_info goes to branch.h, where they belong, this way we can remove several headers from symbols.h and trim the include dependency tree more.
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/powerpc/util/mem-events.c | 1 + tools/perf/builtin-annotate.c | 2 ++ tools/perf/builtin-c2c.c | 1 + tools/perf/builtin-mem.c | 1 + tools/perf/builtin-report.c | 3 +++ tools/perf/builtin-version.c | 2 +- tools/perf/tests/mem.c | 1 + tools/perf/tests/sample-parsing.c | 1 + tools/perf/ui/browsers/hists.c | 2 ++ tools/perf/util/branch.c | 1 + tools/perf/util/branch.h | 8 ++++++++ tools/perf/util/cs-etm.c | 2 ++ tools/perf/util/hist.c | 3 +++ tools/perf/util/machine.c | 3 +++ tools/perf/util/map.c | 1 + tools/perf/util/mem-events.c | 1 + tools/perf/util/mem-events.h | 9 +++++++++ tools/perf/util/s390-sample-raw.c | 1 - tools/perf/util/session.c | 2 ++ tools/perf/util/sort.c | 2 ++ tools/perf/util/symbol.c | 2 ++ tools/perf/util/symbol.h | 17 ----------------- 22 files changed, 47 insertions(+), 19 deletions(-)
tools/perf/arch/powerpc/util/mem-events.c +1 -0
@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0 +#include "map_symbol.h" #include "mem-events.h" /* PowerPC does not support 'ldlat' parameter. */
tools/perf/builtin-annotate.c +2 -0
@@ -33,6 +33,8 @@#include "util/data.h" #include "arch/common.h" #include "util/block-range.h" +#include "util/map_symbol.h" +#include "util/branch.h" #include <dlfcn.h> #include <errno.h>
tools/perf/builtin-c2c.c +1 -0
@@ -22,6 +22,7 @@#include "builtin.h" #include <subcmd/pager.h> #include <subcmd/parse-options.h> +#include "map_symbol.h" #include "mem-events.h" #include "session.h" #include "hist.h"
tools/perf/builtin-mem.c +1 -0
@@ -11,6 +11,7 @@#include "util/tool.h" #include "util/session.h" #include "util/data.h" +#include "util/map_symbol.h" #include "util/mem-events.h" #include "util/debug.h" #include "util/dso.h"
tools/perf/builtin-report.c +3 -0
@@ -19,6 +19,9 @@#include <linux/zalloc.h> #include "util/map.h" #include "util/symbol.h" +#include "util/map_symbol.h" +#include "util/mem-events.h" +#include "util/branch.h" #include "util/callchain.h" #include "util/values.h"
tools/perf/builtin-version.c +1 -1
@@ -2,8 +2,8 @@#include "builtin.h" #include "perf.h" #include "color.h" -#include <linux/compiler.h> #include <tools/config.h> +#include <stdbool.h> #include <stdio.h> #include <string.h> #include <subcmd/parse-options.h>
tools/perf/tests/mem.c +1 -0
@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0 +#include "util/map_symbol.h" #include "util/mem-events.h" #include "util/symbol.h" #include "linux/perf_event.h"
tools/perf/tests/sample-parsing.c +1 -0
@@ -7,6 +7,7 @@#include <linux/kernel.h> #include <linux/types.h> +#include "map_symbol.h" #include "branch.h" #include "util.h" #include "event.h"
tools/perf/ui/browsers/hists.c +2 -0
@@ -20,6 +20,8 @@#include "../../util/hist.h" #include "../../util/map.h" #include "../../util/symbol.h" +#include "../../util/map_symbol.h" +#include "../../util/branch.h" #include "../../util/pstack.h" #include "../../util/sort.h" #include "../../util/top.h"
tools/perf/util/branch.c +1 -0
@@ -1,5 +1,6 @@#include "util/util.h" #include "util/debug.h" +#include "util/map_symbol.h" #include "util/branch.h" #include <linux/kernel.h>
tools/perf/util/branch.h +8 -0
@@ -16,6 +16,14 @@ struct branch_flags { u64 reserved:40; }; +struct branch_info { +struct addr_map_symbol from; +struct addr_map_symbol to; +struct branch_flags flags; +char *srcline_from; +char *srcline_to; +}; +struct branch_entry {u64 from;u64 to;
tools/perf/util/cs-etm.c +2 -0
@@ -28,6 +28,8 @@#include "map.h" #include "perf.h" #include "session.h" +#include "map_symbol.h" +#include "branch.h" #include "symbol.h" #include "tool.h" #include "thread.h"
tools/perf/util/hist.c +3 -0
@@ -5,6 +5,9 @@#include "build-id.h" #include "hist.h" #include "map.h" +#include "map_symbol.h" +#include "branch.h" +#include "mem-events.h" #include "session.h" #include "namespaces.h" #include "sort.h"
tools/perf/util/machine.c +3 -0
@@ -13,6 +13,9 @@#include "hist.h" #include "machine.h" #include "map.h" +#include "map_symbol.h" +#include "branch.h" +#include "mem-events.h" #include "srcline.h" #include "symbol.h" #include "sort.h"
tools/perf/util/map.c +1 -0
@@ -10,6 +10,7 @@#include <uapi/linux/mman.h> /* To get things like MAP_HUGETLB even on older libc headers */ #include "dso.h" #include "map.h" +#include "map_symbol.h" #include "thread.h" #include "vdso.h" #include "build-id.h"
tools/perf/util/mem-events.c +1 -0
@@ -8,6 +8,7 @@#include <unistd.h> #include <api/fs/fs.h> #include <linux/kernel.h> +#include "map_symbol.h" #include "mem-events.h" #include "debug.h" #include "symbol.h"
tools/perf/util/mem-events.h +9 -0
@@ -6,6 +6,8 @@#include <stdint.h> #include <stdio.h> #include <linux/types.h> +#include <linux/refcount.h> +#include <linux/perf_event.h> #include "stat.h" struct perf_mem_event {
@@ -16,6 +18,13 @@ struct perf_mem_event {const char *sysfs_name; }; +struct mem_info { +struct addr_map_symbol iaddr; +struct addr_map_symbol daddr; +union perf_mem_data_src data_src; +refcount_t refcnt; +}; +enum {PERF_MEM_EVENTS__LOAD ,PERF_MEM_EVENTS__STORE ,
tools/perf/util/s390-sample-raw.c +0 -1
@@ -25,7 +25,6 @@#include "util.h" #include "session.h" #include "evlist.h" -#include "config.h" #include "color.h" #include "sample-raw.h" #include "s390-cpumcf-kernel.h"
tools/perf/util/session.c +2 -0
@@ -12,6 +12,8 @@#include <sys/mman.h> #include <perf/cpumap.h> +#include "map_symbol.h" +#include "branch.h" #include "debug.h" #include "evlist.h" #include "evsel.h"
tools/perf/util/sort.c +2 -0
@@ -13,6 +13,8 @@#include "comm.h" #include "map.h" #include "symbol.h" +#include "map_symbol.h" +#include "branch.h" #include "thread.h" #include "evsel.h" #include "evlist.h"
tools/perf/util/symbol.c +2 -0
@@ -25,6 +25,8 @@#include "machine.h" #include "map.h" #include "symbol.h" +#include "map_symbol.h" +#include "mem-events.h" #include "symsrc.h" #include "strlist.h" #include "intlist.h"
tools/perf/util/symbol.h +0 -17
@@ -9,8 +9,6 @@#include <linux/list.h> #include <linux/rbtree.h> #include <stdio.h> -#include "map_symbol.h" -#include "branch.h" #include "path.h" #include "symbol_conf.h"
@@ -107,21 +105,6 @@ struct ref_reloc_sym {u64 unrelocated_addr; }; -struct branch_info { -struct addr_map_symbol from; -struct addr_map_symbol to; -struct branch_flags flags; -char *srcline_from; -char *srcline_to; -}; - -struct mem_info { -struct addr_map_symbol iaddr; -struct addr_map_symbol daddr; -union perf_mem_data_src data_src; -refcount_t refcnt; -}; -struct block_info {struct symbol *sym;u64 start;