lkml.org 
[lkml]   [2014]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/16] perf tools: Do not attempt to run perf-read-vdso32 if it wasn't built
    Date
    popen() causes an error message to print if perf-read-vdso32
    does not run. Avoid that by not trying to run it if it was
    not built. Ditto perf-read-vdsox32.

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    ---
    tools/perf/config/Makefile | 8 ++++++--
    tools/perf/util/vdso.c | 10 ++++++++++
    2 files changed, 16 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index 3ba2382..71264e4 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -627,7 +627,9 @@ endif
    ifeq (${IS_64_BIT}, 1)
    ifndef NO_PERF_READ_VDSO32
    $(call feature_check,compile-32)
    - ifneq ($(feature-compile-32), 1)
    + ifeq ($(feature-compile-32), 1)
    + CFLAGS += -DHAVE_PERF_READ_VDSO32
    + else
    NO_PERF_READ_VDSO32 := 1
    endif
    endif
    @@ -636,7 +638,9 @@ ifeq (${IS_64_BIT}, 1)
    endif
    ifndef NO_PERF_READ_VDSOX32
    $(call feature_check,compile-x32)
    - ifneq ($(feature-compile-x32), 1)
    + ifeq ($(feature-compile-x32), 1)
    + CFLAGS += -DHAVE_PERF_READ_VDSOX32
    + else
    NO_PERF_READ_VDSOX32 := 1
    endif
    endif
    diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c
    index 69daef6..5c7dd79 100644
    --- a/tools/perf/util/vdso.c
    +++ b/tools/perf/util/vdso.c
    @@ -255,6 +255,16 @@ static int vdso__dso_findnew_compat(struct machine *machine,
    enum dso_type dso_type;

    dso_type = machine__thread_dso_type(machine, thread);
    +
    +#ifndef HAVE_PERF_READ_VDSO32
    + if (dso_type == DSO__TYPE_32BIT)
    + return 0;
    +#endif
    +#ifndef HAVE_PERF_READ_VDSOX32
    + if (dso_type == DSO__TYPE_X32BIT)
    + return 0;
    +#endif
    +
    switch (dso_type) {
    case DSO__TYPE_32BIT:
    *dso = vdso__findnew_compat(machine, &vdso_info->vdso32);
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-10-23 13:21    [W:3.652 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site