lkml.org 
[lkml]   [2019]   [Jan]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.20 094/117] perf tools: Add missing sigqueue() prototype for systems lacking it
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    [ Upstream commit 748fe0889c1ff12d378946bd5326e8ee8eacf5cf ]

    There are systems such as the Android NDK API level 24 has the
    sigqueue() function but doesn't provide a prototype, adding noise to the
    build:

    util/evlist.c: In function 'perf_evlist__prepare_workload':
    util/evlist.c:1494:4: warning: implicit declaration of function 'sigqueue' [-Wimplicit-function-declaration]
    if (sigqueue(getppid(), SIGUSR1, val))
    ^
    util/evlist.c:1494:4: warning: nested extern declaration of 'sigqueue' [-Wnested-externs]

    Define a LACKS_SIGQUEUE_PROTOTYPE define so that code needing that can
    get a prototype.

    Checked in the bionic git repo to be available since level 23:

    https://android.googlesource.com/platform/bionic/+/master/libc/include/signal.h#123

    int sigqueue(pid_t __pid, int __signal, const union sigval __value) __INTRODUCED_IN(23);

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Link: https://lkml.kernel.org/n/tip-lmhpev1uni9kdrv7j29glyov@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/perf/Makefile.config | 1 +
    tools/perf/util/evlist.c | 4 ++++
    2 files changed, 5 insertions(+)

    diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
    index a0e8c23f9125..e106e7ce6933 100644
    --- a/tools/perf/Makefile.config
    +++ b/tools/perf/Makefile.config
    @@ -294,6 +294,7 @@ ifndef NO_BIONIC
    $(call feature_check,bionic)
    ifeq ($(feature-bionic), 1)
    BIONIC := 1
    + CFLAGS += -DLACKS_SIGQUEUE_PROTOTYPE
    EXTLIBS := $(filter-out -lrt,$(EXTLIBS))
    EXTLIBS := $(filter-out -lpthread,$(EXTLIBS))
    endif
    diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
    index 668d2a9ef0f4..8a806b0758b0 100644
    --- a/tools/perf/util/evlist.c
    +++ b/tools/perf/util/evlist.c
    @@ -34,6 +34,10 @@
    #include <linux/log2.h>
    #include <linux/err.h>

    +#ifdef LACKS_SIGQUEUE_PROTOTYPE
    +int sigqueue(pid_t pid, int sig, const union sigval value);
    +#endif
    +
    #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
    #define SID(e, x, y) xyarray__entry(e->sample_id, x, y)

    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-08 21:03    [W:2.324 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site