2010-08-16 17:10:40

by Arnaldo Carvalho de Melo

Subject: [GIT PULL 0/1] perf/urgent TUI annotate fix

From: Arnaldo Carvalho de Melo <infradead.org>

Hi Ingo,

I extracted a fix from the three patch perf/core series I sent,
will rework the other, non critical patches on a new perf/core branch.

Please pull from:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent

Regards,

- Arnaldo

Arnaldo Carvalho de Melo (1):
perf annotate tui: Fix exit and RIGHT keys handling

tools/perf/util/ui/browsers/annotate.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

2010-08-16 17:10:39

by Arnaldo Carvalho de Melo

Subject: [PATCH 1/1] perf annotate tui: Fix exit and RIGHT keys handling

From: Arnaldo Carvalho de Melo <[email protected]>

As part of ongoing effort to reduce the coupling with libnewt, browsers
are being changed to return the exit key.

The annotate browser is not returning it as expected by builtin-annotate
when annotating multiple symbols (when 'perf annotate' is called without
specifying a symbol name).

Fix it by returning the exit key and also adding the RIGHT key as a exit
key so that going to the next symbol in the TUI can work again.

Cc: Frederic Weisbecker <[email protected]>
Cc: Peter Zijlstra <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/ui/browsers/annotate.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index 55ff792..a90273e 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -146,6 +146,7 @@ static int annotate_browser__run(struct annotate_browser *self,
return -1;

newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT);
+ newtFormAddHotKey(self->b.form, NEWT_KEY_RIGHT);

nd = self->curr_hot;
if (nd) {
@@ -178,7 +179,7 @@ static int annotate_browser__run(struct annotate_browser *self,
}
out:
ui_browser__hide(&self->b);
- return 0;
+ return es->u.key;
}

int hist_entry__tui_annotate(struct hist_entry *self)
--
1.6.2.5

2010-08-16 17:30:45

by Ingo Molnar

Subject: Re: [GIT PULL 0/1] perf/urgent TUI annotate fix

* Arnaldo Carvalho de Melo <[email protected]> wrote:

> From: Arnaldo Carvalho de Melo <infradead.org>
>
> Hi Ingo,
>
> I extracted a fix from the three patch perf/core series I sent,
> will rework the other, non critical patches on a new perf/core branch.
>
> Please pull from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent
>
> Regards,
>
> - Arnaldo
>
> Arnaldo Carvalho de Melo (1):
> perf annotate tui: Fix exit and RIGHT keys handling
>
> tools/perf/util/ui/browsers/annotate.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)


Pulled, thanks Arnaldo!

Ingo