AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

perf ui browser: Add ui_browser__show counterpart: __hide

Browse Source 
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 <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>
This commit is contained in:
Arnaldo Carvalho de Melo 2010-08-10 15:44:20 -03:00
parent f1e9214cc9
commit 59e8fe32fc
7 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/perf/util/ui/browser.c
View File

@ -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;

4
tools/perf/util/ui/browser.h
View File

@ -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);

8
tools/perf/util/ui/browsers/annotate.c
View File

@ -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;
}

5
tools/perf/util/ui/browsers/hists.c
View File

@ -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;
}

10
tools/perf/util/ui/browsers/map.c
View File

@ -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;
}

2
tools/perf/util/ui/helpline.c
View File

@ -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;

1
tools/perf/util/ui/helpline.h
View File

@ -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);