From 2c46f54249c6e86d8d81b5ea2452319f197caf17 Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Sun, 12 Jul 2020 15:26:17 +0200 Subject: perf metric: Rename expr__add_id() to expr__add_val() Rename expr__add_id() to expr__add_val() so we can use expr__add_id() to actually add just the id without any value in following changes. There's no functional change. Signed-off-by: Jiri Olsa Acked-by: Ian Rogers Cc: Alexander Shishkin Cc: Andi Kleen Cc: John Garry Cc: Kajol Jain Cc: Michael Petlan Cc: Namhyung Kim Cc: Paul Clarke Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lore.kernel.org/lkml/20200712132634.138901-2-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/expr.c | 4 ++-- tools/perf/tests/pmu-events.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/perf/tests') diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c index b7e5ef3007fc..d13fc1dfd5ef 100644 --- a/tools/perf/tests/expr.c +++ b/tools/perf/tests/expr.c @@ -24,8 +24,8 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused) struct expr_parse_ctx ctx; expr__ctx_init(&ctx); - expr__add_id(&ctx, strdup("FOO"), 1); - expr__add_id(&ctx, strdup("BAR"), 2); + expr__add_id_val(&ctx, strdup("FOO"), 1); + expr__add_id_val(&ctx, strdup("BAR"), 2); ret = test(&ctx, "1+1", 2); ret |= test(&ctx, "FOO+BAR", 3); diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index b66b021476ec..eb19f9a0bc15 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -492,7 +492,7 @@ static int test_parsing(void) */ k = 1; hashmap__for_each_entry((&ctx.ids), cur, bkt) - expr__add_id(&ctx, strdup(cur->key), k++); + expr__add_id_val(&ctx, strdup(cur->key), k++); hashmap__for_each_entry((&ctx.ids), cur, bkt) { if (check_parse_cpu(cur->key, map == cpus_map, @@ -547,7 +547,7 @@ static int metric_parse_fake(const char *str) */ i = 1; hashmap__for_each_entry((&ctx.ids), cur, bkt) - expr__add_id(&ctx, strdup(cur->key), i++); + expr__add_id_val(&ctx, strdup(cur->key), i++); hashmap__for_each_entry((&ctx.ids), cur, bkt) { if (check_parse_fake(cur->key)) { -- cgit v1.2.3