94 lines
3.2 KiB
Diff
94 lines
3.2 KiB
Diff
From 130b083fbf5b21bd12a82db4b38b32b5fe7ba0dc Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Sun, 19 Jul 2020 20:13:05 +0200
|
|
Subject: [PATCH 110/201] perf metric: Add expr__del_id function
|
|
|
|
mainline inclusion
|
|
from mainline-v5.9-rc1
|
|
commit 332603c2aa1a3be92720343269e670f8118a8831
|
|
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=332603c2aa1a3be92720343269e670f8118a8831
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Adding expr__del_id function to remove ID from hashmap. It will save us
|
|
few lines in following changes.
|
|
|
|
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-5-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 | 21 +++++++++++++--------
|
|
tools/perf/util/expr.h | 1 +
|
|
2 files changed, 14 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c
|
|
index db2036cc41bf..5f7e606a2a95 100644
|
|
--- a/tools/perf/util/expr.c
|
|
+++ b/tools/perf/util/expr.c
|
|
@@ -76,6 +76,17 @@ int expr__get_id(struct expr_parse_ctx *ctx, const char *id,
|
|
return hashmap__find(&ctx->ids, id, (void **)data) ? 0 : -1;
|
|
}
|
|
|
|
+void expr__del_id(struct expr_parse_ctx *ctx, const char *id)
|
|
+{
|
|
+ struct expr_id_data *old_val = NULL;
|
|
+ char *old_key = NULL;
|
|
+
|
|
+ hashmap__delete(&ctx->ids, id,
|
|
+ (const void **)&old_key, (void **)&old_val);
|
|
+ free(old_key);
|
|
+ free(old_val);
|
|
+}
|
|
+
|
|
void expr__ctx_init(struct expr_parse_ctx *ctx)
|
|
{
|
|
hashmap__init(&ctx->ids, key_hash, key_equal, NULL);
|
|
@@ -132,16 +143,10 @@ 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)
|
|
{
|
|
- struct expr_id_data *old_val = NULL;
|
|
- char *old_key = NULL;
|
|
int ret = __expr__parse(NULL, ctx, expr, EXPR_OTHER, runtime);
|
|
|
|
- if (one) {
|
|
- hashmap__delete(&ctx->ids, one,
|
|
- (const void **)&old_key, (void **)&old_val);
|
|
- free(old_key);
|
|
- free(old_val);
|
|
- }
|
|
+ if (one)
|
|
+ expr__del_id(ctx, one);
|
|
|
|
return ret;
|
|
}
|
|
diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h
|
|
index f38292fdab19..2462abd0ac65 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);
|
|
+void expr__del_id(struct expr_parse_ctx *ctx, const char *id);
|
|
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,
|
|
--
|
|
2.27.0
|
|
|