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

Commit 34cea7f7 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf ui: Move ui_progress routines to separate file in util/ui/ 



LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5575536f

tools/perf/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -570,8 +570,10 @@ else 
		LIB_OBJS += $(OUTPUT)util/newt.o

		LIB_OBJS += $(OUTPUT)util/ui/browser.o

		LIB_OBJS += $(OUTPUT)util/ui/helpline.o

		LIB_OBJS += $(OUTPUT)util/ui/progress.o

		LIB_H += util/ui/browser.h

		LIB_H += util/ui/helpline.h

		LIB_H += util/ui/progress.h

	endif

endif

tools/perf/util/debug.h

+1 −3
Original line number Diff line number Diff line
@@ -31,9 +31,7 @@ static inline void ui_progress__update(struct ui_progress *self __used, 
static inline void ui_progress__delete(struct ui_progress *self __used) {}

#else

int browser__show_help(const char *format, va_list ap);

struct ui_progress *ui_progress__new(const char *title, u64 total);

void ui_progress__update(struct ui_progress *self, u64 curr);

void ui_progress__delete(struct ui_progress *self);

#include "ui/progress.h"

#endif



#endif	/* __PERF_DEBUG_H */

tools/perf/util/newt.c

+0 −56
Original line number Diff line number Diff line
@@ -39,62 +39,6 @@ 


newtComponent newt_form__new(void);



struct ui_progress {

	newtComponent form, scale;

};



struct ui_progress *ui_progress__new(const char *title, u64 total)

{

	struct ui_progress *self = malloc(sizeof(*self));



	if (self != NULL) {

		int cols;



		if (use_browser <= 0)	

			return self;

		newtGetScreenSize(&cols, NULL);

		cols -= 4;

		newtCenteredWindow(cols, 1, title);

		self->form  = newtForm(NULL, NULL, 0);

		if (self->form == NULL)

			goto out_free_self;

		self->scale = newtScale(0, 0, cols, total);

		if (self->scale == NULL)

			goto out_free_form;

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

		newtRefresh();

	}



	return self;



out_free_form:

	newtFormDestroy(self->form);

out_free_self:

	free(self);

	return NULL;

}



void ui_progress__update(struct ui_progress *self, u64 curr)

{

	/*

	 * FIXME: We should have a per UI backend way of showing progress,

	 * stdio will just show a percentage as NN%, etc.

	 */

	if (use_browser <= 0)

		return;

	newtScaleSet(self->scale, curr);

	newtRefresh();

}



void ui_progress__delete(struct ui_progress *self)

{

	if (use_browser > 0) {

		newtFormDestroy(self->form);

		newtPopWindow();

	}

	free(self);

}



static int ui_entry__read(const char *title, char *bf, size_t size, int width)

{

	struct newtExitStruct es;

tools/perf/util/ui/progress.c

0 → 100644
+60 −0
Original line number Diff line number Diff line 
#include <stdlib.h>

#include <newt.h>

#include "../cache.h"

#include "progress.h"



struct ui_progress {

	newtComponent form, scale;

};



struct ui_progress *ui_progress__new(const char *title, u64 total)

{

	struct ui_progress *self = malloc(sizeof(*self));



	if (self != NULL) {

		int cols;



		if (use_browser <= 0)

			return self;

		newtGetScreenSize(&cols, NULL);

		cols -= 4;

		newtCenteredWindow(cols, 1, title);

		self->form  = newtForm(NULL, NULL, 0);

		if (self->form == NULL)

			goto out_free_self;

		self->scale = newtScale(0, 0, cols, total);

		if (self->scale == NULL)

			goto out_free_form;

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

		newtRefresh();

	}



	return self;



out_free_form:

	newtFormDestroy(self->form);

out_free_self:

	free(self);

	return NULL;

}



void ui_progress__update(struct ui_progress *self, u64 curr)

{

	/*

	 * FIXME: We should have a per UI backend way of showing progress,

	 * stdio will just show a percentage as NN%, etc.

	 */

	if (use_browser <= 0)

		return;

	newtScaleSet(self->scale, curr);

	newtRefresh();

}



void ui_progress__delete(struct ui_progress *self)

{

	if (use_browser > 0) {

		newtFormDestroy(self->form);

		newtPopWindow();

	}

	free(self);

}

tools/perf/util/ui/progress.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#ifndef _PERF_UI_PROGRESS_H_

#define _PERF_UI_PROGRESS_H_ 1



struct ui_progress;



struct ui_progress *ui_progress__new(const char *title, u64 total);

void ui_progress__delete(struct ui_progress *self);



void ui_progress__update(struct ui_progress *self, u64 curr);



#endif