perf tools: Separate out GTK codes to libperf-gtk.so
Namhyung Kim
maintainerPATCH 1/1 perf tools: Separate out GTK codes to libperf-gtk.so
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.
--- tools/perf/Makefile | 42 +++++++++++++++++++++++---------- tools/perf/builtin-annotate.c | 26 +++++++++++++++++--- tools/perf/builtin-report.c | 16 +++++++++++-- tools/perf/config/Makefile | 12 +++++++--- tools/perf/ui/gtk/annotate.c | 13 +++++++--- tools/perf/ui/gtk/gtk.h | 16 +++++++++++++ tools/perf/ui/setup.c | 55 +++++++++++++++++++++++++++++++++++++++++-- tools/perf/ui/ui.h | 12 +--------- tools/perf/util/annotate.h | 24 ------------------- tools/perf/util/hist.h | 15 ------------ 10 files changed, 156 insertions(+), 75 deletions(-)
tools/perf/Makefile +30 -12
@@ -113,6 +113,7 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ BUILTIN_OBJS = LIB_H = LIB_OBJS = +GTK_OBJS = PYRF_OBJS = SCRIPT_SH =
@@ -488,13 +489,19 @@ ifndef NO_SLANG endif ifndef NO_GTK2 - LIB_OBJS += $(OUTPUT)ui/gtk/browser.o - LIB_OBJS += $(OUTPUT)ui/gtk/hists.o - LIB_OBJS += $(OUTPUT)ui/gtk/setup.o - LIB_OBJS += $(OUTPUT)ui/gtk/util.o - LIB_OBJS += $(OUTPUT)ui/gtk/helpline.o - LIB_OBJS += $(OUTPUT)ui/gtk/progress.o - LIB_OBJS += $(OUTPUT)ui/gtk/annotate.o + ALL_PROGRAMS += $(OUTPUT)libperf-gtk.so + + GTK_OBJS += $(OUTPUT)ui/gtk/browser.o + GTK_OBJS += $(OUTPUT)ui/gtk/hists.o + GTK_OBJS += $(OUTPUT)ui/gtk/setup.o + GTK_OBJS += $(OUTPUT)ui/gtk/util.o + GTK_OBJS += $(OUTPUT)ui/gtk/helpline.o + GTK_OBJS += $(OUTPUT)ui/gtk/progress.o + GTK_OBJS += $(OUTPUT)ui/gtk/annotate.o + +install-gtk: $(OUTPUT)libperf-gtk.so + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)' + $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)' endif ifndef NO_LIBPERL
@@ -548,6 +555,12 @@ $(OUTPUT)perf: $(OUTPUT)perf.o $(BUILTIN_OBJS) $(PERFLIBS) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(OUTPUT)perf.o \ $(BUILTIN_OBJS) $(LIBS) -o $@ +$(GTK_OBJS): $(OUTPUT)%.o: %.c $(LIB_H) + $(QUIET_CC)$(CC) -o $@ -c -fPIC $(CFLAGS) $(GTK_CFLAGS) $< + +$(OUTPUT)libperf-gtk.so: $(GTK_OBJS) $(PERFLIBS) + $(QUIET_LINK)$(CC) -o $@ -shared $(ALL_LDFLAGS) $(filter %.o,$^) $(GTK_LIBS) + $(OUTPUT)builtin-help.o: builtin-help.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) \ '-DPERF_HTML_PATH="$(htmldir_SQ)"' \
@@ -657,7 +670,8 @@ $(patsubst perf-%,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h) # we compile into subdirectories. if the target directory is not the source directory, they might not exists. So # we depend the various files onto their directories. -DIRECTORY_DEPS = $(LIB_OBJS) $(BUILTIN_OBJS) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h +DIRECTORY_DEPS = $(LIB_OBJS) $(BUILTIN_OBJS) $(GTK_OBJS) +DIRECTORY_DEPS += $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h $(DIRECTORY_DEPS): | $(sort $(dir $(DIRECTORY_DEPS))) # In the second step, we make a rule to actually create these directories $(sort $(dir $(DIRECTORY_DEPS))):
@@ -766,7 +780,9 @@ check: $(OUTPUT)common-cmds.h ### Installation rules -install-bin: all +install-gtk: + +install-bin: all install-gtk $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
@@ -803,15 +819,17 @@ $(INSTALL_DOC_TARGETS): ### Cleaning rules clean: $(LIBTRACEEVENT)-clean $(LIBLK)-clean - $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS) + $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(GTK_OBJS) + $(RM) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS) $(RM) $(ALL_PROGRAMS) perf - $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* + $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo + $(RM) $(OUTPUT)common-cmds.h TAGS tags cscope* $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean $(RM) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-CFLAGS $(RM) $(OUTPUT)util/*-bison* $(RM) $(OUTPUT)util/*-flex* $(python-clean) -.PHONY: all install clean strip $(LIBTRACEEVENT) $(LIBLK) +.PHONY: all install clean strip $(LIBTRACEEVENT) $(LIBLK) install-gtk .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell .PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope .FORCE-PERF-CFLAGS
tools/perf/builtin-annotate.c +23 -3
@@ -30,6 +30,7 @@#include "util/tool.h" #include "arch/common.h" +#include <dlfcn.h> #include <linux/bitmap.h> struct perf_annotate {
@@ -142,8 +143,18 @@ find_next:if (use_browser ==2 ) {int ret; +int (*annotate)(struct hist_entry *he, +struct perf_evsel *evsel, +struct hist_browser_timer *hbt); + + annotate =dlsym (perf_gtk_handle, +"hist_entry__gtk_annotate" ); +if (annotate ==NULL ) { +ui__error ("GTK browser not found!\n" ); +return ; + } - ret =hist_entry__gtk_annotate (he, evsel,NULL ); + ret =annotate (he, evsel,NULL );if (!ret || !ann->skip_missing)return ;
@@ -247,8 +258,17 @@ static int __cmd_annotate(struct perf_annotate *ann) goto out_delete; } -if (use_browser ==2 ) -perf_gtk__show_annotations (); +if (use_browser ==2 ) { +void (*show_annotations)(void ); + + show_annotations =dlsym (perf_gtk_handle, +"perf_gtk__show_annotations" ); +if (show_annotations ==NULL ) { +ui__error ("GTK browser not found!\n" ); + goto out_delete; + } +show_annotations (); + } out_delete:/*
tools/perf/builtin-report.c +14 -2
@@ -35,6 +35,7 @@#include "util/hist.h" #include "arch/common.h" +#include <dlfcn.h> #include <linux/bitmap.h> struct perf_report {
@@ -590,8 +591,19 @@ static int __cmd_report(struct perf_report *rep) ret =0 ; }else if (use_browser ==2 ) { -perf_evlist__gtk_browse_hists (session->evlist, help, -NULL , rep->min_percent); +int (*hist_browser)(struct perf_evlist *, +const char *, +struct hist_browser_timer *, +float min_pcnt); + + hist_browser =dlsym (perf_gtk_handle, +"perf_evlist__gtk_browse_hists" ); +if (hist_browser ==NULL ) { +ui__error ("GTK browser not found!\n" ); +return ret; + } +hist_browser (session->evlist, help,NULL , + rep->min_percent); } }else perf_evlist__tty_browse_hists (session->evlist, rep, help);
tools/perf/config/Makefile +9 -3
@@ -267,11 +267,11 @@ ifndef NO_GTK2 NO_GTK2 := 1 else ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2),-DHAVE_GTK_INFO_BAR),y) - CFLAGS += -DHAVE_GTK_INFO_BAR + GTK_CFLAGS := -DHAVE_GTK_INFO_BAR endif CFLAGS += -DGTK2_SUPPORT - CFLAGS += $(shell pkg-config --cflags gtk+-2.0 2>/dev/null) - EXTLIBS += $(shell pkg-config --libs gtk+-2.0 2>/dev/null) + GTK_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 2>/dev/null) + GTK_LIBS := $(shell pkg-config --libs gtk+-2.0 2>/dev/null) endif endif
@@ -456,7 +456,12 @@ else sysconfdir = $(prefix)/etc ETC_PERFCONFIG = etc/perfconfig endif +ifeq ($(IS_X86_64),1) +lib = lib64 +else lib = lib +endif +libdir = $(prefix)/$(lib) # Shell quote (do not use $(call) to accommodate ancient setups); ETC_PERFCONFIG_SQ = $(subst ','\'',$(ETC_PERFCONFIG))
@@ -469,6 +474,7 @@ template_dir_SQ = $(subst ','\'',$(template_dir)) htmldir_SQ = $(subst ','\'',$(htmldir)) prefix_SQ = $(subst ','\'',$(prefix)) sysconfdir_SQ = $(subst ','\'',$(sysconfdir)) +libdir_SQ = $(subst ','\'',$(libdir)) ifneq ($(filter /%,$(firstword $(perfexecdir))),) perfexec_instdir = $(perfexecdir)
tools/perf/ui/gtk/annotate.c +10 -3
@@ -154,9 +154,9 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,return 0 ; } -int symbol__gtk_annotate (struct symbol *sym,struct map *map, -struct perf_evsel *evsel, -struct hist_browser_timer *hbt) +static int symbol__gtk_annotate (struct symbol *sym,struct map *map, +struct perf_evsel *evsel, +struct hist_browser_timer *hbt) {GtkWidget *window;GtkWidget *notebook;
@@ -226,6 +226,13 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map,return 0 ; } +int hist_entry__gtk_annotate (struct hist_entry *he, +struct perf_evsel *evsel, +struct hist_browser_timer *hbt) +{ +return symbol__gtk_annotate (he->ms.sym, he->ms.map, evsel, hbt); +} +void perf_gtk__show_annotations (void ) {GtkWidget *window;
tools/perf/ui/gtk/gtk.h +16 -0
@@ -20,6 +20,9 @@ struct perf_gtk_context {guint statbar_ctx_id; }; +int perf_gtk__init (void ); +void perf_gtk__exit (bool wait_for_ok); +extern struct perf_gtk_context *pgctx;static inline bool perf_gtk__is_active_context (struct perf_gtk_context *ctx)
@@ -48,4 +51,17 @@ static inline GtkWidget *perf_gtk__setup_info_bar(void) }#endif +struct perf_evsel ; +struct perf_evlist ; +struct hist_entry ; +struct hist_browser_timer ; + +int perf_evlist__gtk_browse_hists (struct perf_evlist *evlist,const char *help, +struct hist_browser_timer *hbt, +float min_pcnt); +int hist_entry__gtk_annotate (struct hist_entry *he, +struct perf_evsel *evsel, +struct hist_browser_timer *hbt); +void perf_gtk__show_annotations (void ); +#endif /* _PERF_GTK_H_ */
tools/perf/ui/setup.c +53 -2
78 lines not on this page · raw message
tools/perf/ui/ui.h +1 -11
@@ -6,6 +6,7 @@#include <linux/compiler.h> extern pthread_mutex_t ui__lock; +extern void *perf_gtk_handle;extern int use_browser;
@@ -23,17 +24,6 @@ static inline int ui__init(void)static inline void ui__exit (bool wait_for_ok__maybe_unused ) {}#endif -#ifdef GTK2_SUPPORT -int perf_gtk__init (void ); -void perf_gtk__exit (bool wait_for_ok); -#else -static inline int perf_gtk__init (void ) -{ -return -1 ; -} -static inline void perf_gtk__exit (bool wait_for_ok__maybe_unused ) {} -#endif -void ui__refresh_dimensions (bool force);#endif /* _PERF_UI_H_ */
tools/perf/util/annotate.h +0 -24
@@ -165,30 +165,6 @@ static inline int symbol__tui_annotate(struct symbol *sym __maybe_unused, }#endif -#ifdef GTK2_SUPPORT -int symbol__gtk_annotate (struct symbol *sym,struct map *map, -struct perf_evsel *evsel, -struct hist_browser_timer *hbt); - -static inline int hist_entry__gtk_annotate (struct hist_entry *he, -struct perf_evsel *evsel, -struct hist_browser_timer *hbt) -{ -return symbol__gtk_annotate (he->ms.sym, he->ms.map, evsel, hbt); -} - -void perf_gtk__show_annotations (void ); -#else -static inline int hist_entry__gtk_annotate (struct hist_entry *he__maybe_unused , -struct perf_evsel *evsel__maybe_unused , -struct hist_browser_timer *hbt__maybe_unused ) -{ -return 0 ; -} - -static inline void perf_gtk__show_annotations (void ) {} -#endif -extern const char *disassembler_style;#endif /* __PERF_ANNOTATE_H */
tools/perf/util/hist.h +0 -15
@@ -224,20 +224,5 @@ static inline int script_browse(const char *script_opt __maybe_unused)#define K_SWITCH_INPUT_DATA -3000#endif -#ifdef GTK2_SUPPORT -int perf_evlist__gtk_browse_hists (struct perf_evlist *evlist,const char *help, -struct hist_browser_timer *hbt__maybe_unused , -float min_pcnt); -#else -static inline -int perf_evlist__gtk_browse_hists (struct perf_evlist *evlist__maybe_unused , -const char *help__maybe_unused , -struct hist_browser_timer *hbt__maybe_unused , -float min_pcnt__maybe_unused ) -{ -return 0 ; -} -#endif -unsigned int hists__sort_list_width (struct hists *self);#endif /* __PERF_HIST_H */
Signature · 1 line
1.7.11.7
Quoted 1 line · Namhyung Kim
Separate out GTK codes to a shared object called libperf-gtk.so. This
SNIP
Quoted 4 lines
pthread_mutex_tui__lock=PTHREAD_MUTEX_INITIALIZER;tools/perf/ui/setup.c +3
-0+void *perf_gtk_handle; + +#ifdef GTK2_SUPPORT
tools/perf/ui/setup.c line 21
Quoted 10 lines
tools/perf/ui/setup.c +10
-0+static int setup_gtk_browser (void ) +{ +int (*perf_ui_init)(void ); + +if (perf_gtk_handle) +return 0 ; + + perf_gtk_handle =dlopen ("libperf-gtk.so" ,RTLD_LAZY ); +if (perf_gtk_handle ==NULL ) +return -1 ;
shouldn't we try for known installed path here?
$ perf report --gtk GTK browser requested but could not find libperf-gtk.so
otherwise I need to do some ld.conf setup or run it like this:
LD_LIBRARY_PATH=/home/jolsa/lib64/ ./perf report --gtk LD_LIBRARY_PATH=./ ./perf report --gtk
jirka
Namhyung Kim
maintainerPATCH v6 1/1 perf tools: Separate out GTK codes to libperf-gtk.so
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.
--- tools/perf/Makefile | 45 ++++++++++++++++++++++--------- tools/perf/builtin-annotate.c | 26 +++++++++++++++--- tools/perf/builtin-report.c | 16 ++++++++++-- tools/perf/config/Makefile | 12 ++++++--- tools/perf/ui/gtk/annotate.c | 13 ++++++--- tools/perf/ui/gtk/gtk.h | 16 ++++++++++++ tools/perf/ui/setup.c | 61 +++++++++++++++++++++++++++++++++++++++++-- tools/perf/ui/ui.h | 12 +-------- tools/perf/util/annotate.h | 24 ----------------- tools/perf/util/hist.h | 15 ----------- tools/perf/util/util.h | 2 ++ 11 files changed, 167 insertions(+), 75 deletions(-)
tools/perf/Makefile +33 -12
@@ -113,6 +113,7 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ BUILTIN_OBJS = LIB_H = LIB_OBJS = +GTK_OBJS = PYRF_OBJS = SCRIPT_SH =
@@ -488,13 +489,19 @@ ifndef NO_SLANG endif ifndef NO_GTK2 - LIB_OBJS += $(OUTPUT)ui/gtk/browser.o - LIB_OBJS += $(OUTPUT)ui/gtk/hists.o - LIB_OBJS += $(OUTPUT)ui/gtk/setup.o - LIB_OBJS += $(OUTPUT)ui/gtk/util.o - LIB_OBJS += $(OUTPUT)ui/gtk/helpline.o - LIB_OBJS += $(OUTPUT)ui/gtk/progress.o - LIB_OBJS += $(OUTPUT)ui/gtk/annotate.o + ALL_PROGRAMS += $(OUTPUT)libperf-gtk.so + + GTK_OBJS += $(OUTPUT)ui/gtk/browser.o + GTK_OBJS += $(OUTPUT)ui/gtk/hists.o + GTK_OBJS += $(OUTPUT)ui/gtk/setup.o + GTK_OBJS += $(OUTPUT)ui/gtk/util.o + GTK_OBJS += $(OUTPUT)ui/gtk/helpline.o + GTK_OBJS += $(OUTPUT)ui/gtk/progress.o + GTK_OBJS += $(OUTPUT)ui/gtk/annotate.o + +install-gtk: $(OUTPUT)libperf-gtk.so + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)' + $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)' endif ifndef NO_LIBPERL
@@ -548,6 +555,12 @@ $(OUTPUT)perf: $(OUTPUT)perf.o $(BUILTIN_OBJS) $(PERFLIBS) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(OUTPUT)perf.o \ $(BUILTIN_OBJS) $(LIBS) -o $@ +$(GTK_OBJS): $(OUTPUT)%.o: %.c $(LIB_H) + $(QUIET_CC)$(CC) -o $@ -c -fPIC $(CFLAGS) $(GTK_CFLAGS) $< + +$(OUTPUT)libperf-gtk.so: $(GTK_OBJS) $(PERFLIBS) + $(QUIET_LINK)$(CC) -o $@ -shared $(ALL_LDFLAGS) $(filter %.o,$^) $(GTK_LIBS) + $(OUTPUT)builtin-help.o: builtin-help.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) \ '-DPERF_HTML_PATH="$(htmldir_SQ)"' \
@@ -616,6 +629,9 @@ $(OUTPUT)tests/python-use.o: tests/python-use.c $(OUTPUT)PERF-CFLAGS $(OUTPUT)util/config.o: util/config.c $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< +$(OUTPUT)ui/setup.o: ui/setup.c $(OUTPUT)PERF-CFLAGS + $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -DLIBDIR='"$(libdir_SQ)"' $< + $(OUTPUT)ui/browser.o: ui/browser.c $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -DENABLE_SLFUTURE_CONST $<
@@ -657,7 +673,8 @@ $(patsubst perf-%,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h) # we compile into subdirectories. if the target directory is not the source directory, they might not exists. So # we depend the various files onto their directories. -DIRECTORY_DEPS = $(LIB_OBJS) $(BUILTIN_OBJS) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h +DIRECTORY_DEPS = $(LIB_OBJS) $(BUILTIN_OBJS) $(GTK_OBJS) +DIRECTORY_DEPS += $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h $(DIRECTORY_DEPS): | $(sort $(dir $(DIRECTORY_DEPS))) # In the second step, we make a rule to actually create these directories $(sort $(dir $(DIRECTORY_DEPS))):
@@ -766,7 +783,9 @@ check: $(OUTPUT)common-cmds.h ### Installation rules -install-bin: all +install-gtk: + +install-bin: all install-gtk $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
@@ -803,15 +822,17 @@ $(INSTALL_DOC_TARGETS): ### Cleaning rules clean: $(LIBTRACEEVENT)-clean $(LIBLK)-clean - $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS) + $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(GTK_OBJS) + $(RM) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS) $(RM) $(ALL_PROGRAMS) perf - $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* + $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo + $(RM) $(OUTPUT)common-cmds.h TAGS tags cscope* $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean $(RM) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-CFLAGS $(RM) $(OUTPUT)util/*-bison* $(RM) $(OUTPUT)util/*-flex* $(python-clean) -.PHONY: all install clean strip $(LIBTRACEEVENT) $(LIBLK) +.PHONY: all install clean strip $(LIBTRACEEVENT) $(LIBLK) install-gtk .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell .PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope .FORCE-PERF-CFLAGS
tools/perf/builtin-annotate.c +23 -3
@@ -30,6 +30,7 @@#include "util/tool.h" #include "arch/common.h" +#include <dlfcn.h> #include <linux/bitmap.h> struct perf_annotate {
@@ -142,8 +143,18 @@ find_next:if (use_browser ==2 ) {int ret; +int (*annotate)(struct hist_entry *he, +struct perf_evsel *evsel, +struct hist_browser_timer *hbt); + + annotate =dlsym (perf_gtk_handle, +"hist_entry__gtk_annotate" ); +if (annotate ==NULL ) { +ui__error ("GTK browser not found!\n" ); +return ; + } - ret =hist_entry__gtk_annotate (he, evsel,NULL ); + ret =annotate (he, evsel,NULL );if (!ret || !ann->skip_missing)return ;
@@ -247,8 +258,17 @@ static int __cmd_annotate(struct perf_annotate *ann) goto out_delete; } -if (use_browser ==2 ) -perf_gtk__show_annotations (); +if (use_browser ==2 ) { +void (*show_annotations)(void ); + + show_annotations =dlsym (perf_gtk_handle, +"perf_gtk__show_annotations" ); +if (show_annotations ==NULL ) { +ui__error ("GTK browser not found!\n" ); + goto out_delete; + } +show_annotations (); + } out_delete:/*
tools/perf/builtin-report.c +14 -2
@@ -35,6 +35,7 @@#include "util/hist.h" #include "arch/common.h" +#include <dlfcn.h> #include <linux/bitmap.h> struct perf_report {
@@ -590,8 +591,19 @@ static int __cmd_report(struct perf_report *rep) ret =0 ; }else if (use_browser ==2 ) { -perf_evlist__gtk_browse_hists (session->evlist, help, -NULL , rep->min_percent); +int (*hist_browser)(struct perf_evlist *, +const char *, +struct hist_browser_timer *, +float min_pcnt); + + hist_browser =dlsym (perf_gtk_handle, +"perf_evlist__gtk_browse_hists" ); +if (hist_browser ==NULL ) { +ui__error ("GTK browser not found!\n" ); +return ret; + } +hist_browser (session->evlist, help,NULL , + rep->min_percent); } }else perf_evlist__tty_browse_hists (session->evlist, rep, help);
tools/perf/config/Makefile +9 -3
@@ -267,11 +267,11 @@ ifndef NO_GTK2 NO_GTK2 := 1 else ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2),-DHAVE_GTK_INFO_BAR),y) - CFLAGS += -DHAVE_GTK_INFO_BAR + GTK_CFLAGS := -DHAVE_GTK_INFO_BAR endif CFLAGS += -DGTK2_SUPPORT - CFLAGS += $(shell pkg-config --cflags gtk+-2.0 2>/dev/null) - EXTLIBS += $(shell pkg-config --libs gtk+-2.0 2>/dev/null) + GTK_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 2>/dev/null) + GTK_LIBS := $(shell pkg-config --libs gtk+-2.0 2>/dev/null) endif endif
@@ -456,7 +456,12 @@ else sysconfdir = $(prefix)/etc ETC_PERFCONFIG = etc/perfconfig endif +ifeq ($(IS_X86_64),1) +lib = lib64 +else lib = lib +endif +libdir = $(prefix)/$(lib) # Shell quote (do not use $(call) to accommodate ancient setups); ETC_PERFCONFIG_SQ = $(subst ','\'',$(ETC_PERFCONFIG))
@@ -469,6 +474,7 @@ template_dir_SQ = $(subst ','\'',$(template_dir)) htmldir_SQ = $(subst ','\'',$(htmldir)) prefix_SQ = $(subst ','\'',$(prefix)) sysconfdir_SQ = $(subst ','\'',$(sysconfdir)) +libdir_SQ = $(subst ','\'',$(libdir)) ifneq ($(filter /%,$(firstword $(perfexecdir))),) perfexec_instdir = $(perfexecdir)
tools/perf/ui/gtk/annotate.c +10 -3
@@ -154,9 +154,9 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,return 0 ; } -int symbol__gtk_annotate (struct symbol *sym,struct map *map, -struct perf_evsel *evsel, -struct hist_browser_timer *hbt) +static int symbol__gtk_annotate (struct symbol *sym,struct map *map, +struct perf_evsel *evsel, +struct hist_browser_timer *hbt) {GtkWidget *window;GtkWidget *notebook;
@@ -226,6 +226,13 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map,return 0 ; } +int hist_entry__gtk_annotate (struct hist_entry *he, +struct perf_evsel *evsel, +struct hist_browser_timer *hbt) +{ +return symbol__gtk_annotate (he->ms.sym, he->ms.map, evsel, hbt); +} +void perf_gtk__show_annotations (void ) {GtkWidget *window;
tools/perf/ui/gtk/gtk.h +16 -0
@@ -20,6 +20,9 @@ struct perf_gtk_context {guint statbar_ctx_id; }; +int perf_gtk__init (void ); +void perf_gtk__exit (bool wait_for_ok); +extern struct perf_gtk_context *pgctx;static inline bool perf_gtk__is_active_context (struct perf_gtk_context *ctx)
@@ -48,4 +51,17 @@ static inline GtkWidget *perf_gtk__setup_info_bar(void) }#endif +struct perf_evsel ; +struct perf_evlist ; +struct hist_entry ; +struct hist_browser_timer ; + +int perf_evlist__gtk_browse_hists (struct perf_evlist *evlist,const char *help, +struct hist_browser_timer *hbt, +float min_pcnt); +int hist_entry__gtk_annotate (struct hist_entry *he, +struct perf_evsel *evsel, +struct hist_browser_timer *hbt); +void perf_gtk__show_annotations (void ); +#endif /* _PERF_GTK_H_ */
tools/perf/ui/setup.c +59 -2
84 lines not on this page · raw message
tools/perf/ui/ui.h +1 -11
@@ -6,6 +6,7 @@#include <linux/compiler.h> extern pthread_mutex_t ui__lock; +extern void *perf_gtk_handle;extern int use_browser;
@@ -23,17 +24,6 @@ static inline int ui__init(void)static inline void ui__exit (bool wait_for_ok__maybe_unused ) {}#endif -#ifdef GTK2_SUPPORT -int perf_gtk__init (void ); -void perf_gtk__exit (bool wait_for_ok); -#else -static inline int perf_gtk__init (void ) -{ -return -1 ; -} -static inline void perf_gtk__exit (bool wait_for_ok__maybe_unused ) {} -#endif -void ui__refresh_dimensions (bool force);#endif /* _PERF_UI_H_ */
tools/perf/util/annotate.h +0 -24
@@ -165,30 +165,6 @@ static inline int symbol__tui_annotate(struct symbol *sym __maybe_unused, }#endif -#ifdef GTK2_SUPPORT -int symbol__gtk_annotate (struct symbol *sym,struct map *map, -struct perf_evsel *evsel, -struct hist_browser_timer *hbt); - -static inline int hist_entry__gtk_annotate (struct hist_entry *he, -struct perf_evsel *evsel, -struct hist_browser_timer *hbt) -{ -return symbol__gtk_annotate (he->ms.sym, he->ms.map, evsel, hbt); -} - -void perf_gtk__show_annotations (void ); -#else -static inline int hist_entry__gtk_annotate (struct hist_entry *he__maybe_unused , -struct perf_evsel *evsel__maybe_unused , -struct hist_browser_timer *hbt__maybe_unused ) -{ -return 0 ; -} - -static inline void perf_gtk__show_annotations (void ) {} -#endif -extern const char *disassembler_style;#endif /* __PERF_ANNOTATE_H */
tools/perf/util/hist.h +0 -15
@@ -224,20 +224,5 @@ static inline int script_browse(const char *script_opt __maybe_unused)#define K_SWITCH_INPUT_DATA -3000#endif -#ifdef GTK2_SUPPORT -int perf_evlist__gtk_browse_hists (struct perf_evlist *evlist,const char *help, -struct hist_browser_timer *hbt__maybe_unused , -float min_pcnt); -#else -static inline -int perf_evlist__gtk_browse_hists (struct perf_evlist *evlist__maybe_unused , -const char *help__maybe_unused , -struct hist_browser_timer *hbt__maybe_unused , -float min_pcnt__maybe_unused ) -{ -return 0 ; -} -#endif -unsigned int hists__sort_list_width (struct hists *self);#endif /* __PERF_HIST_H */
tools/perf/util/util.h +2 -0
@@ -128,6 +128,8 @@ void put_tracing_file(char *file);#endif #endif +#define PERF_GTK_DSO "libperf-gtk.so" +/* General helper functions */ extern void usage(const char *err) NORETURN; extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
Signature · 1 line
1.7.11.7
Arnaldo Carvalho de Melo
AppliedEm Fri, Sep 13, 2013 at 03:27:43PM +0900, Namhyung Kim escreveu:
Quoted 3 lines
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.
Thanks, applied
- Arnaldo
tip-bot for Namhyung Kim
merge botperf tools: Separate out GTK codes to libperf-gtk.so
Commit-ID: fc67297b16da335d610af2fac96233d51146300a Gitweb: http://git.kernel.org/tip/fc67297b16da335d610af2fac96233d51146300a Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 13 Sep 2013 15:27:43 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 9 Oct 2013 15:55:25 -0300
perf tools: Separate out GTK codes to libperf-gtk.so
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.
--- tools/perf/Makefile.perf | 42 +++++++++++++++++++++-------- tools/perf/builtin-annotate.c | 26 +++++++++++++++--- tools/perf/builtin-report.c | 16 ++++++++++-- tools/perf/config/Makefile | 12 ++++++--- tools/perf/ui/gtk/annotate.c | 13 ++++++--- tools/perf/ui/gtk/gtk.h | 16 ++++++++++++ tools/perf/ui/setup.c | 61 +++++++++++++++++++++++++++++++++++++++++-- tools/perf/ui/ui.h | 12 +-------- tools/perf/util/annotate.h | 24 ----------------- tools/perf/util/hist.h | 15 ----------- tools/perf/util/util.h | 2 ++ 11 files changed, 165 insertions(+), 74 deletions(-)
tools/perf/Makefile.perf +31 -11
@@ -114,6 +114,7 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ BUILTIN_OBJS = LIB_H = LIB_OBJS = +GTK_OBJS = PYRF_OBJS = SCRIPT_SH =
@@ -490,13 +491,19 @@ ifndef NO_SLANG endif ifndef NO_GTK2 - LIB_OBJS += $(OUTPUT)ui/gtk/browser.o - LIB_OBJS += $(OUTPUT)ui/gtk/hists.o - LIB_OBJS += $(OUTPUT)ui/gtk/setup.o - LIB_OBJS += $(OUTPUT)ui/gtk/util.o - LIB_OBJS += $(OUTPUT)ui/gtk/helpline.o - LIB_OBJS += $(OUTPUT)ui/gtk/progress.o - LIB_OBJS += $(OUTPUT)ui/gtk/annotate.o + ALL_PROGRAMS += $(OUTPUT)libperf-gtk.so + + GTK_OBJS += $(OUTPUT)ui/gtk/browser.o + GTK_OBJS += $(OUTPUT)ui/gtk/hists.o + GTK_OBJS += $(OUTPUT)ui/gtk/setup.o + GTK_OBJS += $(OUTPUT)ui/gtk/util.o + GTK_OBJS += $(OUTPUT)ui/gtk/helpline.o + GTK_OBJS += $(OUTPUT)ui/gtk/progress.o + GTK_OBJS += $(OUTPUT)ui/gtk/annotate.o + +install-gtk: $(OUTPUT)libperf-gtk.so + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)' + $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)' endif ifndef NO_LIBPERL
@@ -550,6 +557,12 @@ $(OUTPUT)perf: $(OUTPUT)perf.o $(BUILTIN_OBJS) $(PERFLIBS) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(OUTPUT)perf.o \ $(BUILTIN_OBJS) $(LIBS) -o $@ +$(GTK_OBJS): $(OUTPUT)%.o: %.c $(LIB_H) + $(QUIET_CC)$(CC) -o $@ -c -fPIC $(CFLAGS) $(GTK_CFLAGS) $< + +$(OUTPUT)libperf-gtk.so: $(GTK_OBJS) $(PERFLIBS) + $(QUIET_LINK)$(CC) -o $@ -shared $(ALL_LDFLAGS) $(filter %.o,$^) $(GTK_LIBS) + $(OUTPUT)builtin-help.o: builtin-help.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) \ '-DPERF_HTML_PATH="$(htmldir_SQ)"' \
@@ -632,6 +645,9 @@ $(OUTPUT)tests/python-use.o: tests/python-use.c $(OUTPUT)PERF-CFLAGS $(OUTPUT)util/config.o: util/config.c $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< +$(OUTPUT)ui/setup.o: ui/setup.c $(OUTPUT)PERF-CFLAGS + $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -DLIBDIR='"$(libdir_SQ)"' $< + $(OUTPUT)ui/browser.o: ui/browser.c $(OUTPUT)PERF-CFLAGS $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -DENABLE_SLFUTURE_CONST $<
@@ -673,7 +689,8 @@ $(patsubst perf-%,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h) # we compile into subdirectories. if the target directory is not the source directory, they might not exists. So # we depend the various files onto their directories. -DIRECTORY_DEPS = $(LIB_OBJS) $(BUILTIN_OBJS) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h +DIRECTORY_DEPS = $(LIB_OBJS) $(BUILTIN_OBJS) $(GTK_OBJS) +DIRECTORY_DEPS += $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h $(DIRECTORY_DEPS): | $(sort $(dir $(DIRECTORY_DEPS))) # In the second step, we make a rule to actually create these directories $(sort $(dir $(DIRECTORY_DEPS))):
@@ -786,7 +803,9 @@ check: $(OUTPUT)common-cmds.h ### Installation rules -install-bin: all +install-gtk: + +install-bin: all install-gtk $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
@@ -831,7 +850,8 @@ config-clean: @$(MAKE) -C config/feature-checks clean clean: $(LIBTRACEEVENT)-clean $(LIBLK)-clean config-clean - $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS) + $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(GTK_OBJS) + $(RM) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS) $(RM) $(ALL_PROGRAMS) perf $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
@@ -850,7 +870,7 @@ else GIT-HEAD-PHONY = endif -.PHONY: all install clean config-clean strip +.PHONY: all install clean config-clean strip install-gtk .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell .PHONY: $(GIT-HEAD-PHONY) TAGS tags cscope .FORCE-PERF-CFLAGS
tools/perf/builtin-annotate.c +23 -3
@@ -30,6 +30,7 @@#include "util/tool.h" #include "arch/common.h" +#include <dlfcn.h> #include <linux/bitmap.h> struct perf_annotate {
@@ -142,8 +143,18 @@ find_next:if (use_browser ==2 ) {int ret; +int (*annotate)(struct hist_entry *he, +struct perf_evsel *evsel, +struct hist_browser_timer *hbt); + + annotate =dlsym (perf_gtk_handle, +"hist_entry__gtk_annotate" ); +if (annotate ==NULL ) { +ui__error ("GTK browser not found!\n" ); +return ; + } - ret =hist_entry__gtk_annotate (he, evsel,NULL ); + ret =annotate (he, evsel,NULL );if (!ret || !ann->skip_missing)return ;
@@ -247,8 +258,17 @@ static int __cmd_annotate(struct perf_annotate *ann) goto out_delete; } -if (use_browser ==2 ) -perf_gtk__show_annotations (); +if (use_browser ==2 ) { +void (*show_annotations)(void ); + + show_annotations =dlsym (perf_gtk_handle, +"perf_gtk__show_annotations" ); +if (show_annotations ==NULL ) { +ui__error ("GTK browser not found!\n" ); + goto out_delete; + } +show_annotations (); + } out_delete:/*
tools/perf/builtin-report.c +14 -2
@@ -35,6 +35,7 @@#include "util/hist.h" #include "arch/common.h" +#include <dlfcn.h> #include <linux/bitmap.h> struct perf_report {
@@ -591,8 +592,19 @@ static int __cmd_report(struct perf_report *rep) ret =0 ; }else if (use_browser ==2 ) { -perf_evlist__gtk_browse_hists (session->evlist, help, -NULL , rep->min_percent); +int (*hist_browser)(struct perf_evlist *, +const char *, +struct hist_browser_timer *, +float min_pcnt); + + hist_browser =dlsym (perf_gtk_handle, +"perf_evlist__gtk_browse_hists" ); +if (hist_browser ==NULL ) { +ui__error ("GTK browser not found!\n" ); +return ret; + } +hist_browser (session->evlist, help,NULL , + rep->min_percent); } }else perf_evlist__tty_browse_hists (session->evlist, rep, help);
tools/perf/config/Makefile +9 -3
@@ -377,11 +377,11 @@ ifndef NO_GTK2 NO_GTK2 := 1 else ifeq ($(feature-gtk2-infobar), 1) - CFLAGS += -DHAVE_GTK_INFO_BAR_SUPPORT + GTK_CFLAGS := -DHAVE_GTK_INFO_BAR_SUPPORT endif CFLAGS += -DHAVE_GTK2_SUPPORT - CFLAGS += $(shell pkg-config --cflags gtk+-2.0 2>/dev/null) - EXTLIBS += $(shell pkg-config --libs gtk+-2.0 2>/dev/null) + GTK_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 2>/dev/null) + GTK_LIBS := $(shell pkg-config --libs gtk+-2.0 2>/dev/null) endif endif
@@ -554,7 +554,12 @@ else sysconfdir = $(prefix)/etc ETC_PERFCONFIG = etc/perfconfig endif +ifeq ($(IS_X86_64),1) +lib = lib64 +else lib = lib +endif +libdir = $(prefix)/$(lib) # Shell quote (do not use $(call) to accommodate ancient setups); ETC_PERFCONFIG_SQ = $(subst ','\'',$(ETC_PERFCONFIG))
@@ -567,6 +572,7 @@ template_dir_SQ = $(subst ','\'',$(template_dir)) htmldir_SQ = $(subst ','\'',$(htmldir)) prefix_SQ = $(subst ','\'',$(prefix)) sysconfdir_SQ = $(subst ','\'',$(sysconfdir)) +libdir_SQ = $(subst ','\'',$(libdir)) ifneq ($(filter /%,$(firstword $(perfexecdir))),) perfexec_instdir = $(perfexecdir)
tools/perf/ui/gtk/annotate.c +10 -3
@@ -154,9 +154,9 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,return 0 ; } -int symbol__gtk_annotate (struct symbol *sym,struct map *map, -struct perf_evsel *evsel, -struct hist_browser_timer *hbt) +static int symbol__gtk_annotate (struct symbol *sym,struct map *map, +struct perf_evsel *evsel, +struct hist_browser_timer *hbt) {GtkWidget *window;GtkWidget *notebook;
@@ -226,6 +226,13 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map,return 0 ; } +int hist_entry__gtk_annotate (struct hist_entry *he, +struct perf_evsel *evsel, +struct hist_browser_timer *hbt) +{ +return symbol__gtk_annotate (he->ms.sym, he->ms.map, evsel, hbt); +} +void perf_gtk__show_annotations (void ) {GtkWidget *window;
tools/perf/ui/gtk/gtk.h +16 -0
@@ -20,6 +20,9 @@ struct perf_gtk_context {guint statbar_ctx_id; }; +int perf_gtk__init (void ); +void perf_gtk__exit (bool wait_for_ok); +extern struct perf_gtk_context *pgctx;static inline bool perf_gtk__is_active_context (struct perf_gtk_context *ctx)
@@ -48,4 +51,17 @@ static inline GtkWidget *perf_gtk__setup_info_bar(void) }#endif +struct perf_evsel ; +struct perf_evlist ; +struct hist_entry ; +struct hist_browser_timer ; + +int perf_evlist__gtk_browse_hists (struct perf_evlist *evlist,const char *help, +struct hist_browser_timer *hbt, +float min_pcnt); +int hist_entry__gtk_annotate (struct hist_entry *he, +struct perf_evsel *evsel, +struct hist_browser_timer *hbt); +void perf_gtk__show_annotations (void ); +#endif /* _PERF_GTK_H_ */
tools/perf/ui/setup.c +59 -2
84 lines not on this page · raw message
tools/perf/ui/ui.h +1 -11
@@ -6,6 +6,7 @@#include <linux/compiler.h> extern pthread_mutex_t ui__lock; +extern void *perf_gtk_handle;extern int use_browser;
@@ -23,17 +24,6 @@ static inline int ui__init(void)static inline void ui__exit (bool wait_for_ok__maybe_unused ) {}#endif -#ifdef HAVE_GTK2_SUPPORT -int perf_gtk__init (void ); -void perf_gtk__exit (bool wait_for_ok); -#else -static inline int perf_gtk__init (void ) -{ -return -1 ; -} -static inline void perf_gtk__exit (bool wait_for_ok__maybe_unused ) {} -#endif -void ui__refresh_dimensions (bool force);#endif /* _PERF_UI_H_ */
tools/perf/util/annotate.h +0 -24
@@ -165,30 +165,6 @@ static inline int symbol__tui_annotate(struct symbol *sym __maybe_unused, }#endif -#ifdef HAVE_GTK2_SUPPORT -int symbol__gtk_annotate (struct symbol *sym,struct map *map, -struct perf_evsel *evsel, -struct hist_browser_timer *hbt); - -static inline int hist_entry__gtk_annotate (struct hist_entry *he, -struct perf_evsel *evsel, -struct hist_browser_timer *hbt) -{ -return symbol__gtk_annotate (he->ms.sym, he->ms.map, evsel, hbt); -} - -void perf_gtk__show_annotations (void ); -#else -static inline int hist_entry__gtk_annotate (struct hist_entry *he__maybe_unused , -struct perf_evsel *evsel__maybe_unused , -struct hist_browser_timer *hbt__maybe_unused ) -{ -return 0 ; -} - -static inline void perf_gtk__show_annotations (void ) {} -#endif -extern const char *disassembler_style;#endif /* __PERF_ANNOTATE_H */
tools/perf/util/hist.h +0 -15
@@ -228,20 +228,5 @@ static inline int script_browse(const char *script_opt __maybe_unused)#define K_SWITCH_INPUT_DATA -3000#endif -#ifdef HAVE_GTK2_SUPPORT -int perf_evlist__gtk_browse_hists (struct perf_evlist *evlist,const char *help, -struct hist_browser_timer *hbt__maybe_unused , -float min_pcnt); -#else -static inline -int perf_evlist__gtk_browse_hists (struct perf_evlist *evlist__maybe_unused , -const char *help__maybe_unused , -struct hist_browser_timer *hbt__maybe_unused , -float min_pcnt__maybe_unused ) -{ -return 0 ; -} -#endif -unsigned int hists__sort_list_width (struct hists *self);#endif /* __PERF_HIST_H */
tools/perf/util/util.h +2 -0
@@ -128,6 +128,8 @@ void put_tracing_file(char *file);#endif #endif +#define PERF_GTK_DSO "libperf-gtk.so" +/* General helper functions */ extern void usage(const char *err) NORETURN; extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));