perf expr: Migrate expr ids table to a hashmap

[linux-2.6-microblaze.git] / tools / perf / tests / expr.c

diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c
index 28313e5..13350c5 100644 (file)
--- a/tools/perf/tests/expr.c
+++ b/tools/perf/tests/expr.c
@@ -6,11 +6,11 @@
 #include <string.h>
 #include <linux/zalloc.h>
 
-static int test(struct parse_ctx *ctx, const char *e, double val2)
+static int test(struct expr_parse_ctx *ctx, const char *e, double val2)
 {
        double val;
 
-       if (expr__parse(&val, ctx, e))
+       if (expr__parse(&val, ctx, e, 1))
                TEST_ASSERT_VAL("parse test failed", 0);
        TEST_ASSERT_VAL("unexpected value", val == val2);
        return 0;
@@ -19,15 +19,13 @@ static int test(struct parse_ctx *ctx, const char *e, double val2)
 int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)
 {
        const char *p;
-       const char **other;
-       double val;
-       int i, ret;
-       struct parse_ctx ctx;
-       int num_other;
+       double val, *val_ptr;
+       int ret;
+       struct expr_parse_ctx ctx;
 
        expr__ctx_init(&ctx);
-       expr__add_id(&ctx, "FOO", 1);
-       expr__add_id(&ctx, "BAR", 2);
+       expr__add_id(&ctx, strdup("FOO"), 1);
+       expr__add_id(&ctx, strdup("BAR"), 2);
 
        ret = test(&ctx, "1+1", 2);
        ret |= test(&ctx, "FOO+BAR", 3);
@@ -39,29 +37,42 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)
        ret |= test(&ctx, "min(1,2) + 1", 2);
        ret |= test(&ctx, "max(1,2) + 1", 3);
        ret |= test(&ctx, "1+1 if 3*4 else 0", 2);
+       ret |= test(&ctx, "1.1 + 2.1", 3.2);
 
        if (ret)
                return ret;
 
        p = "FOO/0";
-       ret = expr__parse(&val, &ctx, p);
+       ret = expr__parse(&val, &ctx, p, 1);
        TEST_ASSERT_VAL("division by zero", ret == -1);
 
        p = "BAR/";
-       ret = expr__parse(&val, &ctx, p);
+       ret = expr__parse(&val, &ctx, p, 1);
        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",
+                                                   (void **)&val_ptr));
+       TEST_ASSERT_VAL("find other", hashmap__find(&ctx.ids, "BAZ",
+                                                   (void **)&val_ptr));
+       TEST_ASSERT_VAL("find other", hashmap__find(&ctx.ids, "BOZO",
+                                                   (void **)&val_ptr));
+
+       expr__ctx_clear(&ctx);
        TEST_ASSERT_VAL("find other",
-                       expr__find_other("FOO + BAR + BAZ + BOZO", "FOO", &other, &num_other) == 0);
-       TEST_ASSERT_VAL("find other", num_other == 3);
-       TEST_ASSERT_VAL("find other", !strcmp(other[0], "BAR"));
-       TEST_ASSERT_VAL("find other", !strcmp(other[1], "BAZ"));
-       TEST_ASSERT_VAL("find other", !strcmp(other[2], "BOZO"));
-       TEST_ASSERT_VAL("find other", other[3] == NULL);
+                       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/",
+                                                   (void **)&val_ptr));
+       TEST_ASSERT_VAL("find other", hashmap__find(&ctx.ids, "EVENT2,param=3/",
+                                                   (void **)&val_ptr));
 
-       for (i = 0; i < num_other; i++)
-               zfree(&other[i]);
-       free((void *)other);
+       expr__ctx_clear(&ctx);
 
        return 0;
 }