From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Michael Petlan <mpetlan@redhat.com>,
Ravi Bangoria <ravi.bangoria@linux.ibm.com>,
Andi Kleen <ak@linux.intel.com>, Kajol Jain <kjain@linux.ibm.com>,
John Garry <john.garry@huawei.com>
Subject: [PATCH 1/5] perf expr: Add expr.c object
Date: Fri, 28 Feb 2020 10:36:12 +0100 [thread overview]
Message-ID: <20200228093616.67125-2-jolsa@kernel.org> (raw)
In-Reply-To: <20200228093616.67125-1-jolsa@kernel.org>
Add generic expr code into new expr.c object.
The expr.c object will be mainly used in following
change that will get rid of the manual flex code,
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/Build | 1 +
tools/perf/util/expr.c | 19 +++++++++++++++++++
tools/perf/util/expr.y | 16 ----------------
3 files changed, 20 insertions(+), 16 deletions(-)
create mode 100644 tools/perf/util/expr.c
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 07da6c790b63..6fdf073093a6 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -122,6 +122,7 @@ perf-y += vsprintf.o
perf-y += units.o
perf-y += time-utils.o
perf-y += expr-bison.o
+perf-y += expr.o
perf-y += branch.o
perf-y += mem2node.o
diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c
new file mode 100644
index 000000000000..816b23b2068a
--- /dev/null
+++ b/tools/perf/util/expr.c
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <assert.h>
+#include "expr.h"
+
+/* Caller must make sure id is allocated */
+void expr__add_id(struct parse_ctx *ctx, const char *name, double val)
+{
+ int idx;
+
+ assert(ctx->num_ids < MAX_PARSE_ID);
+ idx = ctx->num_ids++;
+ ctx->ids[idx].name = name;
+ ctx->ids[idx].val = val;
+}
+
+void expr__ctx_init(struct parse_ctx *ctx)
+{
+ ctx->num_ids = 0;
+}
diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
index 7d226241f1d7..7cea8b7c3a5c 100644
--- a/tools/perf/util/expr.y
+++ b/tools/perf/util/expr.y
@@ -6,7 +6,6 @@
#define IN_EXPR_Y 1
#include "expr.h"
#include "smt.h"
-#include <assert.h>
#include <string.h>
#define MAXIDLEN 256
@@ -169,21 +168,6 @@ static int expr__lex(YYSTYPE *res, const char **pp)
return tok;
}
-/* Caller must make sure id is allocated */
-void expr__add_id(struct parse_ctx *ctx, const char *name, double val)
-{
- int idx;
- assert(ctx->num_ids < MAX_PARSE_ID);
- idx = ctx->num_ids++;
- ctx->ids[idx].name = name;
- ctx->ids[idx].val = val;
-}
-
-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)
{
--
2.24.1
next prev parent reply other threads:[~2020-02-28 9:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-28 9:36 [PATCHv3 0/5] perf expr: Add flex scanner Jiri Olsa
2020-02-28 9:36 ` Jiri Olsa [this message]
2020-03-19 14:10 ` [tip: perf/core] perf expr: Add expr.c object tip-bot2 for Jiri Olsa
2020-02-28 9:36 ` [PATCH 2/5] perf expr: Move expr lexer to flex Jiri Olsa
2020-03-19 14:10 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2020-02-28 9:36 ` [PATCH 3/5] perf expr: Increase EXPR_MAX_OTHER Jiri Olsa
2020-03-19 14:10 ` [tip: perf/core] perf expr: Increase EXPR_MAX_OTHER to support metrics with more than 15 variables tip-bot2 for Jiri Olsa
2020-02-28 9:36 ` [PATCH 4/5] perf expr: Straighten expr__parse/expr__find_other interface Jiri Olsa
2020-03-19 14:10 ` [tip: perf/core] perf expr: Straighten expr__parse()/expr__find_other() interface tip-bot2 for Jiri Olsa
2020-02-28 9:36 ` [PATCH 5/5] perf expr: Make expr__parse return -1 on error Jiri Olsa
2020-03-19 14:10 ` [tip: perf/core] perf expr: Make expr__parse() " tip-bot2 for Jiri Olsa
2020-02-29 12:27 ` [PATCHv3 0/5] perf expr: Add flex scanner Andi Kleen
2020-03-09 13:39 ` Arnaldo Carvalho de Melo
-- strict thread matches above, loose matches on Subject: below --
2020-02-24 8:29 [PATCHv2 " Jiri Olsa
2020-02-24 8:29 ` [PATCH 1/5] perf expr: Add expr.c object 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=20200228093616.67125-2-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=john.garry@huawei.com \
--cc=kjain@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=ravi.bangoria@linux.ibm.com \
/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).