linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@redhat.com>,
	Corey Ashford <cjashfor@linux.vnet.ibm.com>,
	David Ahern <dsahern@gmail.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Ingo Molnar <mingo@elte.hu>, Namhyung Kim <namhyung@kernel.org>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Steven Rostedt <rostedt@goodmis.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 14/38] tools lib traceevent: Add plugin build support
Date: Wed,  4 Dec 2013 17:06:38 -0300	[thread overview]
Message-ID: <1386187622-2928-15-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1386187622-2928-1-git-send-email-acme@infradead.org>

From: Jiri Olsa <jolsa@redhat.com>

Backporting missing pieces of plugin building infrastructure:

  - Adding Makefile 'plugins' target to build all
    defined plugins

  - Adding Makefile 'install_plugins' target as 'install_lib'
    target dependency

  - Link plugin objects with shared object building

Backported from Steven Rostedt's trace-cmd repo (HEAD 0f2c2fb):
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git

Plugins are by default installed into following locations:

  '$(HOME)/.traceevent/plugins'
     - If we are installing under $(HOME)

  '$(prefix)/lib/traceevent/plugins'
     - Otherwise

This path is propagated to the plugin object as a plugins search path.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1386076182-14484-4-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/traceevent/Makefile | 52 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 2ccb5bc800e8..15267988f6b6 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -43,6 +43,30 @@ man_dir_SQ = '$(subst ','\'',$(man_dir))'
 export man_dir man_dir_SQ INSTALL
 export DESTDIR DESTDIR_SQ
 
+set_plugin_dir := 1
+
+# Set plugin_dir to preffered global plugin location
+# If we install under $HOME directory we go under
+# $(HOME)/.traceevent/plugins
+#
+# We dont set PLUGIN_DIR in case we install under $HOME
+# directory, because by default the code looks under:
+# $(HOME)/.traceevent/plugins by default.
+#
+ifeq ($(plugin_dir),)
+ifeq ($(prefix),$(HOME))
+override plugin_dir = $(HOME)/.traceevent/plugins
+set_plugin_dir := 0
+else
+override plugin_dir = $(prefix)/lib/traceevent/plugins
+endif
+endif
+
+ifeq ($(set_plugin_dir),1)
+PLUGIN_DIR = -DPLUGIN_DIR="$(DESTDIR)/$(plugin_dir)"
+PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
+endif
+
 # copy a bit from Linux kbuild
 
 ifeq ("$(origin V)", "command line")
@@ -96,6 +120,7 @@ export prefix bindir src obj
 # Shell quotes
 bindir_SQ = $(subst ','\'',$(bindir))
 bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
+plugin_dir_SQ = $(subst ','\'',$(plugin_dir))
 
 LIB_FILE = libtraceevent.a libtraceevent.so
 
@@ -138,8 +163,8 @@ else
   print_app_build =		echo '  BUILD    '$(OBJ);
   print_fpic_compile =		echo '  CC FPIC  '$(OBJ);
   print_shared_lib_compile =	echo '  BUILD    SHARED LIB '$(OBJ);
-  print_plugin_obj_compile =	echo '  BUILD    PLUGIN OBJ '$(OBJ);
-  print_plugin_build =		echo '  BUILD    PLUGIN     '$(OBJ);
+  print_plugin_obj_compile =	echo '  CC FPIC  '$(OBJ);
+  print_plugin_build =		echo '  BUILD    PLUGIN '$(OBJ);
   print_static_lib_build =	echo '  BUILD    STATIC LIB '$(OBJ);
   print_install =		echo '  INSTALL  '$1'	to	$(DESTDIR_SQ)$2';
 endif
@@ -187,9 +212,11 @@ PEVENT_LIB_OBJS += parse-filter.o
 PEVENT_LIB_OBJS += parse-utils.o
 PEVENT_LIB_OBJS += kbuffer-parse.o
 
-ALL_OBJS = $(PEVENT_LIB_OBJS)
+PLUGINS := $(PLUGIN_OBJS:.o=.so)
+
+ALL_OBJS = $(PEVENT_LIB_OBJS) $(PLUGIN_OBJS)
 
-CMD_TARGETS = $(LIB_FILE)
+CMD_TARGETS = $(LIB_FILE) $(PLUGINS)
 
 TARGETS = $(CMD_TARGETS)
 
@@ -204,9 +231,17 @@ libtraceevent.so: $(PEVENT_LIB_OBJS)
 libtraceevent.a: $(PEVENT_LIB_OBJS)
 	$(Q)$(do_build_static_lib)
 
+plugins: $(PLUGINS)
+
 $(PEVENT_LIB_OBJS): %.o: $(src)/%.c TRACEEVENT-CFLAGS
 	$(Q)$(do_fpic_compile)
 
