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
...@@ -452,7 +452,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used) ...@@ -452,7 +452,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used)
else if (use_tui) else if (use_tui)
use_browser = 1; use_browser = 1;
setup_browser(); setup_browser(true);
symbol_conf.priv_size = sizeof(struct sym_priv); symbol_conf.priv_size = sizeof(struct sym_priv);
symbol_conf.try_vmlinux_path = true; symbol_conf.try_vmlinux_path = true;
......
...@@ -499,7 +499,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __used) ...@@ -499,7 +499,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)
use_browser = 1; use_browser = 1;
if (strcmp(input_name, "-") != 0) if (strcmp(input_name, "-") != 0)
setup_browser(); setup_browser(true);
else else
use_browser = 0; use_browser = 0;
/* /*
......
...@@ -34,13 +34,14 @@ extern int pager_use_color; ...@@ -34,13 +34,14 @@ extern int pager_use_color;
extern int use_browser; extern int use_browser;
#ifdef NO_NEWT_SUPPORT #ifdef NO_NEWT_SUPPORT
static inline void setup_browser(void) static inline void setup_browser(bool fallback_to_pager)
{ {
setup_pager(); if (fallback_to_pager)
setup_pager();
} }
static inline void exit_browser(bool wait_for_ok __used) {} static inline void exit_browser(bool wait_for_ok __used) {}
#else #else
void setup_browser(void); void setup_browser(bool fallback_to_pager);
void exit_browser(bool wait_for_ok); void exit_browser(bool wait_for_ok);
#endif #endif
......
...@@ -14,11 +14,12 @@ static void newt_suspend(void *d __used) ...@@ -14,11 +14,12 @@ static void newt_suspend(void *d __used)
newtResume(); newtResume();
} }
void setup_browser(void) void setup_browser(bool fallback_to_pager)
{ {
if (!isatty(1) || !use_browser || dump_trace) { if (!isatty(1) || !use_browser || dump_trace) {
use_browser = 0; use_browser = 0;
setup_pager(); if (fallback_to_pager)
setup_pager();
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment