perf report: Fix a no annotate browser displayed issue
PATCH v2 1/1 perf report: Fix a no annotate browser displayed issue
v2:
--
Fix a crash bug when perform 'perf report --stdio'.
The reason is that we init the symbol annotation only in browser mode, it doesn't allocate/init resources for stdio mode.
So now in hist_iter__branch_callback(), it will return directly if it's not in browser mode.
initial post
------------
When enabling '-b' option in perf record, for example,
perf record -b ...
perf report
and then browsing the annotate browser from perf report, it would be failed (annotate browser can't be displayed).
It's because the '.add_entry_cb' op of struct report is overwritten by hist_iter__branch_callback() in builtin-report.c. But this function doesn't do something like mapping symbols and sources. So next, do_annotate() will return directly.
notes = symbol__annotation(act->ms.sym);
if (!notes->src)
return 0;This patch adds the lost code to hist_iter__branch_callback ( refer to hist_iter__report_callback).
--- tools/perf/builtin-report.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
tools/perf/builtin-report.c +17 -1
@@ -162,12 +162,28 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter,struct hist_entry *he = iter->he;struct report *rep = arg;struct branch_info *bi; +struct perf_sample *sample = iter->sample; +struct perf_evsel *evsel = iter->evsel; +int err; + +if (!ui__has_annotation ()) +return 0 ; + +hist__account_cycles (sample->branch_stack, al, sample, + rep->nonany_branch_mode); bi = he->branch_info; + err =addr_map_symbol__inc_samples (&bi->from, sample, evsel->idx); +if (err) + goto out; + + err =addr_map_symbol__inc_samples (&bi->to, sample, evsel->idx); +branch_type_count (&rep->brtype_stat, &bi->flags, bi->from.addr, bi->to.addr); -return 0 ; +out: +return err; } static int process_sample_event(struct perf_tool *tool,
Signature · 1 line
2.7.4
Arnaldo Carvalho de Melo
maintainerEm Tue, Dec 26, 2017 at 06:42:43PM +0800, Jin Yao escreveu:
Quoted 9 lines
v2:
--
Fix a crash bug when perform 'perf report --stdio'.The reason is that we init the symbol annotation only in browser mode, it doesn't allocate/init resources for stdio mode.
So now in
hist_iter__branch_callback(), it will return directly if it's not in browser mode.
Thanks, tested and applied!
- Arnaldo
tip-bot for Jin Yao
merge botperf report: Fix a no annotate browser displayed issue
Commit-ID: 40c39e3046411f84bab82f66783ff3593e2bcd9b Gitweb: https://git.kernel.org/tip/40c39e3046411f84bab82f66783ff3593e2bcd9b Author: Jin Yao <[email protected]> AuthorDate: Tue, 26 Dec 2017 18:42:43 +0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 8 Jan 2018 11:11:57 -0300
perf report: Fix a no annotate browser displayed issue
When enabling '-b' option in perf record, for example,
perf record -b ...
perf report
and then browsing the annotate browser from perf report (press 'A'), it would fail (annotate browser can't be displayed).
It's because the '.add_entry_cb' op of struct report is overwritten by hist_iter__branch_callback() in builtin-report.c. But this function doesn't do something like mapping symbols and sources. So next, do_annotate() will return directly.
notes = symbol__annotation(act->ms.sym);
if (!notes->src)
return 0;This patch adds the lost code to hist_iter__branch_callback (refer to hist_iter__report_callback).
v2:
Fix a crash bug when perform 'perf report --stdio'.
The reason is that we init the symbol annotation only in browser mode, it doesn't allocate/init resources for stdio mode.
So now in hist_iter__branch_callback(), it will return directly if it's not in browser mode.
--- tools/perf/builtin-report.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
tools/perf/builtin-report.c +17 -1
@@ -162,12 +162,28 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter,struct hist_entry *he = iter->he;struct report *rep = arg;struct branch_info *bi; +struct perf_sample *sample = iter->sample; +struct perf_evsel *evsel = iter->evsel; +int err; + +if (!ui__has_annotation ()) +return 0 ; + +hist__account_cycles (sample->branch_stack, al, sample, + rep->nonany_branch_mode); bi = he->branch_info; + err =addr_map_symbol__inc_samples (&bi->from, sample, evsel->idx); +if (err) + goto out; + + err =addr_map_symbol__inc_samples (&bi->to, sample, evsel->idx); +branch_type_count (&rep->brtype_stat, &bi->flags, bi->from.addr, bi->to.addr); -return 0 ; +out: +return err; } static int process_sample_event(struct perf_tool *tool,