lkml.org 
[lkml]   [2016]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH perf/core v10 22/23] perf build: Add sdt feature detection
    Date
    Will be used to define SDT events in perf test code.

    Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
    ---
    tools/perf/Makefile.perf | 3 +++
    tools/perf/config/Makefile | 10 ++++++++++
    tools/perf/tests/make | 3 ++-
    3 files changed, 15 insertions(+), 1 deletion(-)

    diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
    index 57c8f98..6bc7767 100644
    --- a/tools/build/Makefile.feature
    +++ b/tools/build/Makefile.feature
    @@ -60,7 +60,8 @@ FEATURE_TESTS_BASIC := \
    zlib \
    lzma \
    get_cpuid \
    - bpf
    + bpf \
    + sdt

    # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list
    # of all feature tests
    diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
    index 3d88f09..82d357f 100644
    --- a/tools/build/feature/Makefile
    +++ b/tools/build/feature/Makefile
    @@ -43,7 +43,8 @@ FILES= \
    test-zlib.bin \
    test-lzma.bin \
    test-bpf.bin \
    - test-get_cpuid.bin
    + test-get_cpuid.bin \
    + test-sdt.bin

    FILES := $(addprefix $(OUTPUT),$(FILES))

    @@ -205,6 +206,9 @@ $(OUTPUT)test-get_cpuid.bin:
    $(OUTPUT)test-bpf.bin:
    $(BUILD)

    +$(OUTPUT)test-sdt.bin:
    + $(BUILD)
    +
    -include $(OUTPUT)*.d

    ###############################
    diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c
    index a282e8c..f538c5f 100644
    --- a/tools/build/feature/test-all.c
    +++ b/tools/build/feature/test-all.c
    @@ -137,6 +137,10 @@
    # include "test-libcrypto.c"
    #undef main

    +#define main main_test_sdt
    +# include "test-sdt.c"
    +#undef main
    +
    int main(int argc, char *argv[])
    {
    main_test_libpython();
    @@ -168,6 +172,7 @@ int main(int argc, char *argv[])
    main_test_get_cpuid();
    main_test_bpf();
    main_test_libcrypto();
    + main_test_sdt();

    return 0;
    }
    diff --git a/tools/build/feature/test-sdt.c b/tools/build/feature/test-sdt.c
    new file mode 100644
    index 0000000..e4531a6
    --- /dev/null
    +++ b/tools/build/feature/test-sdt.c
    @@ -0,0 +1,7 @@
    +#include <sys/sdt.h>
    +
    +int main(void)
    +{
    + DTRACE_PROBE(provider, name);
    + return 0;
    +}
    diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
    index bde8cba..a818388 100644
    --- a/tools/perf/Makefile.perf
    +++ b/tools/perf/Makefile.perf
    @@ -81,6 +81,9 @@ include ../scripts/utilities.mak
    #
    # Define NO_LIBBPF if you do not want BPF support
    #
    +# Define NO_SDT if you do not want to define SDT event in perf tools,
    +# note that it doesn't disable SDT scanning support.
    +#
    # Define FEATURES_DUMP to provide features detection dump file
    # and bypass the feature detection

    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index 1e46277..641a82a 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -331,6 +331,16 @@ ifndef NO_LIBELF
    endif # NO_LIBBPF
    endif # NO_LIBELF

    +ifndef NO_SDT
    + ifneq ($(feature-sdt), 1)
    + msg := $(warning No sys/sdt.h found, no SDT events are defined, please install systemtap-sdt-devel or systemtap-sdt-dev);
    + NO_SDT := 1;
    + else
    + CFLAGS += -DHAVE_SDT_EVENT
    + $(call detected,CONFIG_SDT_EVENT)
    + endif
    +endif
    +
    ifdef PERF_HAVE_JITDUMP
    ifndef NO_DWARF
    $(call detected,CONFIG_JITDUMP)
    diff --git a/tools/perf/tests/make b/tools/perf/tests/make
    index cac15d9..ac801be 100644
    --- a/tools/perf/tests/make
    +++ b/tools/perf/tests/make
    @@ -81,6 +81,7 @@ make_no_libbionic := NO_LIBBIONIC=1
    make_no_auxtrace := NO_AUXTRACE=1
    make_no_libbpf := NO_LIBBPF=1
    make_no_libcrypto := NO_LIBCRYPTO=1
    +make_no_sdt := NO_SDT=1
    make_tags := tags
    make_cscope := cscope
    make_help := help
    @@ -104,7 +105,7 @@ make_minimal := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
    make_minimal += NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1
    make_minimal += NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1
    make_minimal += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1
    -make_minimal += NO_LIBCRYPTO=1
    +make_minimal += NO_LIBCRYPTO=1 NO_SDT=1

    # $(run) contains all available tests
    run := make_pure
    \
     
     \ /
      Last update: 2016-06-08 13:41    [W:4.341 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site