mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
93fcce96c7
commit
08f6680e62
6 changed files with 12 additions and 0 deletions
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
},
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -578,6 +578,7 @@ static int entry(u64 ip, struct thread *thread,
|
|||
e.ms.sym = thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al);
|
||||
e.ip = ip;
|
||||
e.ms.map = al.map;
|
||||
e.ms.mg = al.mg;
|
||||
|
||||
pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n",
|
||||
al.sym ? al.sym->name : "''",
|
||||
|
|
Loading…
Reference in a new issue