perf test: Use pointer for maps

struct maps is reference counted, using a pointer is more idiomatic.

Committer notes:

Check maps__new() return.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: André Almeida <andrealmeid@collabora.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: Hao Luo <haoluo@google.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Miaoqian Lin <linmq006@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Shunsuke Nakamura <nakamura.shun@fujitsu.com>
Cc: Song Liu <song@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Stephen Brennan <stephen.s.brennan@oracle.com>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Yury Norov <yury.norov@gmail.com>
Link: http://lore.kernel.org/lkml/20220211103415.2737789-7-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/tests/maps.c b/tools/perf/tests/maps.c
index e308a32..a69988a 100644 (file)
--- a/tools/perf/tests/maps.c
+++ b/tools/perf/tests/maps.c
@@ -35,7 +35,6 @@ static int check_maps(struct map_def *merged, unsigned int size, struct maps *ma
 
 static int test__maps__merge_in(struct test_suite *t __maybe_unused, int subtest __maybe_unused)
 {
-       struct maps maps;
        unsigned int i;
        struct map_def bpf_progs[] = {
                { "bpf_prog_1", 200, 300 },
@@ -63,8 +62,9 @@ static int test__maps__merge_in(struct test_suite *t __maybe_unused, int subtest
        };
        struct map *map_kcore1, *map_kcore2, *map_kcore3;
        int ret;
+       struct maps *maps = maps__new(NULL);
 
-       maps__init(&maps, NULL);
+       TEST_ASSERT_VAL("failed to create maps", maps);
 
        for (i = 0; i < ARRAY_SIZE(bpf_progs); i++) {
                struct map *map;
@@ -74,7 +74,7 @@ static int test__maps__merge_in(struct test_suite *t __maybe_unused, int subtest
 
                map->start = bpf_progs[i].start;
                map->end   = bpf_progs[i].end;
-               maps__insert(&maps, map);
+               maps__insert(maps, map);
                map__put(map);
        }
 
@@ -99,25 +99,25 @@ static int test__maps__merge_in(struct test_suite *t __maybe_unused, int subtest
        map_kcore3->start = 880;
        map_kcore3->end   = 1100;
 
-       ret = maps__merge_in(&maps, map_kcore1);
+       ret = maps__merge_in(maps, map_kcore1);
        TEST_ASSERT_VAL("failed to merge map", !ret);
 
-       ret = check_maps(merged12, ARRAY_SIZE(merged12), &maps);
+       ret = check_maps(merged12, ARRAY_SIZE(merged12), maps);
        TEST_ASSERT_VAL("merge check failed", !ret);
 
-       ret = maps__merge_in(&maps, map_kcore2);
+       ret = maps__merge_in(maps, map_kcore2);
        TEST_ASSERT_VAL("failed to merge map", !ret);
 
-       ret = check_maps(merged12, ARRAY_SIZE(merged12), &maps);
+       ret = check_maps(merged12, ARRAY_SIZE(merged12), maps);
        TEST_ASSERT_VAL("merge check failed", !ret);
 
-       ret = maps__merge_in(&maps, map_kcore3);
+       ret = maps__merge_in(maps, map_kcore3);
        TEST_ASSERT_VAL("failed to merge map", !ret);
 
-       ret = check_maps(merged3, ARRAY_SIZE(merged3), &maps);
+       ret = check_maps(merged3, ARRAY_SIZE(merged3), maps);
        TEST_ASSERT_VAL("merge check failed", !ret);
 
-       maps__exit(&maps);
+       maps__delete(maps);
        return TEST_OK;
 }