Skip to content

Commit

Permalink
perf ui browser: Return the exit key in all browsers
Browse files Browse the repository at this point in the history 
Make all browsers return the exit key uniformly and remove the
newtExitStruct parameter, removing one more newt specific thing from the
ui API.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Aug 19, 2010
1 parent 8f9bbc4 commit b50e003
Show file tree
Hide file tree
Showing 7 changed files with 93 additions and 125 deletions.
17 changes: 8 additions & 9 deletions tools/perf/builtin-annotate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ static int hist_entry__tty_annotate(struct hist_entry *he)

static void hists__find_annotations(struct hists *self)
{
struct rb_node *first = rb_first(&self->entries), *nd = first;
struct rb_node *nd = rb_first(&self->entries), *next;
int key = KEY_RIGHT;

while (nd) {
Expand All @@ -343,20 +343,19 @@ static void hists__find_annotations(struct hists *self)

if (use_browser > 0) {
key = hist_entry__tui_annotate(he);
if (is_exit_key(key))
break;
switch (key) {
case KEY_RIGHT:
case '\t':
nd = rb_next(nd);
next = rb_next(nd);
break;
case KEY_LEFT:
if (nd == first)
continue;
nd = rb_prev(nd);
default:
next = rb_prev(nd);
break;
default:
return;
}

if (next != NULL)
nd = next;
} else {
hist_entry__tty_annotate(he);
nd = rb_next(nd);
Expand Down
16 changes: 8 additions & 8 deletions tools/perf/util/ui/browser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,21 +204,21 @@ int ui_browser__refresh(struct ui_browser *self)
return 0;
}

int ui_browser__run(struct ui_browser *self, struct newtExitStruct *es)
int ui_browser__run(struct ui_browser *self)
{
struct newtExitStruct es;

if (ui_browser__refresh(self) < 0)
return -1;

while (1) {
off_t offset;

newtFormRun(self->form, es);
newtFormRun(self->form, &es);

if (es->reason != NEWT_EXIT_HOTKEY)
if (es.reason != NEWT_EXIT_HOTKEY)
break;
if (is_exit_key(es->u.key))
return es->u.key;
switch (es->u.key) {
switch (es.u.key) {
case NEWT_KEY_DOWN:
if (self->index == self->nr_entries - 1)
break;
Expand Down Expand Up @@ -275,12 +275,12 @@ int ui_browser__run(struct ui_browser *self, struct newtExitStruct *es)
self->seek(self, -offset, SEEK_END);
break;
default:
return es->u.key;
return es.u.key;
}
if (ui_browser__refresh(self) < 0)
return -1;
}
return 0;
return -1;
}

unsigned int ui_browser__list_head_refresh(struct ui_browser *self)
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/ui/browser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ 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);
int ui_browser__run(struct ui_browser *self);

void ui_browser__rb_tree_seek(struct ui_browser *self, off_t offset, int whence);
unsigned int ui_browser__rb_tree_refresh(struct ui_browser *self);
Expand Down
18 changes: 7 additions & 11 deletions tools/perf/util/ui/browsers/annotate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,14 @@ static void annotate_browser__set_top(struct annotate_browser *self,
self->curr_hot = nd;
}

static int annotate_browser__run(struct annotate_browser *self,
struct newtExitStruct *es)
static int annotate_browser__run(struct annotate_browser *self)
{
struct rb_node *nd;
struct hist_entry *he = self->b.priv;
int key;

if (ui_browser__show(&self->b, he->ms.sym->name,
"<- or ESC: exit, TAB/shift+TAB: cycle thru samples") < 0)
"<-, -> or ESC: exit, TAB/shift+TAB: cycle thru samples") < 0)
return -1;

newtFormAddHotKey(self->b.form, NEWT_KEY_LEFT);
Expand All @@ -153,12 +153,9 @@ static int annotate_browser__run(struct annotate_browser *self,
}

while (1) {
ui_browser__run(&self->b, es);
key = ui_browser__run(&self->b);

if (es->reason != NEWT_EXIT_HOTKEY)
break;

switch (es->u.key) {
switch (key) {
case NEWT_KEY_TAB:
nd = rb_prev(nd);
if (nd == NULL)
Expand All @@ -177,12 +174,11 @@ static int annotate_browser__run(struct annotate_browser *self,
}
out:
ui_browser__hide(&self->b);
return es->u.key;
return key;
}

int hist_entry__tui_annotate(struct hist_entry *self)
{
struct newtExitStruct es;
struct objdump_line *pos, *n;
struct objdump_line_rb_node *rbpos;
LIST_HEAD(head);
Expand Down Expand Up @@ -230,7 +226,7 @@ int hist_entry__tui_annotate(struct hist_entry *self)
annotate_browser__set_top(&browser, browser.curr_hot);

browser.b.width += 18; /* Percentage */
ret = annotate_browser__run(&browser, &es);
ret = annotate_browser__run(&browser);
list_for_each_entry_safe(pos, n, &head, node) {
list_del(&pos->node);
objdump_line__free(pos);
Expand Down
132 changes: 58 additions & 74 deletions tools/perf/util/ui/browsers/hists.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ static bool hist_browser__toggle_fold(struct hist_browser *self)
return false;
}

static int hist_browser__run(struct hist_browser *self, const char *title,
struct newtExitStruct *es)
static int hist_browser__run(struct hist_browser *self, const char *title)
{
int key;
char str[256], unit;
unsigned long nr_events = self->hists->stats.nr_events[PERF_RECORD_SAMPLE];

Expand Down Expand Up @@ -227,11 +227,9 @@ static int hist_browser__run(struct hist_browser *self, const char *title,
newtFormAddHotKey(self->b.form, NEWT_KEY_ENTER);

while (1) {
ui_browser__run(&self->b, es);
key = ui_browser__run(&self->b);

if (es->reason != NEWT_EXIT_HOTKEY)
break;
switch (es->u.key) {
switch (key) {
case 'D': { /* Debug */
static int seq;
struct hist_entry *h = rb_entry(self->b.top,
Expand All @@ -251,12 +249,12 @@ static int hist_browser__run(struct hist_browser *self, const char *title,
break;
/* fall thru */
default:
return 0;
goto out;
}
}

out:
ui_browser__hide(&self->b);
return 0;
return key;
}

static char *callchain_list__sym_name(struct callchain_list *self,
Expand Down Expand Up @@ -687,8 +685,6 @@ static struct hist_browser *hist_browser__new(struct hists *hists)

static void hist_browser__delete(struct hist_browser *self)
{
newtFormDestroy(self->b.form);
newtPopWindow();
free(self);
}

Expand Down Expand Up @@ -725,7 +721,6 @@ int hists__browse(struct hists *self, const char *helpline, const char *ev_name)
struct pstack *fstack;
const struct thread *thread_filter = NULL;
const struct dso *dso_filter = NULL;
struct newtExitStruct es;
char msg[160];
int key = -1;

Expand All @@ -749,70 +744,63 @@ int hists__browse(struct hists *self, const char *helpline, const char *ev_name)
annotate = -2, zoom_dso = -2, zoom_thread = -2,
browse_map = -2;

if (hist_browser__run(browser, msg, &es))
break;
key = hist_browser__run(browser, msg);

thread = hist_browser__selected_thread(browser);
dso = browser->selection->map ? browser->selection->map->dso : NULL;

if (es.reason == NEWT_EXIT_HOTKEY) {
key = es.u.key;

switch (key) {
case NEWT_KEY_F1:
goto do_help;
case NEWT_KEY_TAB:
case NEWT_KEY_UNTAB:
/*
* Exit the browser, let hists__browser_tree
* go to the next or previous
*/
goto out_free_stack;
default:;
}

switch (key) {
case 'a':
if (browser->selection->map == NULL &&
browser->selection->map->dso->annotate_warned)
continue;
goto do_annotate;
case 'd':
goto zoom_dso;
case 't':
goto zoom_thread;
case 'h':
case '?':
do_help:
ui__help_window("-> Zoom into DSO/Threads & Annotate current symbol\n"
"<- Zoom out\n"
"a Annotate current symbol\n"
"h/?/F1 Show this window\n"
"d Zoom into current DSO\n"
"t Zoom into current Thread\n"
"q/CTRL+C Exit browser");
switch (key) {
case NEWT_KEY_F1:
goto do_help;
case NEWT_KEY_TAB:
case NEWT_KEY_UNTAB:
/*
* Exit the browser, let hists__browser_tree
* go to the next or previous
*/
goto out_free_stack;
case 'a':
if (browser->selection->map == NULL &&
browser->selection->map->dso->annotate_warned)
continue;
default:;
}
if (is_exit_key(key)) {
if (key == NEWT_KEY_ESCAPE &&
!ui__dialog_yesno("Do you really want to exit?"))
continue;
break;
}

if (es.u.key == NEWT_KEY_LEFT) {
const void *top;
goto do_annotate;
case 'd':
goto zoom_dso;
case 't':
goto zoom_thread;
case 'h':
case '?':
do_help:
ui__help_window("-> Zoom into DSO/Threads & Annotate current symbol\n"
"<- Zoom out\n"
"a Annotate current symbol\n"
"h/?/F1 Show this window\n"
"d Zoom into current DSO\n"
"t Zoom into current Thread\n"
"q/CTRL+C Exit browser");
continue;
case NEWT_KEY_ENTER:
case NEWT_KEY_RIGHT:
/* menu */
break;
case NEWT_KEY_LEFT: {
const void *top;

if (pstack__empty(fstack))
continue;
top = pstack__pop(fstack);
if (top == &dso_filter)
goto zoom_out_dso;
if (top == &thread_filter)
goto zoom_out_thread;
if (pstack__empty(fstack))
continue;
}
top = pstack__pop(fstack);
if (top == &dso_filter)
goto zoom_out_dso;
if (top == &thread_filter)
goto zoom_out_thread;
continue;
}
case NEWT_KEY_ESCAPE:
if (!ui__dialog_yesno("Do you really want to exit?"))
continue;
/* Fall thru */
default:
goto out_free_stack;
}

if (browser->selection->sym != NULL &&
Expand Down Expand Up @@ -925,10 +913,6 @@ int hists__tui_browse_tree(struct rb_root *self, const char *help)
const char *ev_name = __event_name(hists->type, hists->config);

key = hists__browse(hists, help, ev_name);

if (is_exit_key(key))
break;

switch (key) {
case NEWT_KEY_TAB:
next = rb_next(nd);
Expand All @@ -940,7 +924,7 @@ int hists__tui_browse_tree(struct rb_root *self, const char *help)
continue;
nd = rb_prev(nd);
default:
break;
return key;
}
}

Expand Down
Loading

0 comments on commit b50e003

Please sign in to comment.