aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung.kim@lge.com>2012-04-30 00:55:09 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-05-02 15:17:37 -0400
commitdc41b9b8f02dbe2228ae787d525dac43beebb7fa (patch)
treef3d9771fa9b5f6cf62b44da8c0568509a8f55536 /tools/perf/util
parent281ef544a8476f750b9f378593c42b3e8a0b8788 (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.h15
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);
45void exit_browser(bool wait_for_ok); 45void exit_browser(bool wait_for_ok);
46 46
47#ifdef NO_NEWT_SUPPORT 47#ifdef NO_NEWT_SUPPORT
48static inline int ui__init(bool fallback_to_pager) 48static inline int ui__init(void)
49{ 49{
50 if (fallback_to_pager) 50 return -1;
51 setup_pager();
52 return 0;
53} 51}
54static inline void ui__exit(bool wait_for_ok __used) {} 52static inline void ui__exit(bool wait_for_ok __used) {}
55#else 53#else
56int ui__init(bool fallback_to_pager); 54int ui__init(void);
57void ui__exit(bool wait_for_ok); 55void ui__exit(bool wait_for_ok);
58#endif 56#endif
59 57
60#ifdef NO_GTK2_SUPPORT 58#ifdef NO_GTK2_SUPPORT
61static inline void perf_gtk__init(bool fallback_to_pager) 59static inline int perf_gtk__init(void)
62{ 60{
63 if (fallback_to_pager) 61 return -1;
64 setup_pager();
65} 62}
66static inline void perf_gtk__exit(bool wait_for_ok __used) {} 63static inline void perf_gtk__exit(bool wait_for_ok __used) {}
67#else 64#else
68void perf_gtk__init(bool fallback_to_pager); 65int perf_gtk__init(void);
69void perf_gtk__exit(bool wait_for_ok); 66void 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 */