Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d7c0144 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add build and install plugins targets 



Adding 'plugins' target along with the libtraceevent.a, so plugins are
built together with traceevent library.

Adding 'install-traceevent-plugins' Makefile install target, instructing
perf to install plugins into:

  $(HOME)/.traceevent/plugins
    - If installed localy under $HOME

  $(DESTDIR)/$(prefix)/$(libdir)/traceevent/plugins
    - If installed globally

Examples:
  $ make install
  ...
  $ find ~/.traceevent/plugins/
  /home/jolsa/.traceevent/plugins/
  /home/jolsa/.traceevent/plugins/plugin_mac80211.so
  /home/jolsa/.traceevent/plugins/plugin_kvm.so
  /home/jolsa/.traceevent/plugins/plugin_scsi.so
  /home/jolsa/.traceevent/plugins/plugin_sched_switch.so
  /home/jolsa/.traceevent/plugins/plugin_xen.so
  /home/jolsa/.traceevent/plugins/plugin_cfg80211.so
  /home/jolsa/.traceevent/plugins/plugin_function.so
  /home/jolsa/.traceevent/plugins/plugin_kmem.so
  /home/jolsa/.traceevent/plugins/plugin_hrtimer.so
  /home/jolsa/.traceevent/plugins/plugin_jbd2.so

  $ sudo make install DESTDIR=/opt/perf/
  ...
  $ find /opt/perf/lib64/traceevent/plugins/
  /opt/perf/lib64/traceevent/plugins/
  /opt/perf/lib64/traceevent/plugins/plugin_kvm.so
  /opt/perf/lib64/traceevent/plugins/plugin_scsi.so
  /opt/perf/lib64/traceevent/plugins/plugin_mac80211.so
  /opt/perf/lib64/traceevent/plugins/plugin_hrtimer.so
  /opt/perf/lib64/traceevent/plugins/plugin_kmem.so
  /opt/perf/lib64/traceevent/plugins/plugin_jbd2.so
  /opt/perf/lib64/traceevent/plugins/plugin_sched_switch.so
  /opt/perf/lib64/traceevent/plugins/plugin_function.so
  /opt/perf/lib64/traceevent/plugins/plugin_cfg80211.so
  /opt/perf/lib64/traceevent/plugins/plugin_xen.so

Signed-off-by: default avatarJiri 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-8-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f33c5cd7

tools/perf/Makefile.perf

+12 −5
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ ifeq ($(config),1) 
include config/Makefile

endif



export prefix bindir sharedir sysconfdir

export prefix bindir sharedir sysconfdir DESTDIR



# sparse is architecture-neutral, which means that we need to tell it

# explicitly what architecture to check for. Fix this up for yours..
@@ -710,13 +710,20 @@ $(LIB_FILE): $(LIB_OBJS) 
# libtraceevent.a

TE_SOURCES = $(wildcard $(TRACE_EVENT_DIR)*.[ch])



$(LIBTRACEEVENT): $(TE_SOURCES)

	$(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) CFLAGS="-g -Wall $(EXTRA_CFLAGS)" libtraceevent.a

LIBTRACEEVENT_FLAGS  = $(QUIET_SUBDIR1) O=$(OUTPUT)

LIBTRACEEVENT_FLAGS += CFLAGS="-g -Wall $(EXTRA_CFLAGS)"

LIBTRACEEVENT_FLAGS += plugin_dir=$(plugindir_SQ)



$(LIBTRACEEVENT): $(TE_SOURCES) $(OUTPUT)PERF-CFLAGS

	$(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) libtraceevent.a plugins



$(LIBTRACEEVENT)-clean:

	$(call QUIET_CLEAN, libtraceevent)

	@$(MAKE) -C $(TRACE_EVENT_DIR) O=$(OUTPUT) clean >/dev/null



install-traceevent-plugins:

	$(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) install_plugins



LIBLK_SOURCES = $(wildcard $(LK_PATH)*.[ch])



# if subdir is set, we've been called from above so target has been built
@@ -785,7 +792,7 @@ cscope: 


### Detect prefix changes

TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):\

             $(bindir_SQ):$(perfexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)

             $(bindir_SQ):$(perfexecdir_SQ):$(template_dir_SQ):$(prefix_SQ):$(plugindir_SQ)



$(OUTPUT)PERF-CFLAGS: .FORCE-PERF-CFLAGS

	@FLAGS='$(TRACK_CFLAGS)'; \
@@ -849,7 +856,7 @@ endif 
		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \

		$(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'



install: install-bin try-install-man

install: install-bin try-install-man install-traceevent-plugins



install-python_ext:

	$(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)'

tools/perf/config/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -593,3 +593,11 @@ else 
perfexec_instdir = $(prefix)/$(perfexecdir)

endif

perfexec_instdir_SQ = $(subst ','\'',$(perfexec_instdir))



# If we install to $(HOME) we keep the traceevent default:

# $(HOME)/.traceevent/plugins

# Otherwise we install plugins into the global $(libdir).

ifdef DESTDIR

plugindir=$(libdir)/traceevent/plugins

plugindir_SQ= $(subst ','\'',$(prefix)/$(plugindir))

endif