Hi Ingo,
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core
Regards,
- Arnaldo
Arnaldo Carvalho de Melo (4):
perf ui: Make SPACE work as PGDN in all browsers
perf annotate: Cycle thru sorted lines with samples
perf ui browser: Add ui_browser__show counterpart: __hide
perf ui hist browser: Fixup key bindings
tools/perf/util/ui/browser.c | 19 ++++++-
tools/perf/util/ui/browser.h | 4 +-
tools/perf/util/ui/browsers/annotate.c | 101 +++++++++++++++++++++++--------
tools/perf/util/ui/browsers/hists.c | 20 ++++---
tools/perf/util/ui/browsers/map.c | 10 +--
tools/perf/util/ui/helpline.c | 2 +-
tools/perf/util/ui/helpline.h | 1 +
7 files changed, 113 insertions(+), 44 deletions(-)
From: Arnaldo Carvalho de Melo <[email protected]>
So that the common tasks of providing a helpline at __run entry and
destroying the window and releasing resourses at exit can be abstracted
away, reducing a bit more the coupling with libnewt.
Cc: Frederic Weisbecker <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/ui/browser.c | 18 +++++++++++++++++-
tools/perf/util/ui/browser.h | 4 +++-
tools/perf/util/ui/browsers/annotate.c | 8 +++-----
tools/perf/util/ui/browsers/hists.c | 5 ++++-
tools/perf/util/ui/browsers/map.c | 10 ++++------
tools/perf/util/ui/helpline.c | 2 +-
tools/perf/util/ui/helpline.h | 1 +
7 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/tools/perf/util/ui/browser.c b/tools/perf/util/ui/browser.c
index 83d5748..66f2d58 100644
--- a/tools/perf/util/ui/browser.c
+++ b/tools/perf/util/ui/browser.c
@@ -16,6 +16,7 @@
#include <stdlib.h>
#include <sys/ttydefaults.h>
#include "browser.h"
+#include "helpline.h"
#include "../color.h"
#include "../util.h"
@@ -145,8 +146,11 @@ void ui_browser__reset_index(struct ui_browser *self)
self->seek(self, 0, SEEK_SET);
}
-int ui_browser__show(struct ui_browser *self, const char *title)
+int ui_browser__show(struct ui_browser *self, const char *title,
+ const char *helpline, ...)
{
+ va_list ap;
+
if (self->form != NULL) {
newtFormDestroy(self->form);
newtPopWindow();
@@ -171,9 +175,21 @@ int ui_browser__show(struct ui_browser *self, const char *title)
newtFormAddHotKey(self->form, NEWT_KEY_END);
newtFormAddHotKey(self->form, ' ');
newtFormAddComponent(self->form, self->sb);
+
+ va_start(ap, helpline);
+ ui_helpline__vpush(helpline, ap);
+ va_end(ap);
return 0;
}
+void ui_browser__hide(struct ui_browser *self)
+{
+ newtFormDestroy(self->form);
+ newtPopWindow();
+ self->form = NULL;
+ ui_helpline__pop();
+}
+
int ui_browser__refresh(struct ui_browser *self)
{
int row;
diff --git a/tools/perf/util/ui/browser.h b/tools/perf/util/ui/browser.h
index 856e343..0b9f829 100644
--- a/tools/perf/util/ui/browser.h
+++ b/tools/perf/util/ui/browser.h
@@ -30,7 +30,9 @@ bool ui_browser__is_current_entry(struct ui_browser *self, unsigned row);
void ui_browser__refresh_dimensions(struct ui_browser *self);
void ui_browser__reset_index(struct ui_browser *self);
-int ui_browser__show(struct ui_browser *self, const char *title);
+int ui_browser__show(struct ui_browser *self, const char *title,
+ const char *helpline, ...);
+void ui_browser__hide(struct ui_browser *self);
int ui_browser__refresh(struct ui_browser *self);
int ui_browser__run(struct ui_browser *self, struct newtExitStruct *es);
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index 73e78ef..55ff792 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -141,10 +141,10 @@ static int annotate_browser__run(struct annotate_browser *self,
struct rb_node *nd;
struct hist_entry *he = self->b.priv;
- if (ui_browser__show(&self->b, he->ms.sym->name) < 0)
+ if (ui_browser__show(&self->b, he->ms.sym->name,
+ "<- or ESC: exit, TAB/shift+TAB: cycle thru samples") < 0)
return -1;
- ui_helpline__fpush("<- or ESC: exit, TAB/shift+TAB: cycle thru samples");
newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT);
nd = self->curr_hot;
@@ -177,9 +177,7 @@ static int annotate_browser__run(struct annotate_browser *self,
}
}
out:
- newtFormDestroy(self->b.form);
- newtPopWindow();
- ui_helpline__pop();
+ ui_browser__hide(&self->b);
return 0;
}
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index cee7998..dd512b7 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -211,7 +211,8 @@ static int hist_browser__run(struct hist_browser *self, const char *title,
nr_events, unit);
newtDrawRootText(0, 0, str);
- if (ui_browser__show(&self->b, title) < 0)
+ if (ui_browser__show(&self->b, title,
+ "Press '?' for help on key bindings") < 0)
return -1;
newtFormAddHotKey(self->b.form, 'A');
@@ -253,6 +254,8 @@ static int hist_browser__run(struct hist_browser *self, const char *title,
return 0;
}
}
+
+ ui_browser__hide(&self->b);
return 0;
}
diff --git a/tools/perf/util/ui/browsers/map.c b/tools/perf/util/ui/browsers/map.c
index b79f0c9..142b825 100644
--- a/tools/perf/util/ui/browsers/map.c
+++ b/tools/perf/util/ui/browsers/map.c
@@ -100,11 +100,11 @@ static int map_browser__search(struct map_browser *self)
static int map_browser__run(struct map_browser *self, struct newtExitStruct *es)
{
- if (ui_browser__show(&self->b, self->map->dso->long_name) < 0)
+ if (ui_browser__show(&self->b, self->map->dso->long_name,
+ "Press <- or ESC to exit, %s / to search",
+ verbose ? "" : "restart with -v to use") < 0)
return -1;
- ui_helpline__fpush("Press <- or ESC to exit, %s / to search",
- verbose ? "" : "restart with -v to use");
newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT);
newtFormAddHotKey(self->b.form, NEWT_KEY_ENTER);
if (verbose)
@@ -121,9 +121,7 @@ static int map_browser__run(struct map_browser *self, struct newtExitStruct *es)
break;
}
- newtFormDestroy(self->b.form);
- newtPopWindow();
- ui_helpline__pop();
+ ui_browser__hide(&self->b);
return 0;
}
diff --git a/tools/perf/util/ui/helpline.c b/tools/perf/util/ui/helpline.c
index ff58460..8d79daa 100644
--- a/tools/perf/util/ui/helpline.c
+++ b/tools/perf/util/ui/helpline.c
@@ -16,7 +16,7 @@ void ui_helpline__push(const char *msg)
newtPushHelpLine(msg);
}
-static void ui_helpline__vpush(const char *fmt, va_list ap)
+void ui_helpline__vpush(const char *fmt, va_list ap)
{
char *s;
diff --git a/tools/perf/util/ui/helpline.h b/tools/perf/util/ui/helpline.h
index 5d1e5e7..ab6028d 100644
--- a/tools/perf/util/ui/helpline.h
+++ b/tools/perf/util/ui/helpline.h
@@ -4,6 +4,7 @@
void ui_helpline__init(void);
void ui_helpline__pop(void);
void ui_helpline__push(const char *msg);
+void ui_helpline__vpush(const char *fmt, va_list ap);
void ui_helpline__fpush(const char *fmt, ...);
void ui_helpline__puts(const char *msg);
--
1.6.2.5
From: Arnaldo Carvalho de Melo <[email protected]>
The annotate TUI now starts centered on the line with most samples, i.e.
the hottest line in the annotated function. Pressing TAB will center on
the second hottest function and so on. Shift+TAB goes in the other
direction.
This way one can more easily sift thru the function hotspots.
Cc: Frederic Weisbecker <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/ui/browsers/annotate.c | 102 ++++++++++++++++++++++++--------
1 files changed, 77 insertions(+), 25 deletions(-)
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index d2156ae..73e78ef 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -17,6 +17,7 @@ static void ui__error_window(const char *fmt, ...)
struct annotate_browser {
struct ui_browser b;
struct rb_root entries;
+ struct rb_node *curr_hot;
};
struct objdump_line_rb_node {
@@ -110,12 +111,83 @@ static void objdump__insert_line(struct rb_root *self,
rb_insert_color(&line->rb_node, self);
}
+static void annotate_browser__set_top(struct annotate_browser *self,
+ struct rb_node *nd)
+{
+ struct objdump_line_rb_node *rbpos;
+ struct objdump_line *pos;
+ unsigned back;
+
+ ui_browser__refresh_dimensions(&self->b);
+ back = self->b.height / 2;
+ rbpos = rb_entry(nd, struct objdump_line_rb_node, rb_node);
+ pos = ((struct objdump_line *)rbpos) - 1;
+ self->b.top_idx = self->b.index = rbpos->idx;
+
+ while (self->b.top_idx != 0 && back != 0) {
+ pos = list_entry(pos->node.prev, struct objdump_line, node);
+
+ --self->b.top_idx;
+ --back;
+ }
+
+ self->b.top = pos;
+ self->curr_hot = nd;
+}
+
+static int annotate_browser__run(struct annotate_browser *self,
+ struct newtExitStruct *es)
+{
+ struct rb_node *nd;
+ struct hist_entry *he = self->b.priv;
+
+ if (ui_browser__show(&self->b, he->ms.sym->name) < 0)
+ return -1;
+
+ ui_helpline__fpush("<- or ESC: exit, TAB/shift+TAB: cycle thru samples");
+ newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT);
+
+ nd = self->curr_hot;
+ if (nd) {
+ newtFormAddHotKey(self->b.form, NEWT_KEY_TAB);
+ newtFormAddHotKey(self->b.form, NEWT_KEY_UNTAB);
+ }
+
+ while (1) {
+ ui_browser__run(&self->b, es);
+
+ if (es->reason != NEWT_EXIT_HOTKEY)
+ break;
+
+ switch (es->u.key) {
+ case NEWT_KEY_TAB:
+ nd = rb_prev(nd);
+ if (nd == NULL)
+ nd = rb_last(&self->entries);
+ annotate_browser__set_top(self, nd);
+ break;
+ case NEWT_KEY_UNTAB:
+ nd = rb_next(nd);
+ if (nd == NULL)
+ nd = rb_first(&self->entries);
+ annotate_browser__set_top(self, nd);
+ break;
+ default:
+ goto out;
+ }
+ }
+out:
+ newtFormDestroy(self->b.form);
+ newtPopWindow();
+ ui_helpline__pop();
+ return 0;
+}
+
int hist_entry__tui_annotate(struct hist_entry *self)
{
struct newtExitStruct es;
struct objdump_line *pos, *n;
struct objdump_line_rb_node *rbpos;
- struct rb_node *nd;
LIST_HEAD(head);
struct annotate_browser browser = {
.b = {
@@ -156,35 +228,15 @@ int hist_entry__tui_annotate(struct hist_entry *self)
/*
* Position the browser at the hottest line.
*/
- nd = rb_last(&browser.entries);
- if (nd != NULL) {
- unsigned back;
-
- ui_browser__refresh_dimensions(&browser.b);
- back = browser.b.height / 2;
- rbpos = rb_entry(nd, struct objdump_line_rb_node, rb_node);
- pos = ((struct objdump_line *)rbpos) - 1;
- browser.b.top_idx = browser.b.index = rbpos->idx;
-
- while (browser.b.top_idx != 0 && back != 0) {
- pos = list_entry(pos->node.prev, struct objdump_line, node);
-
- --browser.b.top_idx;
- --back;
- }
-
- browser.b.top = pos;
- }
+ browser.curr_hot = rb_last(&browser.entries);
+ if (browser.curr_hot)
+ annotate_browser__set_top(&browser, browser.curr_hot);
browser.b.width += 18; /* Percentage */
- ui_browser__show(&browser.b, self->ms.sym->name);
- ret = ui_browser__run(&browser.b, &es);
- newtFormDestroy(browser.b.form);
- newtPopWindow();
+ ret = annotate_browser__run(&browser, &es);
list_for_each_entry_safe(pos, n, &head, node) {
list_del(&pos->node);
objdump_line__free(pos);
}
- ui_helpline__pop();
return ret;
}
--
1.6.2.5
From: Arnaldo Carvalho de Melo <[email protected]>
Not just on the annotate one.
Cc: Frederic Weisbecker <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/ui/browser.c | 1 +
tools/perf/util/ui/browsers/annotate.c | 1 -
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/perf/util/ui/browser.c b/tools/perf/util/ui/browser.c
index edbb7dd..83d5748 100644
--- a/tools/perf/util/ui/browser.c
+++ b/tools/perf/util/ui/browser.c
@@ -169,6 +169,7 @@ int ui_browser__show(struct ui_browser *self, const char *title)
newtFormAddHotKey(self->form, NEWT_KEY_PGDN);
newtFormAddHotKey(self->form, NEWT_KEY_HOME);
newtFormAddHotKey(self->form, NEWT_KEY_END);
+ newtFormAddHotKey(self->form, ' ');
newtFormAddComponent(self->form, self->sb);
return 0;
}
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index 763592b..d2156ae 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -178,7 +178,6 @@ int hist_entry__tui_annotate(struct hist_entry *self)
browser.b.width += 18; /* Percentage */
ui_browser__show(&browser.b, self->ms.sym->name);
- newtFormAddHotKey(browser.b.form, ' ');
ret = ui_browser__run(&browser.b, &es);
newtFormDestroy(browser.b.form);
newtPopWindow();
--
1.6.2.5
From: Arnaldo Carvalho de Melo <[email protected]>
To match what is shown when '?' or 'H' is pressed, i.e. the keybind help
window.
Cc: Frederic Weisbecker <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/ui/browsers/hists.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index dd512b7..dafdf67 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -215,12 +215,12 @@ static int hist_browser__run(struct hist_browser *self, const char *title,
"Press '?' for help on key bindings") < 0)
return -1;
- newtFormAddHotKey(self->b.form, 'A');
newtFormAddHotKey(self->b.form, 'a');
newtFormAddHotKey(self->b.form, '?');
newtFormAddHotKey(self->b.form, 'h');
- newtFormAddHotKey(self->b.form, 'H');
newtFormAddHotKey(self->b.form, 'd');
+ newtFormAddHotKey(self->b.form, 'D');
+ newtFormAddHotKey(self->b.form, 't');
newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT);
newtFormAddHotKey(self->b.form, NEWT_KEY_RIGHT);
@@ -232,7 +232,7 @@ static int hist_browser__run(struct hist_browser *self, const char *title,
if (es->reason != NEWT_EXIT_HOTKEY)
break;
switch (es->u.key) {
- case 'd': { /* Debug */
+ case 'D': { /* Debug */
static int seq;
struct hist_entry *h = rb_entry(self->b.top,
struct hist_entry, rb_node);
@@ -771,18 +771,17 @@ int hists__browse(struct hists *self, const char *helpline, const char *ev_name)
default:;
}
- key = toupper(key);
switch (key) {
- case 'A':
+ case 'a':
if (browser->selection->map == NULL &&
browser->selection->map->dso->annotate_warned)
continue;
goto do_annotate;
- case 'D':
+ case 'd':
goto zoom_dso;
- case 'T':
+ case 't':
goto zoom_thread;
- case 'H':
+ case 'h':
case '?':
do_help:
ui__help_window("-> Zoom into DSO/Threads & Annotate current symbol\n"
--
1.6.2.5
* Arnaldo Carvalho de Melo <[email protected]> wrote:
> Hi Ingo,
>
> Please pull from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core
>
> Regards,
>
> - Arnaldo
>
> Arnaldo Carvalho de Melo (4):
> perf ui: Make SPACE work as PGDN in all browsers
> perf annotate: Cycle thru sorted lines with samples
> perf ui browser: Add ui_browser__show counterpart: __hide
> perf ui hist browser: Fixup key bindings
>
> tools/perf/util/ui/browser.c | 19 ++++++-
> tools/perf/util/ui/browser.h | 4 +-
> tools/perf/util/ui/browsers/annotate.c | 101 +++++++++++++++++++++++--------
> tools/perf/util/ui/browsers/hists.c | 20 ++++---
> tools/perf/util/ui/browsers/map.c | 10 +--
> tools/perf/util/ui/helpline.c | 2 +-
> tools/perf/util/ui/helpline.h | 1 +
> 7 files changed, 113 insertions(+), 44 deletions(-)
Pulled, thanks a lot Arnaldo!
Ingo