forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf tools: Separate out GTK codes to libperf-gtk.so

Browse source 
Separate out GTK codes to a shared object called libperf-gtk.so.  This
time only GTK codes are built with -fPIC and libperf remains as is.  Now
run GTK hist and annotation browser using libdl.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.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/1379053663-13706-1-git-send-email-namhyung@kernel.org
[ Fix it up wrt Ingo's tools/perf build speedups ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2013-09-13 15:27:43 +09:00 • committed by Arnaldo Carvalho de Melo
parent fc2be6968e
commit fc67297b16
11 changed files with 165 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

61
tools/perf/ui/setup.c
View file

@ -1,10 +1,64 @@
#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)
{
@ -17,8 +71,11 @@ void setup_browser(bool fallback_to_pager)
switch (use_browser) {
case 2:
if (perf_gtk__init() == 0)
if (setup_gtk_browser() == 0)
break;
printf("GTK browser requested but could not find %s\n",
PERF_GTK_DSO);
sleep(1);
/* fall through */
case 1:
use_browser = 1;
@ -39,7 +96,7 @@ void exit_browser(bool wait_for_ok)
{
switch (use_browser) {
case 2:
perf_gtk__exit(wait_for_ok);
exit_gtk_browser(wait_for_ok);
break;
case 1: