perf tui: Reset use_browser if stdout is not a tty

The newt initialization routines weren't being called because the output
was a file (perf annotate > /tmp/bla) but use_browser was still 1,
because ~/.perfconfig had it as 'on', so, later on newt routines
segfaulted.

Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
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>

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 08278eda31a548cb80cbf512b8f7250e1b7dfe37..96db5248e99569914c62427a3466aa9b91559530 100644 (file)
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -343,7 +343,7 @@ find_next:
                        continue;
                }
 
-               if (use_browser) {
+               if (use_browser > 0) {
                        key = hist_entry__tui_annotate(he);
                        if (is_exit_key(key))
                                break;

diff --git a/tools/perf/util/newt.c b/tools/perf/util/newt.c
index d54c540f49dbd4902808aaf8b466f3a88e3606bd..cf182ca132fef27e54e189cd5a49d9c0a29ab8e1 100644 (file)
--- a/tools/perf/util/newt.c
+++ b/tools/perf/util/newt.c
@@ -1139,6 +1139,7 @@ void setup_browser(void)
        struct newtPercentTreeColors *c = &defaultPercentTreeColors;
 
        if (!isatty(1) || !use_browser || dump_trace) {
+               use_browser = 0;
                setup_pager();
                return;
        }