imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-11-10 03:20:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

perf ui: Change fallback policy of setup_browser()

Browse Source 
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 <[email protected]>
Acked-by: Pekka Enberg <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Pekka Enberg <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
This commit is contained in:
Namhyung Kim authored and Arnaldo Carvalho de Melo committed 2012-05-02 16:17:37 -03:00
1 parent 281ef544a8
commit dc41b9b8f0
4 files changed
+16 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/perf/ui/gtk/setup.c
+2 -2
View File
@@ -1,9 +1,9 @@
#include "gtk.h"
#include "../../util/cache.h"
void perf_gtk__init(bool fallback_to_pager __used)
int perf_gtk__init(void)
{
gtk_init(NULL, NULL);
return gtk_init_check(NULL, NULL) ? 0 : -1;
}
void perf_gtk__exit(bool wait_for_ok __used)
tools/perf/ui/setup.c
+7 -6
View File
@@ -13,13 +13,14 @@ void setup_browser(bool fallback_to_pager)
switch (use_browser) {
case 2:
perf_gtk__init(fallback_to_pager);
break;
if (perf_gtk__init() == 0)
break;
/* fall through */
case 1:
ui__init(fallback_to_pager);
break;
use_browser = 1;
if (ui__init() == 0)
break;
/* fall through */
default:
if (fallback_to_pager)
setup_pager();
tools/perf/ui/tui/setup.c
+1 -1
View File
@@ -100,7 +100,7 @@ static void ui__signal(int sig)
exit(0);
}
int ui__init(bool fallback_to_pager __used)
int ui__init(void)
{
int err;
tools/perf/util/cache.h
+6 -9
View File
@@ -45,27 +45,24 @@ void setup_browser(bool fallback_to_pager);
void exit_browser(bool wait_for_ok);
#ifdef NO_NEWT_SUPPORT
static inline int ui__init(bool fallback_to_pager)
static inline int ui__init(void)
{
if (fallback_to_pager)
setup_pager();
return 0;
return -1;
}
static inline void ui__exit(bool wait_for_ok __used) {}
#else
int ui__init(bool fallback_to_pager);
int ui__init(void);
void ui__exit(bool wait_for_ok);
#endif
#ifdef NO_GTK2_SUPPORT
static inline void perf_gtk__init(bool fallback_to_pager)
static inline int perf_gtk__init(void)
{
if (fallback_to_pager)
setup_pager();
return -1;
}
static inline void perf_gtk__exit(bool wait_for_ok __used) {}
#else
void perf_gtk__init(bool fallback_to_pager);
int perf_gtk__init(void);
void perf_gtk__exit(bool wait_for_ok);
#endif
#endif /* NO_NEWT_SUPPORT && NO_GTK2_SUPPORT */