lkml.org 
[lkml]   [2021]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] perf annotate: allow 's' on source code lines
On Mon, Jun 21, 2021 at 4:02 PM Riccardo Mancini <rickyman7@gmail.com> wrote:
>
> In perf annotate, when 's' is pressed on a line containing
> source code, it shows the message "Only available for assembly
> lines".
> This patch gets rid of the error, moving the cursr to the next
> available asm line (or the closest previous one if no asm line
> is found moving forwards), before hiding source code lines.
>
> Signed-off-by: Riccardo Mancini <rickyman7@gmail.com>
> ---
> tools/perf/ui/browsers/annotate.c | 28 +++++++++++++++++++++++++---
> 1 file changed, 25 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
> index ad0a70f0edaf..eb94d20d0d13 100644
> --- a/tools/perf/ui/browsers/annotate.c
> +++ b/tools/perf/ui/browsers/annotate.c
> @@ -343,6 +343,29 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser,
> browser->curr_hot = rb_last(&browser->entries);
> }
>
> +static struct annotation_line *annotate_browser__find_next_asm_line(
> + struct annotate_browser *browser,
> + struct annotation_line *al)
> +{
> + struct annotation_line *it = al;
> +
> + /* find next asm line */
> + list_for_each_entry_continue(it, browser->b.top, node) {
> + if (it->idx_asm >= 0)
> + return it;
> + }
> +
> + /* no asm line found forwards, try backwards */
> + it = al;
> + list_for_each_entry_continue_reverse(it, browser->b.top, node) {
> + if (it->idx_asm >= 0)
> + return it;
> + }
> +
> + /* There are no asm lines */
> + return al;

Does this error case need handling in the caller?

Thanks,
Ian

> +}
> +
> static bool annotate_browser__toggle_source(struct annotate_browser *browser)
> {
> struct annotation *notes = browser__annotation(&browser->b);
> @@ -363,9 +386,8 @@ static bool annotate_browser__toggle_source(struct annotate_browser *browser)
> browser->b.index = al->idx;
> } else {
> if (al->idx_asm < 0) {
> - ui_helpline__puts("Only available for assembly lines.");
> - browser->b.seek(&browser->b, -offset, SEEK_CUR);
> - return false;
> + /* move cursor to next asm line */
> + al = annotate_browser__find_next_asm_line(browser, al);
> }
>
> if (al->idx_asm < offset)
> --
> 2.31.1
>

\
 
 \ /
  Last update: 2021-06-22 07:09    [W:0.040 / U:0.516 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site