perf metric: Rename expr__find_other.

A later change will remove the notion of other, rename the function to
expr__find_ids as this is what it populates.

Signed-off-by: Ian Rogers <irogers@google.com>
Tested-by: John Garry <john.garry@huawei.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sandeep Dasgupta <sdasgup@google.com>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/r/20210923074616.674826-8-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c
index b0a3b5fd0c008a03d0045180c79208fa77b352bf..7ccb97c73347d94cf1566724ca2b3fda7d6fda97 100644 (file)
--- a/tools/perf/tests/expr.c
+++ b/tools/perf/tests/expr.c
@@ -64,25 +64,25 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)
        TEST_ASSERT_VAL("missing operand", ret == -1);
 
        expr__ctx_clear(ctx);
-       TEST_ASSERT_VAL("find other",
-                       expr__find_other("FOO + BAR + BAZ + BOZO", "FOO",
-                                        ctx, 1) == 0);
-       TEST_ASSERT_VAL("find other", hashmap__size(ctx->ids) == 3);
-       TEST_ASSERT_VAL("find other", hashmap__find(ctx->ids, "BAR",
+       TEST_ASSERT_VAL("find ids",
+                       expr__find_ids("FOO + BAR + BAZ + BOZO", "FOO",
+                                       ctx, 1) == 0);
+       TEST_ASSERT_VAL("find ids", hashmap__size(ctx->ids) == 3);
+       TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "BAR",
                                                    (void **)&val_ptr));
-       TEST_ASSERT_VAL("find other", hashmap__find(ctx->ids, "BAZ",
+       TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "BAZ",
                                                    (void **)&val_ptr));
-       TEST_ASSERT_VAL("find other", hashmap__find(ctx->ids, "BOZO",
+       TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "BOZO",
                                                    (void **)&val_ptr));
 
        expr__ctx_clear(ctx);
-       TEST_ASSERT_VAL("find other",
-                       expr__find_other("EVENT1\\,param\\=?@ + EVENT2\\,param\\=?@",
-                                        NULL, ctx, 3) == 0);
-       TEST_ASSERT_VAL("find other", hashmap__size(ctx->ids) == 2);
-       TEST_ASSERT_VAL("find other", hashmap__find(ctx->ids, "EVENT1,param=3/",
+       TEST_ASSERT_VAL("find ids",
+                       expr__find_ids("EVENT1\\,param\\=?@ + EVENT2\\,param\\=?@",
+                                       NULL, ctx, 3) == 0);
+       TEST_ASSERT_VAL("find ids", hashmap__size(ctx->ids) == 2);
+       TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "EVENT1,param=3/",
                                                    (void **)&val_ptr));
-       TEST_ASSERT_VAL("find other", hashmap__find(ctx->ids, "EVENT2,param=3/",
+       TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "EVENT2,param=3/",
                                                    (void **)&val_ptr));
 
        expr__ctx_free(ctx);

diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c
index 91076ab0514b686df6109ac125f5cc10a02ed576..d3534960ed2585e3c730c6fba0032151161bd5b8 100644 (file)
--- a/tools/perf/tests/pmu-events.c
+++ b/tools/perf/tests/pmu-events.c
@@ -866,7 +866,7 @@ static int resolve_metric_simple(struct expr_parse_ctx *pctx,
                        ref->metric_expr = pe->metric_expr;
                        list_add_tail(&metric->list, compound_list);
 
-                       rc = expr__find_other(pe->metric_expr, NULL, pctx, 0);
+                       rc = expr__find_ids(pe->metric_expr, NULL, pctx, 0);
                        if (rc)
                                goto out_err;
                        break; /* The hashmap has been modified, so restart */
@@ -916,9 +916,8 @@ static int test_parsing(void)
                        if (!pe->metric_expr)
                                continue;
                        expr__ctx_clear(ctx);
-                       if (expr__find_other(pe->metric_expr, NULL, ctx, 0)
-                                 < 0) {
-                               expr_failure("Parse other failed", map, pe);
+                       if (expr__find_ids(pe->metric_expr, NULL, ctx, 0) < 0) {
+                               expr_failure("Parse find ids failed", map, pe);
                                ret++;
                                continue;
                        }
@@ -990,8 +989,8 @@ static int metric_parse_fake(const char *str)
                pr_debug("expr__ctx_new failed");
                return TEST_FAIL;
        }
-       if (expr__find_other(str, NULL, ctx, 0) < 0) {
-               pr_err("expr__find_other failed\n");
+       if (expr__find_ids(str, NULL, ctx, 0) < 0) {
+               pr_err("expr__find_ids failed\n");
                return -1;
        }
 

diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c
index 7b1c06772a4913ca9c0e8be17f6fa3ea1e9beb27..adf16bb7571a999005612ad5dc62a97d717ba72e 100644 (file)
--- a/tools/perf/util/expr.c
+++ b/tools/perf/util/expr.c
@@ -288,8 +288,8 @@ int expr__parse(double *final_val, struct expr_parse_ctx *ctx,
        return __expr__parse(final_val, ctx, expr, EXPR_PARSE, runtime) ? -1 : 0;
 }
 
-int expr__find_other(const char *expr, const char *one,
-                    struct expr_parse_ctx *ctx, int runtime)
+int expr__find_ids(const char *expr, const char *one,
+                  struct expr_parse_ctx *ctx, int runtime)
 {
        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 5fa394f104188f945b33f1f1e85fa826f1e54d6a..de109c2ab9176f80df605e19e64644eacb29d977 100644 (file)
--- a/tools/perf/util/expr.h
+++ b/tools/perf/util/expr.h
@@ -43,7 +43,7 @@ int expr__resolve_id(struct expr_parse_ctx *ctx, const char *id,
                     struct expr_id_data **datap);
 int expr__parse(double *final_val, struct expr_parse_ctx *ctx,
                const char *expr, int runtime);
-int expr__find_other(const char *expr, const char *one,
+int expr__find_ids(const char *expr, const char *one,
                struct expr_parse_ctx *ids, int runtime);
 
 double expr_id_data__value(const struct expr_id_data *data);

diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index b7924a2f1f4544ecc9d2844a67bb77211bb66be3..046fb3fe1700b6b70749a835f457f2c09a4e47ac 100644 (file)
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -857,7 +857,7 @@ static int __add_metric(struct list_head *metric_list,
         * For both the parent and referenced metrics, we parse
         * all the metric's IDs and add it to the parent context.
         */
-       if (expr__find_other(pe->metric_expr, NULL, m->pctx, runtime) < 0) {
+       if (expr__find_ids(pe->metric_expr, NULL, m->pctx, runtime) < 0) {
                if (m->metric_refs_cnt == 0) {
                        expr__ctx_free(m->pctx);
                        free(m);

diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
index c9fa07e49e7204bb0f2911e684b90a53b06d1842..9bc841e09a0c7dd2724d482891052e501363b8ea 100644 (file)
--- a/tools/perf/util/stat-shadow.c
+++ b/tools/perf/util/stat-shadow.c
@@ -392,9 +392,9 @@ void perf_stat__collect_metric_expr(struct evlist *evsel_list)
                expr__ctx_clear(ctx);
                metric_events = counter->metric_events;
                if (!metric_events) {
-                       if (expr__find_other(counter->metric_expr,
-                                            counter->name,
-                                            ctx, 1) < 0)
+                       if (expr__find_ids(counter->metric_expr,
+                                          counter->name,
+                                          ctx, 1) < 0)
                                continue;
 
                        metric_events = calloc(sizeof(struct evsel *),