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

perf map_symbol: Rename ms->mg to ms->maps 

One more step on the merge of 'struct maps' with 'struct map_groups'.

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-61rra2wg392rhvdgw421wzpt@git.kernel.org


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

tools/perf/arch/s390/annotate/instructions.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static int s390_call__parse(struct arch *arch, struct ins_operands *ops, 
		return -1;

	target.addr = map__objdump_2mem(map, ops->target.addr);



	if (maps__find_ams(ms->mg, &target) == 0 &&

	if (maps__find_ams(ms->maps, &target) == 0 &&

	    map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr)

		ops->target.sym = target.ms.sym;

tools/perf/ui/browsers/annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser, 
		return true;

	}



	target_ms.mg  = ms->mg;

	target_ms.maps = ms->maps;

	target_ms.map = ms->map;

	target_ms.sym = dl->ops.target.sym;

	pthread_mutex_unlock(&notes->lock);

tools/perf/util/annotate.c

+3 −3
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static int call__parse(struct arch *arch, struct ins_operands *ops, struct map_s 
find_target:

	target.addr = map__objdump_2mem(map, ops->target.addr);



	if (maps__find_ams(ms->mg, &target) == 0 &&

	if (maps__find_ams(ms->maps, &target) == 0 &&

	    map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr)

		ops->target.sym = target.ms.sym;
@@ -391,7 +391,7 @@ static int jump__parse(struct arch *arch, struct ins_operands *ops, struct map_s 
	 * Actual navigation will come next, with further understanding of how

	 * the symbol searching and disassembly should be done.

	 */

	if (maps__find_ams(ms->mg, &target) == 0 &&

	if (maps__find_ams(ms->maps, &target) == 0 &&

	    map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr)

		ops->target.sym = target.ms.sym;
@@ -1545,7 +1545,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, 
			.ms = { .map = map, },

		};



		if (!maps__find_ams(args->ms.mg, &target) &&

		if (!maps__find_ams(args->ms.maps, &target) &&

		    target.ms.sym->start == target.al_addr)

			dl->ops.target.sym = target.ms.sym;

	}

tools/perf/util/callchain.c

+1 −1
Original line number Diff line number Diff line
@@ -1106,7 +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->maps = node->ms.mg;

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

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

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

	al->srcline = node->srcline;

tools/perf/util/hist.c

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

		},

		.ms = {

			.mg	= al->maps,

			.maps	= al->maps,

			.map	= al->map,

			.sym	= al->sym,

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

		.hists = hists,

		.ms = {

			.mg  = al->maps,

			.maps = al->maps,

			.map = al->map,

			.sym = al->sym,

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

		return 0;



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

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

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

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

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

		.ip = al->addr,

		.ms = {

			.mg  = al->maps,

			.maps = al->maps,

			.map = al->map,

			.sym = al->sym,

		},

CRA Git | Maintained and supported by SUSTech CRA and CCSE