Commit 08f6680e authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Add a 'struct map_groups' pointer to 'struct map_symbol' 

And fill it whenever we setup a a 'struct map_symbol', now we need to
use it, next cset.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-fzwfcnddenz1o7uj1fzw3g46@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 93fcce96

tools/perf/util/callchain.c

+1 −0
Original line number Diff line number Diff line
@@ -1106,6 +1106,7 @@ int hist_entry__append_callchain(struct hist_entry *he, struct perf_sample *samp 
int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *node,

			bool hide_unresolved)

{

	al->mg	= node->ms.mg;

	al->map = node->ms.map;

	al->sym = node->ms.sym;

	al->srcline = node->srcline;

tools/perf/util/hist.c

+4 −0
Original line number Diff line number Diff line
@@ -692,6 +692,7 @@ __hists__add_entry(struct hists *hists, 
			.ino = ns ? ns->link_info[CGROUP_NS_INDEX].ino : 0,

		},

		.ms = {

			.mg	= al->mg,

			.map	= al->map,

			.sym	= al->sym,

		},
@@ -759,6 +760,7 @@ struct hist_entry *hists__add_entry_block(struct hists *hists, 
		.block_info = block_info,

		.hists = hists,

		.ms = {

			.mg  = al->mg,

			.map = al->map,

			.sym = al->sym,

		},
@@ -893,6 +895,7 @@ iter_next_branch_entry(struct hist_entry_iter *iter, struct addr_location *al) 
	if (iter->curr >= iter->total)

		return 0;



	al->mg  = bi[i].to.ms.mg;

	al->map = bi[i].to.ms.map;

	al->sym = bi[i].to.ms.sym;

	al->addr = bi[i].to.addr;
@@ -1069,6 +1072,7 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter, 
		.comm = thread__comm(al->thread),

		.ip = al->addr,

		.ms = {

			.mg  = al->mg,

			.map = al->map,

			.sym = al->sym,

		},

tools/perf/util/machine.c

+3 −0
Original line number Diff line number Diff line
@@ -1968,6 +1968,7 @@ static void ip__resolve_ams(struct thread *thread, 


	ams->addr = ip;

	ams->al_addr = al.addr;

	ams->ms.mg  = al.mg;

	ams->ms.sym = al.sym;

	ams->ms.map = al.map;

	ams->phys_addr = 0;
@@ -1985,6 +1986,7 @@ static void ip__resolve_data(struct thread *thread, 


	ams->addr = addr;

	ams->al_addr = al.addr;

	ams->ms.mg  = al.mg;

	ams->ms.sym = al.sym;

	ams->ms.map = al.map;

	ams->phys_addr = phys_addr;
@@ -2101,6 +2103,7 @@ static int add_callchain_ip(struct thread *thread, 
		iter_cycles = iter->cycles;

	}



	ms.mg  = al.mg;

	ms.map = al.map;

	ms.sym = al.sym;

	srcline = callchain_srcline(&ms, al.addr);

tools/perf/util/map_symbol.h

+2 −0
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ 


#include <linux/types.h>



struct map_groups;

struct map;

struct symbol;



struct map_symbol {

	struct map_groups *mg;

	struct map    *map;

	struct symbol *sym;

};

tools/perf/util/unwind-libdw.c

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ static int entry(u64 ip, struct unwind_info *ui) 
		return -1;



	e->ip	  = ip;

	e->ms.mg  = al.mg;

	e->ms.map = al.map;

	e->ms.sym = al.sym;

CRA Git | Maintained and supported by SUSTech CRA and CCSE