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

Commit 59ed16b3 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf ui: Always compile browser setup code 



We now have proper fallback logic, so always build it regardless of TUI
or GTK setting.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1352813436-14173-5-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a5580f3e

tools/perf/Makefile

+1 −2
Original line number Original line Diff line number Diff line
@@ -422,6 +422,7 @@ LIB_OBJS += $(OUTPUT)util/intlist.o 
LIB_OBJS += $(OUTPUT)util/vdso.o

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

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

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





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

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

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

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

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

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

LIB_OBJS += $(OUTPUT)ui/hist.o
@@ -612,7 +613,6 @@ ifndef NO_NEWT 
		BASIC_CFLAGS += -I/usr/include/slang

		BASIC_CFLAGS += -I/usr/include/slang

		BASIC_CFLAGS += -DNEWT_SUPPORT

		BASIC_CFLAGS += -DNEWT_SUPPORT

		EXTLIBS += -lnewt -lslang

		EXTLIBS += -lnewt -lslang

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

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

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

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

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

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

		LIB_OBJS += $(OUTPUT)ui/browsers/hists.o
@@ -651,7 +651,6 @@ ifndef NO_GTK2 
		LIB_OBJS += $(OUTPUT)ui/gtk/progress.o

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

		# Make sure that it'd be included only once.

		# Make sure that it'd be included only once.

		ifeq ($(findstring -DNEWT_SUPPORT,$(BASIC_CFLAGS)),)

		ifeq ($(findstring -DNEWT_SUPPORT,$(BASIC_CFLAGS)),)

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

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

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

		endif

		endif

	endif

	endif

tools/perf/ui/ui.h

+28 −0
Original line number Original line Diff line number Diff line
@@ -3,9 +3,37 @@ 




#include <pthread.h>

#include <pthread.h>

#include <stdbool.h>

#include <stdbool.h>

#include <linux/compiler.h>





extern pthread_mutex_t ui__lock;

extern pthread_mutex_t ui__lock;





extern int use_browser;



void setup_browser(bool fallback_to_pager);

void exit_browser(bool wait_for_ok);



#ifdef NEWT_SUPPORT

int ui__init(void);

void ui__exit(bool wait_for_ok);

#else

static inline int ui__init(void)

{

	return -1;

}

static inline void ui__exit(bool wait_for_ok __maybe_unused) {}

#endif



#ifdef GTK2_SUPPORT

int perf_gtk__init(void);

void perf_gtk__exit(bool wait_for_ok);

#else

static inline int perf_gtk__init(void)

{

	return -1;

}

static inline void perf_gtk__exit(bool wait_for_ok __maybe_unused) {}

#endif



void ui__refresh_dimensions(bool force);

void ui__refresh_dimensions(bool force);





#endif /* _PERF_UI_H_ */
 
#endif /* _PERF_UI_H_ */

tools/perf/util/cache.h

+1 −38
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include "util.h"

#include "util.h"

#include "strbuf.h"

#include "strbuf.h"

#include "../perf.h"

#include "../perf.h"

#include "../ui/ui.h"





#define CMD_EXEC_PATH "--exec-path"

#define CMD_EXEC_PATH "--exec-path"

#define CMD_PERF_DIR "--perf-dir="

#define CMD_PERF_DIR "--perf-dir="
@@ -31,44 +32,6 @@ extern const char *pager_program; 
extern int pager_in_use(void);

extern int pager_in_use(void);

extern int pager_use_color;

extern int pager_use_color;





extern int use_browser;



#if defined(NEWT_SUPPORT) || defined(GTK2_SUPPORT)

void setup_browser(bool fallback_to_pager);

void exit_browser(bool wait_for_ok);



#ifdef NEWT_SUPPORT

int ui__init(void);

void ui__exit(bool wait_for_ok);

#else

static inline int ui__init(void)

{

	return -1;

}

static inline void ui__exit(bool wait_for_ok __maybe_unused) {}

#endif



#ifdef GTK2_SUPPORT

int perf_gtk__init(void);

void perf_gtk__exit(bool wait_for_ok);

#else

static inline int perf_gtk__init(void)

{

	return -1;

}

static inline void perf_gtk__exit(bool wait_for_ok __maybe_unused) {}

#endif



#else /* NEWT_SUPPORT || GTK2_SUPPORT */



static inline void setup_browser(bool fallback_to_pager)

{

	if (fallback_to_pager)

		setup_pager();

}

static inline void exit_browser(bool wait_for_ok __maybe_unused) {}

#endif /* NEWT_SUPPORT || GTK2_SUPPORT */



char *alias_lookup(const char *alias);

char *alias_lookup(const char *alias);

int split_cmdline(char *cmdline, const char ***argv);

int split_cmdline(char *cmdline, const char ***argv);