109 lines
3.1 KiB
Diff
109 lines
3.1 KiB
Diff
From 394191d5b78ee88a058463b156c75919c8969005 Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Fri, 28 Feb 2020 10:36:12 +0100
|
|
Subject: [PATCH 052/201] perf expr: Add expr.c object
|
|
|
|
mainline inclusion
|
|
from mainline-v5.7-rc1
|
|
commit 576a65b6974ddc830a89b6feb6823bd6b5914bde
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=576a65b6974ddc830a89b6feb6823bd6b5914bde
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
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>
|
|
Reviewed-by: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: John Garry <john.garry@huawei.com>
|
|
Cc: Kajol Jain <kjain@linux.ibm.com>
|
|
Cc: Michael Petlan <mpetlan@redhat.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
|
|
Link: http://lore.kernel.org/lkml/20200228093616.67125-2-jolsa@kernel.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
|
|
Conflicts:
|
|
tools/perf/util/Build
|
|
---
|
|
tools/perf/util/Build | 1 +
|
|
tools/perf/util/expr.c | 19 +++++++++++++++++++
|
|
tools/perf/util/expr.y | 15 ---------------
|
|
3 files changed, 20 insertions(+), 15 deletions(-)
|
|
create mode 100644 tools/perf/util/expr.c
|
|
|
|
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
|
|
index de3b99f927ac..a7d2bb7edb2d 100644
|
|
--- a/tools/perf/util/Build
|
|
+++ b/tools/perf/util/Build
|
|
@@ -106,6 +106,7 @@ libperf-y += drv_configs.o
|
|
libperf-y += units.o
|
|
libperf-y += time-utils.o
|
|
libperf-y += expr-bison.o
|
|
+libperf-y += expr.o
|
|
libperf-y += branch.o
|
|
libperf-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 e7bd19c384ae..5f75e27d1bd8 100644
|
|
--- a/tools/perf/util/expr.y
|
|
+++ b/tools/perf/util/expr.y
|
|
@@ -167,21 +167,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.27.0
|
|
|