perf ui/gtk: Separate out GTK code to a shared object (v2)
Namhyung Kim
maintainercover perf ui/gtk: Separate out GTK code to a shared object (v2)
Hi,
This is v2 of gtk code separation patchset to reduce library dependencies of the perf executable.
I only built libperf-gtk.so with -fPIC, and it's not linked to libperf at build time. All unresolved symbols used for perf should be resolved at runtime via perf executable (so libperf.a) - I didn't know that the linker permits unresolved symbols in a shared library at build time.
Tested on my x86-64 machine only. It seems work well for me.
The patch 1 is a bug fix and can be applied independently.
You can find it on my 'perf/separate-v2' branch in my tree at:
git://git.kernel.org/pub/scm/linux/kernel/git/namhyung/linux-perf.git
Any comments are welcome, thanks
Namhyung
Namhyung Kim (4):
perf ui/gtk: Fix segmentation fault on perf_hpp__for_each_format loop perf tools: Separate out GTK codes to libperf-gtk.so
perf tools: Setup GTK browser dynamically
perf tools: Run dynamic loaded GTK browser
tools/perf/Makefile | 39 +++++++++++++++++++++++---------- 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/gtk/hists.c | 2 -- tools/perf/ui/setup.c | 51 +++++++++++++++++++++++++++++++++++++++++-- tools/perf/ui/ui.h | 12 +--------- tools/perf/util/annotate.h | 24 -------------------- tools/perf/util/hist.h | 15 ------------- 11 files changed, 150 insertions(+), 76 deletions(-)
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 1/4 perf ui/gtk: Fix segmentation fault on perf_hpp__for_each_format loop
From: Namhyung Kim <[email protected]>
The commit 2b8bfa6bb8a7 ("perf tools: Centralize default columns init in perf_hpp__init") moves initialization of common overhead column to perf_hpp__init() but forgot about the gtk code.
So the gtk code added the same column to the list twice causing infinite loop when iterating it by perf_hpp__for_each_format loop. When I run perf report --gtk, I can see following messages indefinitely.
(perf:11687): Gtk-CRITICAL **: IA__gtk_main_quit: assertion 'main_loops != NULL' failed
perf: Segmentation fault
--- tools/perf/ui/gtk/hists.c | 2 -- 1 file changed, 2 deletions(-)
tools/perf/ui/gtk/hists.c +0 -2
@@ -109,8 +109,6 @@ __HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us)void perf_gtk__init_hpp (void ) { -perf_hpp__column_enable (PERF_HPP__OVERHEAD ); -perf_hpp__init (); perf_hpp__format[PERF_HPP__OVERHEAD].color =
Signature · 1 line
1.7.11.7
Re: [PATCH 1/4] perf ui/gtk: Fix segmentation fault on perf_hpp__for_each_format loop
Quoted 11 lines · Namhyung Kim
From: Namhyung Kim <[email protected]>
The commit
2b8bfa6bb8a7("perf tools: Centralize default columns init inperf_hpp__init") moves initialization of common overhead column toperf_hpp__init()but forgot about the gtk code.So the gtk code added the same column to the list twice causing infinite loop when iterating it by
perf_hpp__for_each_formatloop. When I run perf report --gtk, I can see following messages indefinitely.
Quoted 7 lines
(perf:11687): Gtk-CRITICAL **:
IA__gtk_main_quit: assertion 'main_loops!= NULL' failed
perf: Segmentation faultCc Jiri Olsa <[email protected]>Cc Pekka Enberg <[email protected]>Cc Andi Kleen <[email protected]>Signed-off-by Namhyung Kim <[email protected]>
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf ui/gtk: Fix segmentation fault on perf_hpp__for_each_format loop
In reply to Namhyung Kimperf ui/gtk: Fix segmentation fault on perf_hpp__for_each_format loop
Commit-ID: d50bf78ff69297d3f60aa778c272acc8e5f59a19 Gitweb: http://git.kernel.org/tip/d50bf78ff69297d3f60aa778c272acc8e5f59a19 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 6 Aug 2013 14:14:13 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 7 Aug 2013 17:35:39 -0300
perf ui/gtk: Fix segmentation fault on perf_hpp__for_each_format loop
The commit 2b8bfa6bb8a7 ("perf tools: Centralize default columns init in perf_hpp__init") moves initialization of common overhead column to perf_hpp__init() but forgot about the gtk code.
So the gtk code added the same column to the list twice causing infinite loop when iterating it by perf_hpp__for_each_format loop. When I run perf report --gtk, I can see following messages indefinitely.
(perf:11687): Gtk-CRITICAL **: IA__gtk_main_quit: assertion 'main_loops != NULL' failed
perf: Segmentation fault
--- tools/perf/ui/gtk/hists.c | 2 -- 1 file changed, 2 deletions(-)
tools/perf/ui/gtk/hists.c +0 -2
@@ -109,8 +109,6 @@ __HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us)void perf_gtk__init_hpp (void ) { -perf_hpp__column_enable (PERF_HPP__OVERHEAD ); -perf_hpp__init (); perf_hpp__format[PERF_HPP__OVERHEAD].color =
Namhyung Kim
maintainerPATCH 2/4 perf tools: Separate out GTK codes to libperf-gtk.so
In reply to Namhyung KimSeparate 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.
--- tools/perf/Makefile | 39 ++++++++++++++++++++++++++++----------- tools/perf/config/Makefile | 14 ++++++++++---- 2 files changed, 38 insertions(+), 15 deletions(-)
tools/perf/Makefile +28 -11
@@ -113,6 +113,7 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ BUILTIN_OBJS = LIB_H = LIB_OBJS = +GTK_OBJS = PYRF_OBJS = SCRIPT_SH =
@@ -484,13 +485,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
@@ -544,6 +551,12 @@ $(OUTPUT)perf: $(OUTPUT)perf.o $(BUILTIN_OBJS) $(PERFLIBS) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(OUTPUT)perf.o \ $(BUILTIN_OBJS) $(LIBS) -o $@ +$(GTK_OBJS): %.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)"' \
@@ -762,7 +775,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)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'
@@ -795,15 +810,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/config/Makefile +10 -4
@@ -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 += -DGTK2_SUPPORT + 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)
Signature · 1 line
1.7.11.7
Re: [PATCH 2/4] perf tools: Separate out GTK codes to libperf-gtk.so
Quoted 6 lines · Namhyung Kim
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.
Cc Andi Kleen <[email protected]>Cc Pekka Enberg <[email protected]>Signed-off-by Namhyung Kim <[email protected]>
Namhyung Kim
maintainerPATCH 3/4 perf tools: Setup GTK browser dynamically
In reply to Namhyung KimCall setup/exit GTK browser function using libdl.
--- tools/perf/ui/gtk/gtk.h | 3 +++ tools/perf/ui/setup.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++-- tools/perf/ui/ui.h | 12 +----------- 3 files changed, 53 insertions(+), 13 deletions(-)
tools/perf/ui/gtk/gtk.h +3 -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)
tools/perf/ui/setup.c +49 -2
73 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_ */
Signature · 1 line
1.7.11.7
Re: [PATCH 3/4] perf tools: Setup GTK browser dynamically
Quoted 5 lines · Namhyung Kim
Call setup/exit GTK browser function using libdl.
Cc Andi Kleen <[email protected]>Cc Pekka Enberg <[email protected]>Signed-off-by Namhyung Kim <[email protected]>
Namhyung Kim
maintainerPATCH 4/4 perf tools: Run dynamic loaded GTK browser
In reply to Namhyung KimRun GTK hist and annotation browser using libdl.
--- tools/perf/builtin-annotate.c | 26 +++++++++++++++++++++++--- tools/perf/builtin-report.c | 16 ++++++++++++++-- tools/perf/config/Makefile | 2 +- tools/perf/ui/gtk/annotate.c | 13 ++++++++++--- tools/perf/ui/gtk/gtk.h | 13 +++++++++++++ tools/perf/util/annotate.h | 24 ------------------------ tools/perf/util/hist.h | 15 --------------- 7 files changed, 61 insertions(+), 48 deletions(-)
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 {
@@ -143,8 +144,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 ;
@@ -246,8 +257,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 {
@@ -592,8 +593,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 +1 -1
@@ -269,7 +269,7 @@ ifndef NO_GTK2 ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2),-DHAVE_GTK_INFO_BAR),y) GTK_CFLAGS := -DHAVE_GTK_INFO_BAR endif - GTK_CFLAGS += -DGTK2_SUPPORT + CFLAGS += -DGTK2_SUPPORT 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
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 +13 -0
@@ -51,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/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
Re: [PATCH 4/4] perf tools: Run dynamic loaded GTK browser
Quoted 5 lines · Namhyung Kim
Run GTK hist and annotation browser using libdl.
Cc Andi Kleen <[email protected]>Cc Pekka Enberg <[email protected]>Signed-off-by Namhyung Kim <[email protected]>
Em Tue, Aug 06, 2013 at 02:14:12PM +0900, Namhyung Kim escreveu:
Quoted 5 lines
Hi,
This is v2 of gtk code separation patchset to reduce library dependencies of the perf executable.
Quoted 7 lines
I only built libperf-gtk.so with -fPIC, and it's not linked to libperf at build time. All unresolved symbols used for perf should be resolved at runtime via perf executable (so libperf.a) - I didn't know that the linker permits unresolved symbols in a shared library at build time.
Tested on my x86-64 machine only. It seems work well for me.
Not for me, please take a look at O= handling:
[acme@sandy linux]$ make -j8 O=/tmp/build/perf -C tools/perf/ install <SNIP>
CHK gtk2
CHK -DHAVE_GTK_INFO_BAR
<SNIP>
make: Entering directory `/home/acme/git/linux/tools/perf'
make: *** No rule to make target /tmp/build/perf/ui/gtk/browser.c', needed by /tmp/build/perf/ui/gtk/browser.o'. Stop.
make: *** Waiting for unfinished jobs....
make[1]: Entering directory /home/acme/git/linux/tools/lib/traceevent' make[2]: warning: jobserver unavailable: using -j1. Add +' to parent make rule.
make[1]: Entering directory `/home/acme/git/linux/tools/lib/lk'
AR liblk.a
make[1]: Leaving directory /home/acme/git/linux/tools/lib/traceevent' make[1]: Leaving directory /home/acme/git/linux/tools/lib/lk'
make: Leaving directory `/home/acme/git/linux/tools/perf' [acme@sandy linux]$
Quoted 1 line
The patch 1 is a bug fix and can be applied independently.
I took it, thanks.