Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59e8fe32 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf ui browser: Add ui_browser__show counterpart: __hide 



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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f1e9214c

tools/perf/util/ui/browser.c

+17 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <stdlib.h>

#include <stdlib.h>

#include <sys/ttydefaults.h>

#include <sys/ttydefaults.h>

#include "browser.h"

#include "browser.h"

#include "helpline.h"

#include "../color.h"

#include "../color.h"

#include "../util.h"

#include "../util.h"
@@ -145,8 +146,11 @@ void ui_browser__reset_index(struct ui_browser *self) 
	self->seek(self, 0, SEEK_SET);

	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) {

	if (self->form != NULL) {

		newtFormDestroy(self->form);

		newtFormDestroy(self->form);

		newtPopWindow();

		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, NEWT_KEY_END);

	newtFormAddHotKey(self->form, ' ');

	newtFormAddHotKey(self->form, ' ');

	newtFormAddComponent(self->form, self->sb);

	newtFormAddComponent(self->form, self->sb);



	va_start(ap, helpline);

	ui_helpline__vpush(helpline, ap);

	va_end(ap);

	return 0;

	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 ui_browser__refresh(struct ui_browser *self)

{

{

	int row;

	int row;

tools/perf/util/ui/browser.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -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__refresh_dimensions(struct ui_browser *self);

void ui_browser__reset_index(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__refresh(struct ui_browser *self);

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

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

tools/perf/util/ui/browsers/annotate.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -141,10 +141,10 @@ static int annotate_browser__run(struct annotate_browser *self, 
	struct rb_node *nd;

	struct rb_node *nd;

	struct hist_entry *he = self->b.priv;

	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;

		return -1;





	ui_helpline__fpush("<- or ESC: exit, TAB/shift+TAB: cycle thru samples");

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

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





	nd = self->curr_hot;

	nd = self->curr_hot;
@@ -177,9 +177,7 @@ static int annotate_browser__run(struct annotate_browser *self, 
		}

		}

	}

	}

out:

out:

	newtFormDestroy(self->b.form);

	ui_browser__hide(&self->b);

	newtPopWindow();

	ui_helpline__pop();

	return 0;

	return 0;

}

}

tools/perf/util/ui/browsers/hists.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -211,7 +211,8 @@ static int hist_browser__run(struct hist_browser *self, const char *title, 
		 nr_events, unit);

		 nr_events, unit);

	newtDrawRootText(0, 0, str);

	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;

		return -1;





	newtFormAddHotKey(self->b.form, 'A');

	newtFormAddHotKey(self->b.form, 'A');
@@ -253,6 +254,8 @@ static int hist_browser__run(struct hist_browser *self, const char *title, 
			return 0;

			return 0;

		}

		}

	}

	}



	ui_browser__hide(&self->b);

	return 0;

	return 0;

}

}

tools/perf/util/ui/browsers/map.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -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)

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;

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

	newtFormAddHotKey(self->b.form, NEWT_KEY_ENTER);

	newtFormAddHotKey(self->b.form, NEWT_KEY_ENTER);

	if (verbose)

	if (verbose)
@@ -121,9 +121,7 @@ static int map_browser__run(struct map_browser *self, struct newtExitStruct *es) 
			break;

			break;

	}

	}





	newtFormDestroy(self->b.form);

	ui_browser__hide(&self->b);

	newtPopWindow();

	ui_helpline__pop();

	return 0;

	return 0;

}

}