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

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

perf ui: Change fallback policy of setup_browser() 



If gtk2 support is not enabled (or failed for some reason) try TUI again
instead of falling directly back to the stdio interface.

Signed-off-by: default avatarNamhyung Kim <namhyung.kim@lge.com>
Acked-by: default avatarPekka Enberg <penberg@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1335761711-31403-6-git-send-email-namhyung.kim@lge.com


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

tools/perf/ui/gtk/setup.c

+2 −2
Original line number Diff line number Diff line 
#include "gtk.h"

#include "../../util/cache.h"



void perf_gtk__init(bool fallback_to_pager __used)

int perf_gtk__init(void)

{

	gtk_init(NULL, NULL);

	return gtk_init_check(NULL, NULL) ? 0 : -1;

}



void perf_gtk__exit(bool wait_for_ok __used)

tools/perf/ui/setup.c

+7 −6
Original line number Diff line number Diff line
@@ -13,13 +13,14 @@ void setup_browser(bool fallback_to_pager) 


	switch (use_browser) {

	case 2:

		perf_gtk__init(fallback_to_pager);

		if (perf_gtk__init() == 0)

			break;



		/* fall through */

	case 1:

		ui__init(fallback_to_pager);

		use_browser = 1;

		if (ui__init() == 0)

			break;



		/* fall through */

	default:

		if (fallback_to_pager)

			setup_pager();

tools/perf/ui/tui/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void ui__signal(int sig) 
	exit(0);

}



int ui__init(bool fallback_to_pager __used)

int ui__init(void)

{

	int err;

tools/perf/util/cache.h

+6 −9
Original line number Diff line number Diff line
@@ -45,27 +45,24 @@ void setup_browser(bool fallback_to_pager); 
void exit_browser(bool wait_for_ok);



#ifdef NO_NEWT_SUPPORT

static inline int ui__init(bool fallback_to_pager)

static inline int ui__init(void)

{

	if (fallback_to_pager)

		setup_pager();

	return 0;

	return -1;

}

static inline void ui__exit(bool wait_for_ok __used) {}

#else

int ui__init(bool fallback_to_pager);

int ui__init(void);

void ui__exit(bool wait_for_ok);

#endif



#ifdef NO_GTK2_SUPPORT

static inline void perf_gtk__init(bool fallback_to_pager)

static inline int perf_gtk__init(void)

{

	if (fallback_to_pager)

		setup_pager();

	return -1;

}

static inline void perf_gtk__exit(bool wait_for_ok __used) {}

#else

void perf_gtk__init(bool fallback_to_pager);

int perf_gtk__init(void);

void perf_gtk__exit(bool wait_for_ok);

#endif

#endif /* NO_NEWT_SUPPORT && NO_GTK2_SUPPORT */