diff options
author | Namhyung Kim <namhyung.kim@lge.com> | 2012-04-30 00:55:09 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-05-02 15:17:37 -0400 |
commit | dc41b9b8f02dbe2228ae787d525dac43beebb7fa (patch) | |
tree | f3d9771fa9b5f6cf62b44da8c0568509a8f55536 /tools/perf/util | |
parent | 281ef544a8476f750b9f378593c42b3e8a0b8788 (diff) |
perf ui: Change fallback policy of setup_browser()
If gtk2 support is not enabled (or failed for some reason) try TUI again
instead of falling directly back to the stdio interface.
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1335761711-31403-6-git-send-email-namhyung.kim@lge.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
-rw-r--r-- | tools/perf/util/cache.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h index 761d4e998101..cff18c617d13 100644 --- a/tools/perf/util/cache.h +++ b/tools/perf/util/cache.h | |||
@@ -45,27 +45,24 @@ void setup_browser(bool fallback_to_pager); | |||
45 | void exit_browser(bool wait_for_ok); | 45 | void exit_browser(bool wait_for_ok); |
46 | 46 | ||
47 | #ifdef NO_NEWT_SUPPORT | 47 | #ifdef NO_NEWT_SUPPORT |
48 | static inline int ui__init(bool fallback_to_pager) | 48 | static inline int ui__init(void) |
49 | { | 49 | { |
50 | if (fallback_to_pager) | 50 | return -1; |
51 | setup_pager(); | ||
52 | return 0; | ||
53 | } | 51 | } |
54 | static inline void ui__exit(bool wait_for_ok __used) {} | 52 | static inline void ui__exit(bool wait_for_ok __used) {} |
55 | #else | 53 | #else |
56 | int ui__init(bool fallback_to_pager); | 54 | int ui__init(void); |
57 | void ui__exit(bool wait_for_ok); | 55 | void ui__exit(bool wait_for_ok); |
58 | #endif | 56 | #endif |
59 | 57 | ||
60 | #ifdef NO_GTK2_SUPPORT | 58 | #ifdef NO_GTK2_SUPPORT |
61 | static inline void perf_gtk__init(bool fallback_to_pager) | 59 | static inline int perf_gtk__init(void) |
62 | { | 60 | { |
63 | if (fallback_to_pager) | 61 | return -1; |
64 | setup_pager(); | ||
65 | } | 62 | } |
66 | static inline void perf_gtk__exit(bool wait_for_ok __used) {} | 63 | static inline void perf_gtk__exit(bool wait_for_ok __used) {} |
67 | #else | 64 | #else |
68 | void perf_gtk__init(bool fallback_to_pager); | 65 | int perf_gtk__init(void); |
69 | void perf_gtk__exit(bool wait_for_ok); | 66 | void perf_gtk__exit(bool wait_for_ok); |
70 | #endif | 67 | #endif |
71 | #endif /* NO_NEWT_SUPPORT && NO_GTK2_SUPPORT */ | 68 | #endif /* NO_NEWT_SUPPORT && NO_GTK2_SUPPORT */ |