From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH v1 09/15] perf, tools: Dedup events in expression parsing
Date: Mon, 24 Jul 2017 16:40:09 -0700 [thread overview]
Message-ID: <20170724234015.5165-10-andi@firstfloor.org> (raw)
In-Reply-To: <20170724234015.5165-1-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Avoid adding redundant events while parsing an expression.
When we add an "other" event check first if it already exists.
Signed-off-by: Andi Kleen <ak@linux.intel.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 5753c4f21534..f54928f00893 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 false;
+ 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;
--
2.9.4
next prev parent reply other threads:[~2017-07-24 23:43 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-24 23:40 Support standalone metrics and metric groups for perf Andi Kleen
2017-07-24 23:40 ` [PATCH v1 01/15] perf, tools, stat: Fix buffer overflow while freeing events Andi Kleen
2017-08-01 8:11 ` Jiri Olsa
2017-07-24 23:40 ` [PATCH v1 02/15] perf, tools: Tighten detection of BPF events Andi Kleen
2017-08-02 7:35 ` Jiri Olsa
2017-08-02 19:10 ` Arnaldo Carvalho de Melo
2017-07-24 23:40 ` [PATCH v1 03/15] perf, tools, stat: Fix saved values rbtree lookup Andi Kleen
2017-08-02 7:35 ` Jiri Olsa
2017-08-02 19:11 ` Arnaldo Carvalho de Melo
2017-08-14 17:43 ` [tip:perf/core] perf " tip-bot for Andi Kleen
2017-07-24 23:40 ` [PATCH v1 04/15] perf, tools: Support weak groups Andi Kleen
2017-08-02 7:35 ` Jiri Olsa
2017-07-24 23:40 ` [PATCH v1 05/15] perf, tools: Add missing newline to expr parser error messages Andi Kleen
2017-08-02 7:37 ` Jiri Olsa
2017-08-14 17:44 ` [tip:perf/core] perf " tip-bot for Andi Kleen
2017-07-24 23:40 ` [PATCH v1 06/15] perf, tools: Add utility function to detect SMT status Andi Kleen
2017-07-24 23:40 ` [PATCH v1 07/15] perf, tools: Expression parser enhancements for metrics Andi Kleen
2017-08-07 9:51 ` Jiri Olsa
2017-07-24 23:40 ` [PATCH v1 08/15] perf, tools: Increase maximum number of events in expressions Andi Kleen
2017-07-24 23:40 ` Andi Kleen [this message]
2017-08-07 9:51 ` [PATCH v1 09/15] perf, tools: Dedup events in expression parsing Jiri Olsa
2017-07-24 23:40 ` [PATCH v1 10/15] perf, tools: Support metric_group and no event name in json parser Andi Kleen
2017-07-24 23:40 ` [PATCH v1 11/15] perf, tools, stat: Factor out generic metric printing Andi Kleen
2017-07-24 23:40 ` [PATCH v1 12/15] perf, tools, stat: Support JSON metrics in perf stat Andi Kleen
2017-07-24 23:40 ` [PATCH v1 13/15] perf, tools, list: Add metric groups to perf list Andi Kleen
2017-07-24 23:40 ` [PATCH v1 14/15] perf, tools, stat: Don't use ctx for saved values lookup Andi Kleen
2017-07-24 23:40 ` [PATCH v1 15/15] perf, tools: Support duration_time Andi Kleen
2017-08-07 10:36 ` Jiri Olsa
2017-07-26 14:15 ` Support standalone metrics and metric groups for perf Jiri Olsa
2017-07-26 15:38 ` Andi Kleen
2017-07-28 8:48 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170724234015.5165-10-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).