diff options
author | Masami Hiramatsu <mhiramat@kernel.org> | 2016-07-12 06:05:56 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-07-13 22:09:09 -0400 |
commit | e26e63be64a108c1fd12020b93b5b447ffe0532b (patch) | |
tree | 456d74dd1e29ca602315eaa9a77460146c7e4f96 /tools/perf | |
parent | 7e9fca51fbf8430e27fb6b29299eda575e3f00cf (diff) |
perf build: Add sdt feature detection
This checks whether sys/sdt.h is available or not, which is required for
DTRACE_PROBE().
We can disable this feature by passing NO_SDT=1 when building.
This flag will be used for SDT test case and further SDT events in
perftools.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/146831795615.17065.17513820540591053933.stgit@devbox
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/Makefile.perf | 3 | ||||
-rw-r--r-- | tools/perf/config/Makefile | 10 | ||||
-rw-r--r-- | tools/perf/tests/make | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index feb2c66b110b..a129fbc1ed37 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf | |||
@@ -81,6 +81,9 @@ include ../scripts/utilities.mak | |||
81 | # | 81 | # |
82 | # Define NO_LIBBPF if you do not want BPF support | 82 | # Define NO_LIBBPF if you do not want BPF support |
83 | # | 83 | # |
84 | # Define NO_SDT if you do not want to define SDT event in perf tools, | ||
85 | # note that it doesn't disable SDT scanning support. | ||
86 | # | ||
84 | # Define FEATURES_DUMP to provide features detection dump file | 87 | # Define FEATURES_DUMP to provide features detection dump file |
85 | # and bypass the feature detection | 88 | # and bypass the feature detection |
86 | 89 | ||
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 5ac428060779..24803c58049a 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -355,6 +355,16 @@ ifndef NO_LIBELF | |||
355 | endif # NO_LIBBPF | 355 | endif # NO_LIBBPF |
356 | endif # NO_LIBELF | 356 | endif # NO_LIBELF |
357 | 357 | ||
358 | ifndef NO_SDT | ||
359 | ifneq ($(feature-sdt), 1) | ||
360 | msg := $(warning No sys/sdt.h found, no SDT events are defined, please install systemtap-sdt-devel or systemtap-sdt-dev); | ||
361 | NO_SDT := 1; | ||
362 | else | ||
363 | CFLAGS += -DHAVE_SDT_EVENT | ||
364 | $(call detected,CONFIG_SDT_EVENT) | ||
365 | endif | ||
366 | endif | ||
367 | |||
358 | ifdef PERF_HAVE_JITDUMP | 368 | ifdef PERF_HAVE_JITDUMP |
359 | ifndef NO_DWARF | 369 | ifndef NO_DWARF |
360 | $(call detected,CONFIG_JITDUMP) | 370 | $(call detected,CONFIG_JITDUMP) |
diff --git a/tools/perf/tests/make b/tools/perf/tests/make index 51966d92fc82..143f4d549769 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make | |||
@@ -82,6 +82,7 @@ make_no_auxtrace := NO_AUXTRACE=1 | |||
82 | make_no_libbpf := NO_LIBBPF=1 | 82 | make_no_libbpf := NO_LIBBPF=1 |
83 | make_no_libcrypto := NO_LIBCRYPTO=1 | 83 | make_no_libcrypto := NO_LIBCRYPTO=1 |
84 | make_with_babeltrace:= LIBBABELTRACE=1 | 84 | make_with_babeltrace:= LIBBABELTRACE=1 |
85 | make_no_sdt := NO_SDT=1 | ||
85 | make_tags := tags | 86 | make_tags := tags |
86 | make_cscope := cscope | 87 | make_cscope := cscope |
87 | make_help := help | 88 | make_help := help |
@@ -105,7 +106,7 @@ make_minimal := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1 | |||
105 | make_minimal += NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1 | 106 | make_minimal += NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1 |
106 | make_minimal += NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1 | 107 | make_minimal += NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1 |
107 | make_minimal += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1 | 108 | make_minimal += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1 |
108 | make_minimal += NO_LIBCRYPTO=1 | 109 | make_minimal += NO_LIBCRYPTO=1 NO_SDT=1 |
109 | 110 | ||
110 | # $(run) contains all available tests | 111 | # $(run) contains all available tests |
111 | run := make_pure | 112 | run := make_pure |