From: Riccardo Mancini <rickyman7@gmail.com>
To: Ian Rogers <irogers@google.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Martin Liska <mliska@suse.cz>,
Jason Yan <yanaijie@huawei.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] perf annotate: allow 's' on source code lines
Date: Tue, 22 Jun 2021 09:58:47 +0200 [thread overview]
Message-ID: <6b07d15b7bd02a63eef8282b1844be57ba9cb044.camel@gmail.com> (raw)
In-Reply-To: <CAP-5=fVNCcLyAZx2nqOn2t=BTW1FB9sU=-gmSNWukKcTb8HE+Q@mail.gmail.com>
Hi,
thank you for your comment.
On Mon, 2021-06-21 at 22:07 -0700, Ian Rogers wrote:
> 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?
Agreed.
I believe this should never happen, but in case it happens it will cause
problems.
I'll change it to return NULL and handle it in the caller.
Thanks,
Riccardo
>
> 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
> >
prev parent reply other threads:[~2021-06-22 7:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 23:00 [PATCH] perf annotate: allow 's' on source code lines Riccardo Mancini
2021-06-22 5:07 ` Ian Rogers
2021-06-22 7:58 ` Riccardo Mancini [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6b07d15b7bd02a63eef8282b1844be57ba9cb044.camel@gmail.com \
--to=rickyman7@gmail.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=irogers@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=mliska@suse.cz \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=yanaijie@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).