leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf tools: Don't fallback to setup_pager unconditionally

Browse Source 
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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2011-01-31 18:08:39 -02:00
parent 8c3e10eb19
commit 229ade9ba3
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/builtin-annotate.c
View File

@ -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;

2
tools/perf/builtin-report.c
View File

@ -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;
/*

7
tools/perf/util/cache.h
View File

@ -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)
{
setup_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

5
tools/perf/util/ui/setup.c
View File

@ -14,11 +14,12 @@ 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;
setup_pager();
if (fallback_to_pager)
setup_pager();
return;
}