147 lines
4.6 KiB
Diff
147 lines
4.6 KiB
Diff
From 19986eb8a8bd660c1026bb21913160989536e51f Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Sun, 12 Jul 2020 15:26:18 +0200
|
|
Subject: [PATCH 106/201] perf metric: Add 'struct expr_id_data' to keep expr
|
|
value
|
|
|
|
mainline inclusion
|
|
from mainline-v5.9-rc1
|
|
commit ce0dc7d22271fa7eac3875fc9b57772742b8245e
|
|
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=ce0dc7d22271fa7eac3875fc9b57772742b8245e
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Add 'struct expr_id_data' to keep an expr value instead of just a simple
|
|
double pointer, so we can store more data for ID in the following
|
|
changes.
|
|
|
|
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
|
|
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: Kajol Jain <kjain@linux.ibm.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/20200712132634.138901-3-jolsa@kernel.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
|
|
Conflicts:
|
|
tools/perf/util/metricgroup.c
|
|
---
|
|
tools/perf/tests/expr.c | 3 ++-
|
|
tools/perf/util/expr.c | 22 +++++++++++-----------
|
|
tools/perf/util/expr.h | 4 ++++
|
|
tools/perf/util/metricgroup.c | 2 +-
|
|
4 files changed, 18 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c
|
|
index d1a5a6f25c50..992b7546b9da 100644
|
|
--- a/tools/perf/tests/expr.c
|
|
+++ b/tools/perf/tests/expr.c
|
|
@@ -16,8 +16,9 @@ static int test(struct expr_parse_ctx *ctx, const char *e, double val2)
|
|
|
|
int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
+ struct expr_id_data *val_ptr;
|
|
const char *p;
|
|
- double val, *val_ptr;
|
|
+ double val;
|
|
int ret;
|
|
struct expr_parse_ctx ctx;
|
|
|
|
diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c
|
|
index e7b929a6d7a8..e328931dcfe1 100644
|
|
--- a/tools/perf/util/expr.c
|
|
+++ b/tools/perf/util/expr.c
|
|
@@ -30,32 +30,32 @@ static bool key_equal(const void *key1, const void *key2,
|
|
}
|
|
|
|
/* Caller must make sure id is allocated */
|
|
-int expr__add_id_val(struct expr_parse_ctx *ctx, const char *name, double val)
|
|
+int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val)
|
|
{
|
|
- double *val_ptr = NULL, *old_val = NULL;
|
|
+ struct expr_id_data *data_ptr = NULL, *old_data = NULL;
|
|
char *old_key = NULL;
|
|
int ret;
|
|
|
|
if (val != 0.0) {
|
|
- val_ptr = malloc(sizeof(double));
|
|
- if (!val_ptr)
|
|
+ data_ptr = malloc(sizeof(*data_ptr));
|
|
+ if (!data_ptr)
|
|
return -ENOMEM;
|
|
- *val_ptr = val;
|
|
+ data_ptr->val = val;
|
|
}
|
|
- ret = hashmap__set(&ctx->ids, name, val_ptr,
|
|
- (const void **)&old_key, (void **)&old_val);
|
|
+ ret = hashmap__set(&ctx->ids, id, data_ptr,
|
|
+ (const void **)&old_key, (void **)&old_data);
|
|
free(old_key);
|
|
- free(old_val);
|
|
+ free(old_data);
|
|
return ret;
|
|
}
|
|
|
|
int expr__get_id(struct expr_parse_ctx *ctx, const char *id, double *val_ptr)
|
|
{
|
|
- double *data;
|
|
+ struct expr_id_data *data;
|
|
|
|
if (!hashmap__find(&ctx->ids, id, (void **)&data))
|
|
return -1;
|
|
- *val_ptr = (data == NULL) ? 0.0 : *data;
|
|
+ *val_ptr = (data == NULL) ? 0.0 : data->val;
|
|
return 0;
|
|
}
|
|
|
|
@@ -115,7 +115,7 @@ int expr__parse(double *final_val, struct expr_parse_ctx *ctx,
|
|
int expr__find_other(const char *expr, const char *one,
|
|
struct expr_parse_ctx *ctx, int runtime)
|
|
{
|
|
- double *old_val = NULL;
|
|
+ struct expr_id_data *old_val = NULL;
|
|
char *old_key = NULL;
|
|
int ret = __expr__parse(NULL, ctx, expr, EXPR_OTHER, runtime);
|
|
|
|
diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h
|
|
index bb6bac836b48..21fe5bd85718 100644
|
|
--- a/tools/perf/util/expr.h
|
|
+++ b/tools/perf/util/expr.h
|
|
@@ -15,6 +15,10 @@ struct expr_parse_ctx {
|
|
struct hashmap ids;
|
|
};
|
|
|
|
+struct expr_id_data {
|
|
+ double val;
|
|
+};
|
|
+
|
|
struct expr_scanner_ctx {
|
|
int start_token;
|
|
int runtime;
|
|
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
|
|
index 230c6d092ca2..43f08a1e51ae 100644
|
|
--- a/tools/perf/util/metricgroup.c
|
|
+++ b/tools/perf/util/metricgroup.c
|
|
@@ -144,7 +144,7 @@ static struct perf_evsel *find_evsel_group(struct perf_evlist *perf_evlist,
|
|
unsigned long *evlist_used)
|
|
{
|
|
struct perf_evsel *ev, *current_leader = NULL;
|
|
- double *val_ptr;
|
|
+ struct expr_id_data *val_ptr;
|
|
int i = 0, matched_events = 0, events_to_match;
|
|
const int idnum = (int)hashmap__size(&pctx->ids);
|
|
|
|
--
|
|
2.27.0
|
|
|