lkml.org 
[lkml]   [2017]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf probe: Introduce util func is_sdt_event()
    Commit-ID:  af9100ad149cf31a1ab1160f71bb4025443dbdb6
    Gitweb: http://git.kernel.org/tip/af9100ad149cf31a1ab1160f71bb4025443dbdb6
    Author: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
    AuthorDate: Tue, 14 Mar 2017 20:36:52 +0530
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Wed, 15 Mar 2017 17:48:37 -0300

    perf probe: Introduce util func is_sdt_event()

    Factor out the SDT event name checking routine as is_sdt_event().

    Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
    Cc: He Kuang <hekuang@huawei.com>
    Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Masami Hiramatsu <mhiramat@kernel.org>
    Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
    Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
    Cc: Taeung Song <treeze.taeung@gmail.com>
    Cc: Wang Nan <wangnan0@huawei.com>
    Link: http://lkml.kernel.org/r/20170314150658.7065-2-ravi.bangoria@linux.vnet.ibm.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/parse-events.h | 20 ++++++++++++++++++++
    tools/perf/util/probe-event.c | 9 +--------
    2 files changed, 21 insertions(+), 8 deletions(-)

    diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
    index 1af6a26..8c72b0f 100644
    --- a/tools/perf/util/parse-events.h
    +++ b/tools/perf/util/parse-events.h
    @@ -8,6 +8,7 @@
    #include <stdbool.h>
    #include <linux/types.h>
    #include <linux/perf_event.h>
    +#include <string.h>

    struct list_head;
    struct perf_evsel;
    @@ -196,4 +197,23 @@ int is_valid_tracepoint(const char *event_string);
    int valid_event_mount(const char *eventfs);
    char *parse_events_formats_error_string(char *additional_terms);

    +#ifdef HAVE_LIBELF_SUPPORT
    +/*
    + * If the probe point starts with '%',
    + * or starts with "sdt_" and has a ':' but no '=',
    + * then it should be a SDT/cached probe point.
    + */
    +static inline bool is_sdt_event(char *str)
    +{
    + return (str[0] == '%' ||
    + (!strncmp(str, "sdt_", 4) &&
    + !!strchr(str, ':') && !strchr(str, '=')));
    +}
    +#else
    +static inline bool is_sdt_event(char *str __maybe_unused)
    +{
    + return false;
    +}
    +#endif /* HAVE_LIBELF_SUPPORT */
    +
    #endif /* __PERF_PARSE_EVENTS_H */
    diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
    index c9bdc9d..b19d178 100644
    --- a/tools/perf/util/probe-event.c
    +++ b/tools/perf/util/probe-event.c
    @@ -1341,14 +1341,7 @@ static int parse_perf_probe_point(char *arg, struct perf_probe_event *pev)
    if (!arg)
    return -EINVAL;

    - /*
    - * If the probe point starts with '%',
    - * or starts with "sdt_" and has a ':' but no '=',
    - * then it should be a SDT/cached probe point.
    - */
    - if (arg[0] == '%' ||
    - (!strncmp(arg, "sdt_", 4) &&
    - !!strchr(arg, ':') && !strchr(arg, '='))) {
    + if (is_sdt_event(arg)) {
    pev->sdt = true;
    if (arg[0] == '%')
    arg++;
    \
     
     \ /
      Last update: 2017-03-16 17:44    [W:2.528 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site