perf tools: Don't fallback to setup_pager unconditionally
Commit-ID: 229ade9ba36341f7369ecb4f134bcec9133520bf Gitweb: http://git.kernel.org/tip/229ade9ba36341f7369ecb4f134bcec9133520bf Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 31 Jan 2011 18:08:39 -0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 31 Jan 2011 18:08:39 -0200
perf tools: Don't fallback to setup_pager unconditionally
Because in tools like 'top' we don't want the pager.
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Cc: Tom Zanussi <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/util/cache.h | 7 ++++--- tools/perf/util/ui/setup.c | 5 +++-- 4 files changed, 9 insertions(+), 7 deletions(-)
tools/perf/builtin-annotate.c +1 -1
@@ -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
@@ -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
@@ -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
tools/perf/util/ui/setup.c +3 -2
@@ -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 ; }