Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

1 files changed, 2 insertions, 59 deletions

diff --git a/tools/perf/ui/setup.c b/tools/perf/ui/setup.c
index 5df5140..47d9a57 100644
--- a/tools/perf/ui/setup.c
+++ b/tools/perf/ui/setup.c
@@ -1,64 +1,10 @@
 #include <pthread.h>
-#include <dlfcn.h>
 
 #include "../util/cache.h"
 #include "../util/debug.h"
 #include "../util/hist.h"
 
 pthread_mutex_t ui__lock = PTHREAD_MUTEX_INITIALIZER;
-void *perf_gtk_handle;
-
-#ifdef HAVE_GTK2_SUPPORT
-static int setup_gtk_browser(void)
-{
-	int (*perf_ui_init)(void);
-
-	if (perf_gtk_handle)
-		return 0;
-
-	perf_gtk_handle = dlopen(PERF_GTK_DSO, RTLD_LAZY);
-	if (perf_gtk_handle == NULL) {
-		char buf[PATH_MAX];
-		scnprintf(buf, sizeof(buf), "%s/%s", LIBDIR, PERF_GTK_DSO);
-		perf_gtk_handle = dlopen(buf, RTLD_LAZY);
-	}
-	if (perf_gtk_handle == NULL)
-		return -1;
-
-	perf_ui_init = dlsym(perf_gtk_handle, "perf_gtk__init");
-	if (perf_ui_init == NULL)
-		goto out_close;
-
-	if (perf_ui_init() == 0)
-		return 0;
-
-out_close:
-	dlclose(perf_gtk_handle);
-	return -1;
-}
-
-static void exit_gtk_browser(bool wait_for_ok)
-{
-	void (*perf_ui_exit)(bool);
-
-	if (perf_gtk_handle == NULL)
-		return;
-
-	perf_ui_exit = dlsym(perf_gtk_handle, "perf_gtk__exit");
-	if (perf_ui_exit == NULL)
-		goto out_close;
-
-	perf_ui_exit(wait_for_ok);
-
-out_close:
-	dlclose(perf_gtk_handle);
-
-	perf_gtk_handle = NULL;
-}
-#else
-static inline int setup_gtk_browser(void) { return -1; }
-static inline void exit_gtk_browser(bool wait_for_ok __maybe_unused) {}
-#endif
 
 void setup_browser(bool fallback_to_pager)
 {
@@ -71,11 +17,8 @@ void setup_browser(bool fallback_to_pager)
 
 	switch (use_browser) {
 	case 2:
-		if (setup_gtk_browser() == 0)
+		if (perf_gtk__init() == 0)
 			break;
-		printf("GTK browser requested but could not find %s\n",
-		       PERF_GTK_DSO);
-		sleep(1);
 		/* fall through */
 	case 1:
 		use_browser = 1;
@@ -96,7 +39,7 @@ void exit_browser(bool wait_for_ok)
 {
 	switch (use_browser) {
 	case 2:
-		exit_gtk_browser(wait_for_ok);
+		perf_gtk__exit(wait_for_ok);
 		break;
 
 	case 1: