Remove redundant trace-cmd plugin handling logic
v3 cover Remove redundant trace-cmd plugin handling logic
Currently there are no trace-cmd related plugins, all of them are designed to be used with libtraceeevnt. As both libtraceevent and trace-cmd have logic for managing plugins, the one in trace-cmd is redundant. Those redundant code is removed and replaced with calls to libtraceeevnt plugin APIs. When trace-cmd has to load any plugins, it uses libtraceeevnt to do the job.
All existing plugins are moved from plugins/ to lib/traceevent/plugins directory, as all of them are designed to be used with the traceevent library.
An initial infrastructure for trace-cmd specific plugins is added - new lib/trace-cmd/plugins directory and initial set of APIs for working with trace-cmd plugins.
Tzvetomir Stoyanov (1):
trace-cmd: Change plugin install directories
Tzvetomir Stoyanov (VMware) (4):
trace-cmd: Move libtraceevent plugins in its own directory.
trace-cmd: Rename plugin_python to plugin_python_loader.
trace-cmd: Load libtraceevent plugins from build folder, if exists.
trace-cmd: Add initial infrastructure for trace-cmd specific plugins.
.gitignore | 4 +-
Makefile | 83 +++--
include/trace-cmd/trace-cmd.h | 44 ++-
lib/trace-cmd/Makefile | 3 +-
lib/trace-cmd/plugins/Makefile | 58 ++++
lib/trace-cmd/trace-plugin.c | 313 ++++++++++++++++++
lib/traceevent/event-plugin.c | 34 +-
{plugins => lib/traceevent/plugins}/Makefile | 16 +-
.../traceevent/plugins}/plugin_blk.c | 0
.../traceevent/plugins}/plugin_cfg80211.c | 0
.../traceevent/plugins}/plugin_function.c | 0
.../traceevent/plugins}/plugin_futex.c | 0
.../traceevent/plugins}/plugin_hrtimer.c | 0
.../traceevent/plugins}/plugin_jbd2.c | 0
.../traceevent/plugins}/plugin_kmem.c | 0
.../traceevent/plugins}/plugin_kvm.c | 0
.../traceevent/plugins}/plugin_mac80211.c | 0
.../traceevent/plugins/plugin_python_loader.c | 0
.../traceevent/plugins}/plugin_sched_switch.c | 0
.../traceevent/plugins}/plugin_scsi.c | 0
.../traceevent/plugins}/plugin_tlb.c | 0
.../traceevent/plugins}/plugin_xen.c | 0
22 files changed, 505 insertions(+), 50 deletions(-)
create mode 100644 lib/trace-cmd/plugins/Makefile
create mode 100644 lib/trace-cmd/trace-plugin.c
rename {plugins => lib/traceevent/plugins}/Makefile (81%)
rename {plugins => lib/traceevent/plugins}/plugin_blk.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_cfg80211.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_function.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_futex.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_hrtimer.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_jbd2.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_kmem.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_kvm.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_mac80211.c (100%)
rename plugins/plugin_python.c => lib/traceevent/plugins/plugin_python_loader.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_sched_switch.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_scsi.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_tlb.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_xen.c (100%)Signature · 1 line
2.21.0
PATCH v3 1/5 trace-cmd: Move libtraceevent plugins in its own directory.
All existing plugins are moved from plugins/ to plugins/traceevent/ directory, as all of them (except plugin_python) are designed to be used with the traceevent library. This change paves the way for implementing trace-cmd specific plugins.
---
.gitignore | 2 +-
Makefile | 28 +++++++++----------
lib/trace-cmd/Makefile | 2 --
{plugins => lib/traceevent/plugins}/Makefile | 6 ++--
.../traceevent/plugins}/plugin_blk.c | 0
.../traceevent/plugins}/plugin_cfg80211.c | 0
.../traceevent/plugins}/plugin_function.c | 0
.../traceevent/plugins}/plugin_futex.c | 0
.../traceevent/plugins}/plugin_hrtimer.c | 0
.../traceevent/plugins}/plugin_jbd2.c | 0
.../traceevent/plugins}/plugin_kmem.c | 0
.../traceevent/plugins}/plugin_kvm.c | 0
.../traceevent/plugins}/plugin_mac80211.c | 0
.../traceevent/plugins}/plugin_python.c | 0
.../traceevent/plugins}/plugin_sched_switch.c | 0
.../traceevent/plugins}/plugin_scsi.c | 0
.../traceevent/plugins}/plugin_tlb.c | 0
.../traceevent/plugins}/plugin_xen.c | 0
18 files changed, 18 insertions(+), 20 deletions(-)
rename {plugins => lib/traceevent/plugins}/Makefile (93%)
rename {plugins => lib/traceevent/plugins}/plugin_blk.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_cfg80211.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_function.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_futex.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_hrtimer.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_jbd2.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_kmem.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_kvm.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_mac80211.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_python.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_sched_switch.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_scsi.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_tlb.c (100%)
rename {plugins => lib/traceevent/plugins}/plugin_xen.c (100%).gitignore +1 -1
@@ -18,5 +18,5 @@ ctracecmdgui_wrap.c tags TAGS cscope* -trace_plugin_dir +traceevent_plugin_dir trace_python_dir
Makefile +14 -14
@@ -273,16 +273,16 @@ gui: force $(CMD_TARGETS) $(kshark-dir)/build/Makefile trace-cmd: force $(LIBTRACEEVENT_STATIC) $(LIBTRACECMD_STATIC) $(Q)$(MAKE) -C $(src)/tracecmd $(obj)/tracecmd/$@ -$(LIBTRACEEVENT_SHARED): force +$(LIBTRACEEVENT_SHARED): force $(obj)/lib/traceevent/plugins/traceevent_plugin_dir $(Q)$(MAKE) -C $(src)/lib/traceevent $@ -$(LIBTRACEEVENT_STATIC): force +$(LIBTRACEEVENT_STATIC): force $(obj)/lib/traceevent/plugins/traceevent_plugin_dir $(Q)$(MAKE) -C $(src)/lib/traceevent $@ -$(LIBTRACECMD_STATIC): force $(obj)/plugins/trace_plugin_dir +$(LIBTRACECMD_STATIC): force $(Q)$(MAKE) -C $(src)/lib/trace-cmd $@ -$(LIBTRACECMD_SHARED): force $(obj)/plugins/trace_plugin_dir +$(LIBTRACECMD_SHARED): force $(Q)$(MAKE) -C $(src)/lib/trace-cmd $@ libtraceevent.so: $(LIBTRACEEVENT_SHARED)
@@ -292,14 +292,14 @@ libtracecmd.so: $(LIBTRACECMD_SHARED) libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) -plugins: force $(obj)/plugins/trace_plugin_dir $(obj)/plugins/trace_python_dir - $(Q)$(MAKE) -C $(src)/plugins +plugins: force $(obj)/lib/traceevent/plugins/traceevent_plugin_dir $(obj)/lib/traceevent/plugins/trace_python_dir + $(Q)$(MAKE) -C $(src)/lib/traceevent/plugins -$(obj)/plugins/trace_plugin_dir: force - $(Q)$(MAKE) -C $(src)/plugins $@ +$(obj)/lib/traceevent/plugins/traceevent_plugin_dir: force + $(Q)$(MAKE) -C $(src)/lib/traceevent/plugins $@ -$(obj)/plugins/trace_python_dir: force - $(Q)$(MAKE) -C $(src)/plugins $@ +$(obj)/lib/traceevent/plugins/trace_python_dir: force + $(Q)$(MAKE) -C $(src)/lib/traceevent/plugins $@ show_gui_make: @echo "Note: to build the gui, type \"make gui\""
@@ -325,7 +325,7 @@ cscope: force $(call find_tag_files) | cscope -b -q install_plugins: force - $(Q)$(MAKE) -C $(src)/plugins $@ + $(Q)$(MAKE) -C $(src)/lib/traceevent/plugins $@ install_python: force $(Q)$(MAKE) -C $(src)/python $@
@@ -372,7 +372,7 @@ clean: $(RM) tags TAGS cscope* $(MAKE) -C $(src)/lib/traceevent clean $(MAKE) -C $(src)/lib/trace-cmd clean - $(MAKE) -C $(src)/plugins clean + $(MAKE) -C $(src)/lib/traceevent/plugins clean $(MAKE) -C $(src)/python clean $(MAKE) -C $(src)/tracecmd clean if [ -f $(kshark-dir)/build/Makefile ]; then $(MAKE) -C $(kshark-dir)/build clean; fi
@@ -421,8 +421,8 @@ python-gui: $(PYTHON_GUI) PHONY += python-plugin python-plugin: $(PYTHON_PLUGINS) -plugin_python.so: force $(obj)/plugins/trace_python_dir - $(Q)$(MAKE) -C $(src)/plugins $(obj)/plugins/plugin_python.so +plugin_python.so: force $(obj)/lib/traceevent/plugins/trace_python_dir + $(Q)$(MAKE) -C $(src)/lib/traceevent/plugins $(obj)/lib/traceevent/plugins/plugin_python.so dist: git archive --format=tar --prefix=trace-cmd-$(TRACECMD_VERSION)/ HEAD \
lib/trace-cmd/Makefile +0 -2
@@ -40,8 +40,6 @@ $(bdir)/libtracecmd.so: $(OBJS) $(bdir)/%.o: %.c $(Q)$(call do_fpic_compile) -$(bdir)/trace-util.o: $(obj)/plugins/trace_plugin_dir - $(DEPS): $(bdir)/.%.d: %.c $(Q)$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@
lib/traceevent/plugins/Makefile renamed from plugins/Makefile +3 -3
@@ -1,6 +1,6 @@ include $(src)/scripts/utils.mk -bdir:=$(obj)/plugins +bdir:=$(obj)/lib/traceevent/plugins PLUGIN_OBJS = PLUGIN_OBJS += plugin_jbd2.o
@@ -61,7 +61,7 @@ install_plugins: $(PLUGINS_INSTALL) # and $(PYTHON_DIR) change. Without them, a full clean build would necessary # in order to get the binaries updated. -$(bdir)/trace_plugin_dir: $(bdir) force +$(bdir)/traceevent_plugin_dir: $(bdir) force $(Q)$(N)$(call update_dir, 'PLUGIN_DIR=$(PLUGIN_DIR)') $(bdir)/trace_python_dir: $(bdir) force
@@ -75,7 +75,7 @@ ifneq ($(dep_includes),) endif clean: - $(RM) -f $(bdir)/*.a $(bdir)/*.so $(bdir)/*.o $(bdir)/.*.d $(bdir)/trace_plugin_dir $(bdir)/trace_python_dir + $(RM) -f $(bdir)/*.a $(bdir)/*.so $(bdir)/*.o $(bdir)/.*.d $(bdir)/traceevent_plugin_dir $(bdir)/trace_python_dir force: .PHONY: clean force
lib/traceevent/plugins/plugin_blk.c renamed from plugins/plugin_blk.c +0 -0
lib/traceevent/plugins/plugin_cfg80211.c renamed from plugins/plugin_cfg80211.c +0 -0
lib/traceevent/plugins/plugin_function.c renamed from plugins/plugin_function.c +0 -0
lib/traceevent/plugins/plugin_futex.c renamed from plugins/plugin_futex.c +0 -0
lib/traceevent/plugins/plugin_hrtimer.c renamed from plugins/plugin_hrtimer.c +0 -0
lib/traceevent/plugins/plugin_jbd2.c renamed from plugins/plugin_jbd2.c +0 -0
lib/traceevent/plugins/plugin_kmem.c renamed from plugins/plugin_kmem.c +0 -0
lib/traceevent/plugins/plugin_kvm.c renamed from plugins/plugin_kvm.c +0 -0
lib/traceevent/plugins/plugin_mac80211.c renamed from plugins/plugin_mac80211.c +0 -0
lib/traceevent/plugins/plugin_python.c renamed from plugins/plugin_python.c +0 -0
lib/traceevent/plugins/plugin_sched_switch.c renamed from plugins/plugin_sched_switch.c +0 -0
lib/traceevent/plugins/plugin_scsi.c renamed from plugins/plugin_scsi.c +0 -0
lib/traceevent/plugins/plugin_tlb.c renamed from plugins/plugin_tlb.c +0 -0
lib/traceevent/plugins/plugin_xen.c renamed from plugins/plugin_xen.c +0 -0
Signature · 1 line
2.21.0
PATCH v3 2/5 trace-cmd: Rename plugin_python to plugin_python_loader.
In reply to Tzvetomir Stoyanov (VMware)The plugin_python is renamed to plugin_python_loader, to make the name more closer to the actual plugin role.
---
Makefile | 10 +---------
lib/traceevent/plugins/Makefile | 6 +++---
.../{plugin_python.c => plugin_python_loader.c} | 0
3 files changed, 4 insertions(+), 12 deletions(-)
rename lib/traceevent/plugins/{plugin_python.c => plugin_python_loader.c} (100%)Makefile +1 -9
@@ -116,8 +116,7 @@ PYTHON_PKGCONFIG_VERS ?= $(PYTHON_VERS) # Can build python? ifeq ($(shell sh -c "pkg-config --cflags $(PYTHON_PKGCONFIG_VERS) > /dev/null 2>&1 && echo y"), y) - PYTHON_PLUGINS := plugin_python.so - BUILD_PYTHON := $(PYTHON) $(PYTHON_PLUGINS) + BUILD_PYTHON := $(PYTHON) BUILD_PYTHON_WORKS := 1 else BUILD_PYTHON := report_nopythondev
@@ -125,7 +124,6 @@ else endif endif # NO_PYTHON -export PYTHON_PLUGINS export BUILD_PYTHON_WORKS export NO_PYTHON
@@ -418,12 +416,6 @@ python: $(PYTHON) PHONY += python-gui python-gui: $(PYTHON_GUI) -PHONY += python-plugin -python-plugin: $(PYTHON_PLUGINS) - -plugin_python.so: force $(obj)/lib/traceevent/plugins/trace_python_dir - $(Q)$(MAKE) -C $(src)/lib/traceevent/plugins $(obj)/lib/traceevent/plugins/plugin_python.so - dist: git archive --format=tar --prefix=trace-cmd-$(TRACECMD_VERSION)/ HEAD \ > ../trace-cmd-$(TRACECMD_VERSION).tar
lib/traceevent/plugins/Makefile +3 -3
@@ -21,7 +21,7 @@ PLUGIN_OBJS := $(PLUGIN_OBJS:%.o=$(bdir)/%.o) PLUGIN_BUILD := $(PLUGIN_OBJS:$(bdir)/%.o=$(bdir)/%.so) PLUGINS := $(PLUGIN_BUILD) ifndef NO_PYTHON -PLUGINS += $(bdir)/plugin_python.so +PLUGINS += $(bdir)/plugin_python_loader.so endif DEPS := $(PLUGIN_OBJS:$(bdir)/%.o=$(bdir)/.%.d)
@@ -44,10 +44,10 @@ $(DEPS): $(bdir)/.%.d: %.c $(PLUGIN_OBJS): $(bdir)/%.o : $(bdir)/.%.d -$(bdir)/plugin_python.o: $(bdir)/%.o : %.c $(bdir)/trace_python_dir +$(bdir)/plugin_python_loader.o: $(bdir)/%.o : %.c $(bdir)/trace_python_dir $(Q)$(do_compile_python_plugin_obj) -$(bdir)/plugin_python.so: $(bdir)/%.so: $(bdir)/%.o +$(bdir)/plugin_python_loader.so: $(bdir)/%.so: $(bdir)/%.o $(Q)$(do_python_plugin_build) PLUGINS_INSTALL = $(subst .so,.install,$(PLUGINS))
lib/traceevent/plugins/plugin_python_loader.c renamed from lib/traceevent/plugins/plugin_python.c +0 -0
Signature · 1 line
2.21.0
PATCH v3 3/5 trace-cmd: Load libtraceevent plugins from build folder, if exists.
In reply to Tzvetomir Stoyanov (VMware)When a development version of trace-cmd is built and run on the machine, by default it loads only installed plugins, from system drierctories. Thus, the development plugins will not be loaded. To simplify the development process, a new logic is added:
At plugins load time, check the location of trace-cmd application and look for "plugins" directory around it. If found, load plugins from it. Those pluigins will be loaded last, so in case of duplication the "development" plugins win.
--- lib/traceevent/event-plugin.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
lib/traceevent/event-plugin.c +28 -0
@@ -14,6 +14,7 @@#include <unistd.h> #include <dirent.h> #include <errno.h> +#include <libgen.h> #include "event-parse.h" #include "event-parse-local.h" #include "event-utils.h"
@@ -538,6 +539,27 @@ load_plugins_dir(struct tep_handle *tep, const char *suffix,closedir (dir); } +static char *get_source_plugins_dir (void ) +{ +char *p, path[PATH_MAX +1 ]; +int ret; + + ret =readlink ("/proc/self/exe" , path,PATH_MAX ); +if (ret >PATH_MAX || ret <0 ) +return NULL ; + +dirname (path); + p =strrchr (path,'/' ); +if (!p) +return NULL ; +/* Check if we are in the the source tree */ +if (strcmp (p,"/tracecmd" ) !=0 ) +return NULL ; + +strcpy (p,"/lib/traceevent/plugins" ); +return strdup (path); +} + void tep_load_plugins_hook(struct tep_handle *tep, const char *suffix, void (*load_plugin)(struct tep_handle *tep, const char *path,
@@ -588,6 +610,12 @@ void tep_load_plugins_hook(struct tep_handle *tep, const char *suffix,load_plugins_dir (tep, suffix, path, load_plugin, data);free (path); + + path =get_source_plugins_dir (); +if (path) { +load_plugins_dir (tep, suffix, path, load_plugin, data); +free (path); + } } struct tep_plugin_list*
Signature · 1 line
2.21.0
Re: [PATCH v3 3/5] trace-cmd: Load libtraceevent plugins from build folder, if exists.
Quoted 35 lines · On Wed, 2 Oct 2019 14:41:50 +0300 "Tzvetomir Stoyanov (VMware)"…
When a development version of trace-cmd is built and run on the machine, by default it loads only installed plugins, from system drierctories. Thus, the development plugins will not be loaded. To simplify the development process, a new logic is added:
At plugins load time, check the location of trace-cmd application and look for "plugins" directory around it. If found, load plugins from it. Those pluigins will be loaded last, so in case of duplication the "development" plugins win.Signed-off-by Tzvetomir Stoyanov (VMware) <[email protected]>--- lib/traceevent/event-plugin.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)lib/traceevent/event-plugin.c +6
-0@@ -14,6 +14,7 @@#include <unistd.h> #include <dirent.h> #include <errno.h> +#include <libgen.h> #include "event-parse.h" #include "event-parse-local.h" #include "event-utils.h" @@ -538,6 +539,27 @@ load_plugins_dir(struct tep_handle *tep, const char *suffix,closedir (dir); } +static char *get_source_plugins_dir (void ) +{ +char *p, path[PATH_MAX +1 ]; +int ret; +
lib/traceevent/event-plugin.c load_plugins_dir(struct tep_handle *tep, const char *suffix, · line 556
Quoted 10 lines
lib/traceevent/event-plugin.c +10
-0+ ret =readlink ("/proc/self/exe" , path,PATH_MAX ); +if (ret >PATH_MAX || ret <0 ) +return NULL ; + +dirname (path); + p =strrchr (path,'/' ); +if (!p) +return NULL ; +/* Check if we are in the the source tree */ +if (strcmp (p,"/tracecmd" ) !=0 )
Hmm, this is in the lib/libtraceevent directory. We shouldn't be referencing trace-cmd code here. We should have a way to override the plugins from the trace-cmd side, perhaps after tep_load_plugins_hook() gets called?
-- Steve
Quoted 22 lines
lib/traceevent/event-plugin.c +12
-0+return NULL ; + +strcpy (p,"/lib/traceevent/plugins" ); +return strdup (path); +} + void tep_load_plugins_hook(struct tep_handle *tep, const char *suffix, void (*load_plugin)(struct tep_handle *tep, const char *path,@@ -588,6 +610,12 @@ void tep_load_plugins_hook(struct tep_handle *tep, const char *suffix,load_plugins_dir (tep, suffix, path, load_plugin, data);free (path); + + path =get_source_plugins_dir (); +if (path) { +load_plugins_dir (tep, suffix, path, load_plugin, data); +free (path); + } } struct tep_plugin_list*
Re: [PATCH v3 3/5] trace-cmd: Load libtraceevent plugins from build folder, if exists.
Quoted 46 lines · Steven Rostedt
Quoted 42 lines · On Wed, 2 Oct 2019 14:41:50 +0300 "Tzvetomir Stoyanov (VMware)"…
When a development version of trace-cmd is built and run on the machine, by default it loads only installed plugins, from system drierctories. Thus, the development plugins will not be loaded. To simplify the development process, a new logic is added:
At plugins load time, check the location of trace-cmd application and look for "plugins" directory around it. If found, load plugins from it. Those pluigins will be loaded last, so in case of duplication the "development" plugins win.Signed-off-by Tzvetomir Stoyanov (VMware) <[email protected]>--- lib/traceevent/event-plugin.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)lib/traceevent/event-plugin.c +13
-0@@ -14,6 +14,7 @@#include <unistd.h> #include <dirent.h> #include <errno.h> +#include <libgen.h> #include "event-parse.h" #include "event-parse-local.h" #include "event-utils.h" @@ -538,6 +539,27 @@ load_plugins_dir(struct tep_handle *tep, const char *suffix,closedir (dir); } +static char *get_source_plugins_dir (void ) +{ +char *p, path[PATH_MAX +1 ]; +int ret; + + ret =readlink ("/proc/self/exe" , path,PATH_MAX ); +if (ret >PATH_MAX || ret <0 ) +return NULL ; + +dirname (path); + p =strrchr (path,'/' ); +if (!p)
Quoted 9 lines
lib/traceevent/event-plugin.c load_plugins_dir(struct tep_handle *tep, const char *suffix, · line 556
Quoted 3 lines
lib/traceevent/event-plugin.c +3
-0+return NULL ; +/* Check if we are in the the source tree */ +if (strcmp (p,"/tracecmd" ) !=0 )Hmm, this is in the lib/libtraceevent directory. We shouldn't be referencing trace-cmd code here. We should have a way to override the plugins from the trace-cmd side, perhaps after
tep_load_plugins_hook()gets called?
I agree, we should move this check outside of the library. I'll expose the functionality of load_plugins_dir() as a library API. Thanks !
Quoted 26 lines
-- Steve
Quoted 22 lines
lib/traceevent/event-plugin.c +12
-0+return NULL ; + +strcpy (p,"/lib/traceevent/plugins" ); +return strdup (path); +} + void tep_load_plugins_hook(struct tep_handle *tep, const char *suffix, void (*load_plugin)(struct tep_handle *tep, const char *path,@@ -588,6 +610,12 @@ void tep_load_plugins_hook(struct tep_handle *tep, const char *suffix,load_plugins_dir (tep, suffix, path, load_plugin, data);free (path); + + path =get_source_plugins_dir (); +if (path) { +load_plugins_dir (tep, suffix, path, load_plugin, data); +free (path); + } } struct tep_plugin_list*
Signature · 2 lines
Tzvetomir (Ceco) Stoyanov VMware Open Source Technology Center
Re: [PATCH v3 3/5] trace-cmd: Load libtraceevent plugins from build folder, if exists.
In reply to Tzvetomir Stoyanov (VMware)On Wed, 2 Oct 2019 14:41:50 +0300
"Tzvetomir Stoyanov (VMware)" <[email protected]> wrote:
Also there's a few typos (which I originally fixed before seeing the issue of trace-cmd code in libtraceevent).
Quoted 2 lines
When a development version of trace-cmd is built and run on the machine, by default it loads only installed plugins, from system drierctories.
"directories"
Quoted 5 lines
Thus, the development plugins will not be loaded. To simplify the development process, a new logic is added:
At plugins load time, check the location of trace-cmd application and look for "plugins" directory around it. If found, load plugins from it. Those pluigins will be loaded last, so in case of duplication the "development"
"plugins"
Quoted 4 lines
plugins win.
Signed-off-by Tzvetomir Stoyanov (VMware) <[email protected]>
-- Steve
PATCH v3 4/5 trace-cmd: Change plugin install directories
In reply to Tzvetomir Stoyanov (VMware)From: Tzvetomir Stoyanov <[email protected]>
To be compliant with XDG user directory layout, the user's plugin directory is changed from ~/.traceevent/plugins to ~/.local/lib/traceevent/plugins/ Thanks to Patrick McLean:
https://lore.kernel.org/linux-trace-devel/20190313144206.41e75cf8@patrickm/
The system plugin directory is changed from (install_prefix)/lib/trace-cmd/plugins to (install_prefix)/lib/traceevent/plugins This change paves the way for implementing trace-cmd specific plugins.
--- Makefile | 16 ++++++++-------- lib/traceevent/event-plugin.c | 6 +++--- lib/traceevent/plugins/Makefile | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-)
Makefile +8 -8
@@ -56,15 +56,15 @@ export img_install img_install_SQ export DESTDIR DESTDIR_SQ ifeq ($(prefix),$(HOME)) -plugin_dir = $(HOME)/.trace-cmd/plugins +plugin_traceevent_dir = $(HOME)/.local/lib/traceevent/plugins python_dir = $(HOME)/.trace-cmd/python var_dir = $(HOME)/.trace-cmd/ else -plugin_dir = $(libdir)/trace-cmd/plugins +plugin_traceevent_dir = $(libdir)/traceevent/plugins python_dir ?= $(libdir)/trace-cmd/python -PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)" +PLUGIN_DIR_TRACEEVENT = -DPLUGIN_TRACEEVENT_DIR="$(plugin_traceevent_dir)" PYTHON_DIR = -DPYTHON_DIR="$(python_dir)" -PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))' +PLUGIN_DIR_TRACEEVENT_SQ = '$(subst ','\'',$(PLUGIN_DIR_TRACEEVENT))' PYTHON_DIR_SQ = '$(subst ','\'',$(PYTHON_DIR))' var_dir = /var endif
@@ -72,7 +72,7 @@ endif # Shell quotes bindir_SQ = $(subst ','\'',$(bindir)) bindir_relative_SQ = $(subst ','\'',$(bindir_relative)) -plugin_dir_SQ = $(subst ','\'',$(plugin_dir)) +plugin_traceevent_dir_SQ = $(subst ','\'',$(plugin_traceevent_dir)) python_dir_SQ = $(subst ','\'',$(python_dir)) VAR_DIR = -DVAR_DIR="$(var_dir)"
@@ -85,10 +85,10 @@ HELP_DIR_SQ = '$(subst ','\'',$(HELP_DIR))' BASH_COMPLETE_DIR ?= /etc/bash_completion.d -export PLUGIN_DIR +export PLUGIN_DIR_TRACEEVENT export PYTHON_DIR export PYTHON_DIR_SQ -export plugin_dir_SQ +export plugin_traceevent_dir_SQ export python_dir_SQ export var_dir
@@ -239,7 +239,7 @@ LIBS += -laudit endif # Append required CFLAGS -override CFLAGS += $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR) +override CFLAGS += $(INCLUDES) $(PLUGIN_DIR_TRACEEVENT_SQ) $(VAR_DIR) override CFLAGS += $(udis86-flags) $(blk-flags) override LDFLAGS += $(udis86-ldflags)
lib/traceevent/event-plugin.c +3 -3
@@ -20,7 +20,7 @@#include "event-utils.h" #include "trace-seq.h" -#define LOCAL_PLUGIN_DIR ".traceevent/plugins" +#define LOCAL_PLUGIN_DIR ".local/lib/traceevent/plugins/" static struct registered_plugin_options { struct registered_plugin_options *next;
@@ -579,9 +579,9 @@ void tep_load_plugins_hook(struct tep_handle *tep, const char *suffix,* If a system plugin directory was defined, * check that first. */ -#ifdef PLUGIN_DIR +#ifdef PLUGIN_TRACEEVENT_DIR if (!tep || !(tep->flags &TEP_DISABLE_SYS_PLUGINS )) -load_plugins_dir (tep, suffix,PLUGIN_DIR , +load_plugins_dir (tep, suffix,PLUGIN_TRACEEVENT_DIR , load_plugin, data);#endif
lib/traceevent/plugins/Makefile +2 -2
@@ -53,11 +53,11 @@ $(bdir)/plugin_python_loader.so: $(bdir)/%.so: $(bdir)/%.o PLUGINS_INSTALL = $(subst .so,.install,$(PLUGINS)) $(PLUGINS_INSTALL): $(bdir)/%.install : $(bdir)/%.so force - $(Q)$(call do_install_data,$<,$(plugin_dir_SQ)) + $(Q)$(call do_install_data,$<,$(plugin_traceevent_dir_SQ)) install_plugins: $(PLUGINS_INSTALL) -# The following targets are necessary to trigger a rebuild when $(PLUGIN_DIR) +# The following targets are necessary to trigger a rebuild when $(PLUGIN_DIR_TRACEEVENT) # and $(PYTHON_DIR) change. Without them, a full clean build would necessary # in order to get the binaries updated.
Signature · 1 line
2.21.0
PATCH v3 5/5 trace-cmd: Add initial infrastructure for trace-cmd specific plugins.
In reply to Tzvetomir Stoyanov (VMware)Create a new directory lib/trace-cmd/plugins, where the libtracecmd plugins will be placed. Plugins compilation is integrated in
the trace-cmd build process. New plugins are installed in $(HOME)/.local/lib/trace-cmd/plugins or $(libdir)/trace-cmd/plugins directories. Current python_plugin.so is part of libtraceevent plugins, so the python plugins path is changed from
$(HOME)/.trace-cmd/python to $(HOME)/.local/lib/traceevent/python and
$(libdir)/trace-cmd/python to $(libdir)/traceevent/python
Added initial set of APIs for working with trace-cmd plugins
--- .gitignore | 2 + Makefile | 45 +++-- include/trace-cmd/trace-cmd.h | 44 ++++- lib/trace-cmd/Makefile | 1 + lib/trace-cmd/plugins/Makefile | 58 ++++++ lib/trace-cmd/trace-plugin.c | 313 +++++++++++++++++++++++++++++++++ 6 files changed, 450 insertions(+), 13 deletions(-) create mode 100644 lib/trace-cmd/plugins/Makefile create mode 100644 lib/trace-cmd/trace-plugin.c
.gitignore +2 -0
@@ -20,3 +20,5 @@ TAGS cscope* traceevent_plugin_dir trace_python_dir +tracecmd_plugin_dir +python_dir
Makefile +35 -10
111 lines not on this page · raw message
include/trace-cmd/trace-cmd.h +41 -3
56 lines not on this page · raw message
lib/trace-cmd/Makefile +1 -0
@@ -15,6 +15,7 @@ OBJS += trace-recorder.o OBJS += trace-util.o OBJS += trace-filter-hash.o OBJS += trace-msg.o +OBJS += trace-plugin.o # Additional util objects OBJS += trace-blk-hack.o
lib/trace-cmd/plugins/Makefile new file +58 -0
58 lines not on this page · raw message
lib/trace-cmd/trace-plugin.c new file +313 -0
313 lines not on this page · raw message
Signature · 1 line
2.21.0
Re: [PATCH v3 5/5] trace-cmd: Add initial infrastructure for trace-cmd specific plugins.
Quoted 13 lines · On Wed, 2 Oct 2019 14:41:52 +0300 "Tzvetomir Stoyanov (VMware)"…
-$(LIBTRACEEVENT_SHARED): force $(obj)/lib/traceevent/plugins/traceevent_plugin_dir +$(LIBTRACEEVENT_SHARED): force $(obj)/lib/traceevent/plugins/python_dir \
Makefile +3
-1+ $(obj)/lib/traceevent/plugins/traceevent_plugin_dir $(Q)$(MAKE) -C $(src)/lib/traceevent $@ -$(LIBTRACEEVENT_STATIC): force $(obj)/lib/traceevent/plugins/traceevent_plugin_dir +$(LIBTRACEEVENT_STATIC): force $(obj)/lib/traceevent/plugins/python_dir \ + $(obj)/lib/traceevent/plugins/traceevent_plugin_dir $(Q)$(MAKE) -C $(src)/lib/traceevent $@ $(LIBTRACECMD_STATIC): force
Makefile libtracecmd.so: $(LIBTRACECMD_SHARED) · line 307
Quoted 8 lines
Makefile +2
-1@@ -290,13 +301,22 @@ libtracecmd.so: $(LIBTRACECMD_SHARED) libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) -plugins: force $(obj)/lib/traceevent/plugins/traceevent_plugin_dir $(obj)/lib/traceevent/plugins/trace_python_dir +plugins_traceevent: force $(obj)/lib/traceevent/plugins/traceevent_plugin_dir \ + $(obj)/lib/traceevent/plugins/python_dir $(Q)$(MAKE) -C $(src)/lib/traceevent/plugins
Hmm, I'm getting this:
$ make make[1]: *** No rule to make target '/work/git/trace-cmd.git/lib/traceevent/plugins/python_dir'. Stop. make: *** [Makefile:320: /work/git/trace-cmd.git/lib/traceevent/plugins/python_dir] Error 2
It works if I manually create the missing python_dir.
-- Steve