diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2010-05-26 12:22:26 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2010-05-26 12:22:26 -0400 |
commit | 62e3436b5f3461662929eae102beefbd12127cb1 (patch) | |
tree | f106ccc10a03dd182edefe4717875bd787473840 | |
parent | 49c177461bfbedeccbab22bf3905db2f9da7f1c3 (diff) |
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>
-rw-r--r-- | tools/perf/builtin-annotate.c | 2 | ||||
-rw-r--r-- | tools/perf/util/newt.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 08278eda31a5..96db5248e995 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c | |||
@@ -343,7 +343,7 @@ find_next: | |||
343 | continue; | 343 | continue; |
344 | } | 344 | } |
345 | 345 | ||
346 | if (use_browser) { | 346 | if (use_browser > 0) { |
347 | key = hist_entry__tui_annotate(he); | 347 | key = hist_entry__tui_annotate(he); |
348 | if (is_exit_key(key)) | 348 | if (is_exit_key(key)) |
349 | break; | 349 | break; |
diff --git a/tools/perf/util/newt.c b/tools/perf/util/newt.c index d54c540f49db..cf182ca132fe 100644 --- a/tools/perf/util/newt.c +++ b/tools/perf/util/newt.c | |||
@@ -1139,6 +1139,7 @@ void setup_browser(void) | |||
1139 | struct newtPercentTreeColors *c = &defaultPercentTreeColors; | 1139 | struct newtPercentTreeColors *c = &defaultPercentTreeColors; |
1140 | 1140 | ||
1141 | if (!isatty(1) || !use_browser || dump_trace) { | 1141 | if (!isatty(1) || !use_browser || dump_trace) { |
1142 | use_browser = 0; | ||
1142 | setup_pager(); | 1143 | setup_pager(); |
1143 | return; | 1144 | return; |
1144 | } | 1145 | } |