lkml.org 
[lkml]   [2017]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf tools: Dedup events in expression parsing
    Commit-ID:  d66dccdb13c9748f27d8401b45c027953fc833e8
    Gitweb: http://git.kernel.org/tip/d66dccdb13c9748f27d8401b45c027953fc833e8
    Author: Andi Kleen <ak@linux.intel.com>
    AuthorDate: Fri, 11 Aug 2017 16:26:25 -0700
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Tue, 22 Aug 2017 12:19:08 -0300

    perf tools: Dedup events in expression parsing

    Avoid adding redundant events while parsing an expression. When we add
    an "other" event check first if it already exists.

    v2: Fix perf test failure.

    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Acked-by: Jiri Olsa <jolsa@kernel.org>
    Link: http://lkml.kernel.org/r/20170811232634.30465-10-andi@firstfloor.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/expr.y | 15 ++++++++++++++-
    1 file changed, 14 insertions(+), 1 deletion(-)

    diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
    index 5753c4f..432b856 100644
    --- a/tools/perf/util/expr.y
    +++ b/tools/perf/util/expr.y
    @@ -181,6 +181,19 @@ void expr__ctx_init(struct parse_ctx *ctx)
    ctx->num_ids = 0;
    }

    +static bool already_seen(const char *val, const char *one, const char **other,
    + int num_other)
    +{
    + int i;
    +
    + if (one && !strcasecmp(one, val))
    + return true;
    + for (i = 0; i < num_other; i++)
    + if (!strcasecmp(other[i], val))
    + return true;
    + return false;
    +}
    +
    int expr__find_other(const char *p, const char *one, const char ***other,
    int *num_otherp)
    {
    @@ -200,7 +213,7 @@ int expr__find_other(const char *p, const char *one, const char ***other,
    err = 0;
    break;
    }
    - if (tok == ID && (!one || strcasecmp(one, val.id))) {
    + if (tok == ID && !already_seen(val.id, one, *other, num_other)) {
    if (num_other >= EXPR_MAX_OTHER - 1) {
    pr_debug("Too many extra events in %s\n", orig);
    break;
    \
     
     \ /
      Last update: 2017-08-24 10:24    [W:4.093 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site