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

Commit 1e6dd077 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf ui: Complete the breakdown of util/newt.c 



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

tools/perf/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -567,18 +567,20 @@ else 
		# Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h

		BASIC_CFLAGS += -I/usr/include/slang

		EXTLIBS += -lnewt -lslang

		LIB_OBJS += $(OUTPUT)util/newt.o

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

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

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

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

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

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

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

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

		LIB_H += util/ui/browser.h

		LIB_H += util/ui/browsers/map.h

		LIB_H += util/ui/helpline.h

		LIB_H += util/ui/libslang.h

		LIB_H += util/ui/progress.h

		LIB_H += util/ui/util.h

	endif

endif
@@ -976,9 +978,6 @@ $(OUTPUT)builtin-init-db.o: builtin-init-db.c $(OUTPUT)PERF-CFLAGS 
$(OUTPUT)util/config.o: util/config.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



$(OUTPUT)util/newt.o: util/newt.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $<



$(OUTPUT)util/ui/browser.o: util/ui/browser.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $<

tools/perf/util/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ int eprintf(int level, const char *fmt, ...) 
	if (verbose >= level) {

		va_start(args, fmt);

		if (use_browser > 0)

			ret = browser__show_help(fmt, args);

			ret = ui_helpline__show_help(fmt, args);

		else

			ret = vfprintf(stderr, fmt, args);

		va_end(args);

tools/perf/util/debug.h

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ void trace_event(event_t *event); 
struct ui_progress;



#ifdef NO_NEWT_SUPPORT

static inline int browser__show_help(const char *format __used, va_list ap __used)

static inline int ui_helpline__show_help(const char *format __used, va_list ap __used)

{

	return 0;

}
@@ -30,8 +30,8 @@ static inline void ui_progress__update(struct ui_progress *self __used, 


static inline void ui_progress__delete(struct ui_progress *self __used) {}

#else

extern char browser__last_msg[];

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

extern char ui_helpline__last_msg[];

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

#include "ui/progress.h"

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int hist_entry__tui_annotate(struct hist_entry *self) 
		return -1;



	if (hist_entry__annotate(self, &head) < 0) {

		ui__error_window(browser__last_msg);

		ui__error_window(ui_helpline__last_msg);

		return -1;

	}

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

+2 −6
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
#include "../util.h"

#include "map.h"



int ui__help_window(const char *text);

bool dialog_yesno(const char *msg);

int popup_menu(int argc, char * const argv[]);



struct hist_browser {

	struct ui_browser   b;

	struct hists	    *hists;
@@ -798,7 +794,7 @@ int hists__browse(struct hists *self, const char *helpline, const char *ev_name) 
			}

			if (is_exit_key(key)) {

				if (key == NEWT_KEY_ESCAPE &&

				    !dialog_yesno("Do you really want to exit?"))

				    !ui__dialog_yesno("Do you really want to exit?"))

					continue;

				break;

			}
@@ -842,7 +838,7 @@ int hists__browse(struct hists *self, const char *helpline, const char *ev_name) 


		options[nr_options++] = (char *)"Exit";



		choice = popup_menu(nr_options, options);

		choice = ui__popup_menu(nr_options, options);



		for (i = 0; i < nr_options - 1; ++i)

			free(options[i]);