diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-05-24 20:20:18 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-06-04 15:28:51 +0200 |
| commit | f40dd6d1b4b29208a7232693746575f7ae6365a5 (patch) | |
| tree | bb6fe3ede8972be07d55c481aa136f7ffc07deb5 /tools/perf/util/annotate.c | |
| parent | perf annotate: Pass perf_evsel instead of just evsel->idx (diff) | |
| download | linux-f40dd6d1b4b29208a7232693746575f7ae6365a5.tar.xz linux-f40dd6d1b4b29208a7232693746575f7ae6365a5.zip | |
perf annotate: __symbol__acount_cycles doesn't need notes
It only operates on the notes->src->cyc_hist, just pass that to it.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-zd1cu4zwmu21k0cxlr83y6vr@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/annotate.c')
| -rw-r--r-- | tools/perf/util/annotate.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 0f5ed6091e00..a7221f9fa504 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -741,14 +741,11 @@ void symbol__annotate_zero_histograms(struct symbol *sym) pthread_mutex_unlock(¬es->lock); } -static int __symbol__account_cycles(struct annotation *notes, +static int __symbol__account_cycles(struct cyc_hist *ch, u64 start, unsigned offset, unsigned cycles, unsigned have_start) { - struct cyc_hist *ch; - - ch = notes->src->cycles_hist; /* * For now we can only account one basic block per * final jump. But multiple could be overlapping. @@ -870,7 +867,7 @@ static int symbol__account_cycles(u64 addr, u64 start, start = 0; } offset = addr - sym->start; - return __symbol__account_cycles(notes, + return __symbol__account_cycles(notes->src->cycles_hist, start ? start - sym->start : 0, offset, cycles, !!start); |