Commit-ID: 0f4e7a24d0303eaf12847b4fdf4f2d31553fdc61 Gitweb: http://git.kernel.org/tip/0f4e7a24d0303eaf12847b4fdf4f2d31553fdc61 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 18 Dec 2013 16:48:29 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 19 Dec 2013 11:34:19 -0300
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 <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> --- tools/perf/builtin-report.c | 11 +++-------- tools/perf/util/annotate.c | 5 +++++ tools/perf/util/annotate.h | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 0615a63..9a20c9e 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -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; diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 93614cd..2812e7b 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -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); diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index 834b7b5..8de10b1 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
