perf tests: Rename thread-mg-share to thread-maps-share

One more step in merging 'struct maps' with 'struct map_groups'.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-naxsl3g4ou3fyxb8l8e0pn5e@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
index e72accefd669b1669886e46ceffe1638fe9e841a..5b9b0a8139161e8526b7723f21257d521e64b00f 100644 (file)
--- a/tools/perf/tests/Build
+++ b/tools/perf/tests/Build
@@ -27,7 +27,7 @@ perf-y += wp.o
 perf-y += task-exit.o
 perf-y += sw-clock.o
 perf-y += mmap-thread-lookup.o
-perf-y += thread-mg-share.o
+perf-y += thread-maps-share.o
 perf-y += switch-tracking.o
 perf-y += keep-tracking.o
 perf-y += code-reading.o

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 8b286e9b75495602afcdd2160333cb3a0ca6b499..3a4b9837b54d074c99005fe9cf61801bc1ad61df 100644 (file)
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -166,8 +166,8 @@ static struct test generic_tests[] = {
                .func = test__mmap_thread_lookup,
        },
        {
-               .desc = "Share thread mg",
-               .func = test__thread_mg_share,
+               .desc = "Share thread maps",
+               .func = test__thread_maps_share,
        },
        {
                .desc = "Sort output of hist entries",

diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index 9837b6e930238307f3bcc0644e83edd0c732e94d..f2b9bb0247463e2c4e45472f9869df5718a762fa 100644 (file)
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -73,7 +73,7 @@ int test__dwarf_unwind(struct test *test, int subtest);
 int test__expr(struct test *test, int subtest);
 int test__hists_filter(struct test *test, int subtest);
 int test__mmap_thread_lookup(struct test *test, int subtest);
-int test__thread_mg_share(struct test *test, int subtest);
+int test__thread_maps_share(struct test *test, int subtest);
 int test__hists_output(struct test *test, int subtest);
 int test__hists_cumulate(struct test *test, int subtest);
 int test__switch_tracking(struct test *test, int subtest);

diff --git a/tools/perf/tests/thread-mg-share.c b/tools/perf/tests/thread-maps-share.c
similarity index 77%
rename from tools/perf/tests/thread-mg-share.c
rename to tools/perf/tests/thread-maps-share.c
index e3b0d692d565df31a7a62b356843b5c3215ecb99..9371484973f24dd38da674c97992550804507d1c 100644 (file)
--- a/tools/perf/tests/thread-mg-share.c
+++ b/tools/perf/tests/thread-maps-share.c
@@ -4,7 +4,7 @@
 #include "thread.h"
 #include "debug.h"
 
-int test__thread_mg_share(struct test *test __maybe_unused, int subtest __maybe_unused)
+int test__thread_maps_share(struct test *test __maybe_unused, int subtest __maybe_unused)
 {
        struct machines machines;
        struct machine *machine;
@@ -16,7 +16,7 @@ int test__thread_mg_share(struct test *test __maybe_unused, int subtest __maybe_
 
        /* other process */
        struct thread *other, *other_leader;
-       struct maps *other_mg;
+       struct maps *other_maps;
 
        /*
         * This test create 2 processes abstractions (struct thread)
@@ -45,14 +45,14 @@ int test__thread_mg_share(struct test *test __maybe_unused, int subtest __maybe_
        maps = leader->maps;
        TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(&maps->refcnt), 4);
 
-       /* test the map groups pointer is shared */
-       TEST_ASSERT_VAL("map groups don't match", maps == t1->maps);
-       TEST_ASSERT_VAL("map groups don't match", maps == t2->maps);
-       TEST_ASSERT_VAL("map groups don't match", maps == t3->maps);
+       /* test the maps pointer is shared */
+       TEST_ASSERT_VAL("maps don't match", maps == t1->maps);
+       TEST_ASSERT_VAL("maps don't match", maps == t2->maps);
+       TEST_ASSERT_VAL("maps don't match", maps == t3->maps);
 
        /*
         * Verify the other leader was created by previous call.
-        * It should have shared map groups with no change in
+        * It should have shared maps with no change in
         * refcnt.
         */
        other_leader = machine__find_thread(machine, 4, 4);
@@ -70,10 +70,10 @@ int test__thread_mg_share(struct test *test __maybe_unused, int subtest __maybe_
        machine__remove_thread(machine, other);
        machine__remove_thread(machine, other_leader);
 
-       other_mg = other->maps;
-       TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(&other_mg->refcnt), 2);
+       other_maps = other->maps;
+       TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(&other_maps->refcnt), 2);
 
-       TEST_ASSERT_VAL("map groups don't match", other_mg == other_leader->maps);
+       TEST_ASSERT_VAL("maps don't match", other_maps == other_leader->maps);
 
        /* release thread group */
        thread__put(leader);
@@ -89,7 +89,7 @@ int test__thread_mg_share(struct test *test __maybe_unused, int subtest __maybe_
 
        /* release other group  */
        thread__put(other_leader);
-       TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(&other_mg->refcnt), 1);
+       TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(&other_maps->refcnt), 1);
 
        thread__put(other);