xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2019-11-25 22:15:35 -03:00
parent 694520dfeb
commit f2eaea09d6
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/arch/s390/annotate/instructions.c
View File

@@ -38,7 +38,7 @@ static int s390_call__parse(struct arch *arch, struct ins_operands *ops,
return -1; return -1;
target.addr = map__objdump_2mem(map, ops->target.addr); 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) map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr)
ops->target.sym = target.ms.sym; ops->target.sym = target.ms.sym;

2
tools/perf/ui/browsers/annotate.c
View File

@@ -430,7 +430,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser,
return true; return true;
} }
target_ms.mg = ms->mg; target_ms.maps = ms->maps;
target_ms.map = ms->map; target_ms.map = ms->map;
target_ms.sym = dl->ops.target.sym; target_ms.sym = dl->ops.target.sym;
pthread_mutex_unlock(&notes->lock); pthread_mutex_unlock(&notes->lock);

6
tools/perf/util/annotate.c
View File

@@ -271,7 +271,7 @@ static int call__parse(struct arch *arch, struct ins_operands *ops, struct map_s
find_target: find_target:
target.addr = map__objdump_2mem(map, ops->target.addr); 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) map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr)
ops->target.sym = target.ms.sym; 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 * Actual navigation will come next, with further understanding of how
* the symbol searching and disassembly should be done. * 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) map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr)
ops->target.sym = target.ms.sym; ops->target.sym = target.ms.sym;
@@ -1545,7 +1545,7 @@ static int symbol__parse_objdump_line(struct symbol *sym,
.ms = { .map = map, }, .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) target.ms.sym->start == target.al_addr)
dl->ops.target.sym = target.ms.sym; dl->ops.target.sym = target.ms.sym;
} }

2
tools/perf/util/callchain.c
View File

@@ -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, int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *node,
bool hide_unresolved) bool hide_unresolved)
{ {
al->maps = node->ms.mg; al->maps = node->ms.maps;
al->map = node->ms.map; al->map = node->ms.map;
al->sym = node->ms.sym; al->sym = node->ms.sym;
al->srcline = node->srcline; al->srcline = node->srcline;

8
tools/perf/util/hist.c
View File

@@ -692,7 +692,7 @@ __hists__add_entry(struct hists *hists,
.ino = ns ? ns->link_info[CGROUP_NS_INDEX].ino : 0, .ino = ns ? ns->link_info[CGROUP_NS_INDEX].ino : 0,
}, },
.ms = { .ms = {
.mg = al->maps, .maps = al->maps,
.map = al->map, .map = al->map,
.sym = al->sym, .sym = al->sym,
}, },
@@ -760,7 +760,7 @@ struct hist_entry *hists__add_entry_block(struct hists *hists,
.block_info = block_info, .block_info = block_info,
.hists = hists, .hists = hists,
.ms = { .ms = {
.mg = al->maps, .maps = al->maps,
.map = al->map, .map = al->map,
.sym = al->sym, .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) if (iter->curr >= iter->total)
return 0; return 0;
al->maps = bi[i].to.ms.mg; al->maps = bi[i].to.ms.maps;
al->map = bi[i].to.ms.map; al->map = bi[i].to.ms.map;
al->sym = bi[i].to.ms.sym; al->sym = bi[i].to.ms.sym;
al->addr = bi[i].to.addr; 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), .comm = thread__comm(al->thread),
.ip = al->addr, .ip = al->addr,
.ms = { .ms = {
.mg = al->maps, .maps = al->maps,
.map = al->map, .map = al->map,
.sym = al->sym, .sym = al->sym,
}, },

6
tools/perf/util/machine.c
View File

@@ -1934,7 +1934,7 @@ static void ip__resolve_ams(struct thread *thread,
ams->addr = ip; ams->addr = ip;
ams->al_addr = al.addr; ams->al_addr = al.addr;
ams->ms.mg = al.maps; ams->ms.maps = al.maps;
ams->ms.sym = al.sym; ams->ms.sym = al.sym;
ams->ms.map = al.map; ams->ms.map = al.map;
ams->phys_addr = 0; ams->phys_addr = 0;
@@ -1952,7 +1952,7 @@ static void ip__resolve_data(struct thread *thread,
ams->addr = addr; ams->addr = addr;
ams->al_addr = al.addr; ams->al_addr = al.addr;
ams->ms.mg = al.maps; ams->ms.maps = al.maps;
ams->ms.sym = al.sym; ams->ms.sym = al.sym;
ams->ms.map = al.map; ams->ms.map = al.map;
ams->phys_addr = phys_addr; ams->phys_addr = phys_addr;
@@ -2069,7 +2069,7 @@ static int add_callchain_ip(struct thread *thread,
iter_cycles = iter->cycles; iter_cycles = iter->cycles;
} }
ms.mg = al.maps; ms.maps = al.maps;
ms.map = al.map; ms.map = al.map;
ms.sym = al.sym; ms.sym = al.sym;
srcline = callchain_srcline(&ms, al.addr); srcline = callchain_srcline(&ms, al.addr);

2
tools/perf/util/map_symbol.h
View File

@@ -9,7 +9,7 @@ struct map;
struct symbol; struct symbol;
struct map_symbol { struct map_symbol {
struct maps *mg; struct maps *maps;
struct map *map; struct map *map;
struct symbol *sym; struct symbol *sym;
}; };

2
tools/perf/util/unwind-libdw.c
View File

@@ -81,7 +81,7 @@ static int entry(u64 ip, struct unwind_info *ui)
return -1; return -1;
e->ip = ip; e->ip = ip;
e->ms.mg = al.maps; e->ms.maps = al.maps;
e->ms.map = al.map; e->ms.map = al.map;
e->ms.sym = al.sym; e->ms.sym = al.sym;

2
tools/perf/util/unwind-libunwind-local.c
View File

@@ -578,7 +578,7 @@ static int entry(u64 ip, struct thread *thread,
e.ms.sym = thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al); e.ms.sym = thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al);
e.ip = ip; e.ip = ip;
e.ms.map = al.map; e.ms.map = al.map;
e.ms.mg = al.maps; e.ms.maps = al.maps;
pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n", pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n",
al.sym ? al.sym->name : "''", al.sym ? al.sym->name : "''",