openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf annotate: Add inc_samples method to addr_map_symbol 

Since there are three calls that could receive just the struct
addr_map_symbol pointer and call the symbol method.

Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-d728gz1orgkaknac9ppnzd9e@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2013-12-18 16:48:29 -03:00
parent 00e5521864
commit 0f4e7a24d0
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/perf/builtin-report.c
View File

@ -127,8 +127,7 @@ static int perf_report__add_mem_hist_entry(struct perf_tool *tool,
goto out;
mx = he->mem_info;
err = symbol__inc_addr_samples(mx->daddr.sym, mx->daddr.map,
evsel->idx, mx->daddr.al_addr);
err = addr_map_symbol__inc_samples(&mx->daddr, evsel->idx);
if (err)
goto out;
@ -190,15 +189,11 @@ static int perf_report__add_branch_hist_entry(struct perf_tool *tool,
1, 1, 0);
if (he) {
bx = he->branch_info;
err = symbol__inc_addr_samples(bx->from.sym,
bx->from.map, evsel->idx,
bx->from.al_addr);
err = addr_map_symbol__inc_samples(&bx->from, evsel->idx);
if (err)
goto out;
err = symbol__inc_addr_samples(bx->to.sym,
bx->to.map, evsel->idx,
bx->to.al_addr);
err = addr_map_symbol__inc_samples(&bx->to, evsel->idx);
if (err)
goto out;

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

@ -503,6 +503,11 @@ int symbol__inc_addr_samples(struct symbol *sym, struct map *map,
return __symbol__inc_addr_samples(sym, map, notes, evidx, addr);
}
int addr_map_symbol__inc_samples(struct addr_map_symbol *ams, int evidx)
{
return symbol__inc_addr_samples(ams->sym, ams->map, evidx, ams->al_addr);
}
static void disasm_line__init_ins(struct disasm_line *dl)
{
dl->ins = ins__find(dl->name);

3
tools/perf/util/annotate.h
View File

@ -134,6 +134,9 @@ static inline struct annotation *symbol__annotation(struct symbol *sym)
int symbol__inc_addr_samples(struct symbol *sym, struct map *map,
int evidx, u64 addr);
int addr_map_symbol__inc_samples(struct addr_map_symbol *ams, int evidx);
int symbol__alloc_hist(struct symbol *sym);
void symbol__annotate_zero_histograms(struct symbol *sym);