Re: [PATCH] perf report: Fix a no annotate browser displayed issue

[Jin, Yao]

Hi,

Any comments for this bug fix?

Thanks
Jin Yao

On 12/18/2017 9:26 PM, Jin Yao wrote:
> 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).
>
> Signed-off-by: Jin Yao <yao.jin@xxxxxxxxxxxxxxx>
> ---
>   tools/perf/builtin-report.c | 15 ++++++++++++++-
>   1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
> index eb9ce63..0bd0aef 100644
> --- a/tools/perf/builtin-report.c
> +++ b/tools/perf/builtin-report.c
> @@ -162,12 +162,25 @@ 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;
> +
> +	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,