+$(PLUGIN_OBJS): %.o : $(src)/%.c
+	$(Q)$(do_compile_plugin_obj)
+
+$(PLUGINS): %.so: %.o
+	$(Q)$(do_plugin_build)
+
 define make_version.h
 	(echo '/* This file is automatically generated. Do not modify. */';		\
 	echo \#define VERSION_CODE $(shell						\
@@ -294,9 +329,16 @@ define do_install
 	$(INSTALL) $1 '$(DESTDIR_SQ)$2'
 endef
 
-install_lib: all_cmd
+install_lib: all_cmd install_plugins
 	$(Q)$(call do_install,$(LIB_FILE),$(bindir_SQ))
 
+PLUGINS_INSTALL = $(subst .so,.install,$(PLUGINS))
+
+$(PLUGINS_INSTALL): %.install : %.so force
+	$(Q)$(call do_install,$<,$(plugin_dir_SQ))
+
+install_plugins: $(PLUGINS_INSTALL)
+
 install: install_lib
 
 clean:
-- 
1.8.1.4


  parent reply	other threads:[~2013-12-04 20:08 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-04 20:06 [GIT PULL 00/38] perf/core improvements and fixes Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 01/38] perf tools: Use asprintf instead of malloc plus snprintf Arnaldo Carvalho de Melo
2013-12-11 22:16   ` Andi Kleen
2013-12-12 14:57     ` Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 02/38] perf symbols: Retain bfd reference to lookup source line numbers Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 03/38] perf symbols: Retain symbol source file name " Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 04/38] perf tools: Do not disable source line lookup just because of 1 failure Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 05/38] perf tools: Remove stackprotector feature check Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 06/38] perf tools: Remove condition in machine__get_kernel_start_addr Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 07/38] perf target: Move the checking of which map function to call into function Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 08/38] perf kvm: Add more detail about buildid-list in man page Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 09/38] perf kvm: Fix spurious '=' use " Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 10/38] perf kvm: Update the 'record' man page entry for new --guest/--host behavior Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 11/38] perf symbols: Fix random fd closing with no libelf Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 12/38] perf script: Do not call perf_event__preprocess_sample() twice) Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 13/38] tools lib traceevent: Add plugin support Arnaldo Carvalho de Melo
2013-12-04 20:06 ` Arnaldo Carvalho de Melo [this message]
2013-12-04 20:06 ` [PATCH 15/38] tools lib traceevent: Add traceevent_host_bigendian function Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 16/38] tools lib traceevent: Change pevent_parse_format to include pevent handle Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 17/38] tools lib traceevent: Harmonize the install messages in lib-traceevent Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 18/38] perf tools: Add build and install plugins targets Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 19/38] perf tools: Add filename__read_str util function Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 20/38] perf tools: Add trace-event object Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 21/38] perf tools: Add trace-event global object for tracepoint interface Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 22/38] perf tools: Overload pr_stat traceevent print function Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 23/38] tools lib traceevent: Add jbd2 plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 24/38] tools lib traceevent: Add hrtimer plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 25/38] tools lib traceevent: Add kmem plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 26/38] tools lib traceevent: Add kvm plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 27/38] tools lib traceevent: Add mac80211 plugin Arnaldo Carvalho de Melo
2014-06-13  3:13   ` Steven Rostedt
2014-06-13 17:57     ` Johannes Berg
2014-06-13 18:18       ` Steven Rostedt
2013-12-04 20:06 ` [PATCH 28/38] tools lib traceevent: Add sched_switch plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 29/38] tools lib traceevent: Add function plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 30/38] tools lib traceevent: Add xen plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 31/38] tools lib traceevent: Add scsi plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 32/38] tools lib traceevent: Add cfg80211 plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 33/38] tools lib traceevent: Remove malloc_or_die from event-plugin.c Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 34/38] tools lib traceevent: Use static functions in jbd2 plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 35/38] tools lib traceevent: Use pevent_print_func_field in hrtimer_start handler Arnaldo Carvalho de Melo
2013-12-04 20:07 ` [PATCH 36/38] tools lib traceevent: Several cleanups for function plugin Arnaldo Carvalho de Melo
2013-12-04 20:07 ` [PATCH 37/38] tools lib traceevent: Remove malloc_or_die from plugin_function.c Arnaldo Carvalho de Melo
2013-12-04 20:07 ` [PATCH 38/38] tools lib traceevent: Update kvm plugin with is_writable_pte helper Arnaldo Carvalho de Melo
2013-12-05 10:04 ` [GIT PULL 00/38] perf/core improvements and fixes Ingo Molnar
2013-12-05 10:37   ` Jiri Olsa
2013-12-05 10:53     ` Ingo Molnar
2013-12-05 10:59       ` Ingo Molnar
2013-12-05 11:13         ` Jiri Olsa
2013-12-05 12:27           ` Ingo Molnar
2013-12-05 12:35             ` Jiri Olsa
2013-12-05 11:05       ` Jiri Olsa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1386187622-2928-15-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=cjashfor@linux.vnet.ibm.com \
    --cc=dsahern@gmail.com \
    --cc=fweisbec@gmail.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=paulus@samba.org \
    --cc=rostedt@goodmis.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).