116 lines
3.8 KiB
Diff
116 lines
3.8 KiB
Diff
From eec278ff30e74f887718f6e7b25a6f55f6e1a93e Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Sun, 19 Jul 2020 20:13:03 +0200
|
|
Subject: [PATCH 108/201] perf metric: Add expr__add_id function
|
|
|
|
mainline inclusion
|
|
from mainline-v5.9-rc1
|
|
commit 070b3b5ad7bd077e673cad2c591a2ecf49c0b58a
|
|
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=070b3b5ad7bd077e673cad2c591a2ecf49c0b58a
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Add the expr__add_id() function to data for ID with zero value, which is
|
|
used when scanning the expression for IDs.
|
|
|
|
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
|
|
Reviewed-by: Kajol Jain <kjain@linux.ibm.com>
|
|
Acked-by: Ian Rogers <irogers@google.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: John Garry <john.garry@huawei.com>
|
|
Cc: Michael Petlan <mpetlan@redhat.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Paul Clarke <pc@us.ibm.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Stephane Eranian <eranian@google.com>
|
|
Link: http://lore.kernel.org/lkml/20200719181320.785305-3-jolsa@kernel.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/util/expr.c | 31 +++++++++++++++++++++++++------
|
|
tools/perf/util/expr.h | 1 +
|
|
tools/perf/util/expr.y | 2 +-
|
|
3 files changed, 27 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c
|
|
index 4dec1add3a13..719313de63eb 100644
|
|
--- a/tools/perf/util/expr.c
|
|
+++ b/tools/perf/util/expr.c
|
|
@@ -29,6 +29,26 @@ static bool key_equal(const void *key1, const void *key2,
|
|
return !strcmp((const char *)key1, (const char *)key2);
|
|
}
|
|
|
|
+/* Caller must make sure id is allocated */
|
|
+int expr__add_id(struct expr_parse_ctx *ctx, const char *id)
|
|
+{
|
|
+ struct expr_id_data *data_ptr = NULL, *old_data = NULL;
|
|
+ char *old_key = NULL;
|
|
+ int ret;
|
|
+
|
|
+ data_ptr = malloc(sizeof(*data_ptr));
|
|
+ if (!data_ptr)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ ret = hashmap__set(&ctx->ids, id, data_ptr,
|
|
+ (const void **)&old_key, (void **)&old_data);
|
|
+ if (ret)
|
|
+ free(data_ptr);
|
|
+ free(old_key);
|
|
+ free(old_data);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
/* Caller must make sure id is allocated */
|
|
int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val)
|
|
{
|
|
@@ -36,12 +56,11 @@ int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val)
|
|
char *old_key = NULL;
|
|
int ret;
|
|
|
|
- if (val != 0.0) {
|
|
- data_ptr = malloc(sizeof(*data_ptr));
|
|
- if (!data_ptr)
|
|
- return -ENOMEM;
|
|
- data_ptr->val = val;
|
|
- }
|
|
+ data_ptr = malloc(sizeof(*data_ptr));
|
|
+ if (!data_ptr)
|
|
+ return -ENOMEM;
|
|
+ data_ptr->val = val;
|
|
+
|
|
ret = hashmap__set(&ctx->ids, id, data_ptr,
|
|
(const void **)&old_key, (void **)&old_data);
|
|
if (ret)
|
|
diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h
|
|
index 21fe5bd85718..ac32cda42006 100644
|
|
--- a/tools/perf/util/expr.h
|
|
+++ b/tools/perf/util/expr.h
|
|
@@ -26,6 +26,7 @@ struct expr_scanner_ctx {
|
|
|
|
void expr__ctx_init(struct expr_parse_ctx *ctx);
|
|
void expr__ctx_clear(struct expr_parse_ctx *ctx);
|
|
+int expr__add_id(struct expr_parse_ctx *ctx, const char *id);
|
|
int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val);
|
|
int expr__get_id(struct expr_parse_ctx *ctx, const char *id, double *val_ptr);
|
|
int expr__parse(double *final_val, struct expr_parse_ctx *ctx,
|
|
diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
|
|
index e43f4ad1a7d3..a04c969fb5ee 100644
|
|
--- a/tools/perf/util/expr.y
|
|
+++ b/tools/perf/util/expr.y
|
|
@@ -59,7 +59,7 @@ all_other: all_other other
|
|
|
|
other: ID
|
|
{
|
|
- expr__add_id_val(ctx, $1, 0.0);
|
|
+ expr__add_id(ctx, $1);
|
|
}
|
|
|
|
|
MIN | MAX | IF | ELSE | SMT_ON | NUMBER | '|' | '^' | '&' | '-' | '+' | '*' | '/' | '%' | '(' | ')' | ','
|
|
--
|
|
2.27.0
|
|
|