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

Commit 229ade9b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Don't fallback to setup_pager unconditionally 



Because in tools like 'top' we don't want the pager.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8c3e10eb

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used) 
	else if (use_tui)

		use_browser = 1;



	setup_browser();

	setup_browser(true);



	symbol_conf.priv_size = sizeof(struct sym_priv);

	symbol_conf.try_vmlinux_path = true;

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __used) 
		use_browser = 1;



	if (strcmp(input_name, "-") != 0)

		setup_browser();

		setup_browser(true);

	else

		use_browser = 0;

	/*

tools/perf/util/cache.h

+4 −3
Original line number Diff line number Diff line
@@ -34,13 +34,14 @@ extern int pager_use_color; 
extern int use_browser;



#ifdef NO_NEWT_SUPPORT

static inline void setup_browser(void)

static inline void setup_browser(bool fallback_to_pager)

{

	if (fallback_to_pager)

		setup_pager();

}

static inline void exit_browser(bool wait_for_ok __used) {}

#else

void setup_browser(void);

void setup_browser(bool fallback_to_pager);

void exit_browser(bool wait_for_ok);

#endif

tools/perf/util/ui/setup.c

+3 −2
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ static void newt_suspend(void *d __used) 
	newtResume();

}



void setup_browser(void)

void setup_browser(bool fallback_to_pager)

{

	if (!isatty(1) || !use_browser || dump_trace) {

		use_browser = 0;

		if (fallback_to_pager)

			setup_pager();

		return;

	}