perf tests: Show refcounting broken expectations in thread-mg-share test

To help understand the failure.

  [acme@zoo linux]$ perf test -v 30
  30: Test thread mg sharing                                 :
  --- start ---
  test child forked, pid 12275
  FAILED tests/thread-mg-share.c:68 wrong refcnt (4 != 3)
  test child finished with -1
  ---- end ----
  Test thread mg sharing: FAILED!
  [acme@zoo linux]$

This is under investigation, the thread__delete() calls were replaced
with thread__put(), and those cause mismatches because now we need to be
more judicious with the thread lifetime management.

I.e. previously the thread__delete() would drop the map_group refcount,
but now since thread__put doesn't call thread__delete() necessarily.
because we have other refcount holders, the map_group refcount will not
be as we expected when this test was implemented.

Will be fixed soon...

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-9y8e3f7ukzco5loxvnlitpfq@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index 52758a33f64c5679bb39a2a545320d9a3a44d303..a10eaf5c47679d8b2cfa5cd2d2096ab20efb4589 100644 (file)
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -9,6 +9,15 @@ do {                                                                    \
        }                                                                \
 } while (0)
 
+#define TEST_ASSERT_EQUAL(text, val, expected)                          \
+do {                                                                    \
+       if (val != expected) {                                           \
+               pr_debug("FAILED %s:%d %s (%d != %d)\n",                 \
+                        __FILE__, __LINE__, text, val, expected);       \
+               return -1;                                               \
+       }                                                                \
+} while (0)
+
 enum {
        TEST_OK   =  0,
        TEST_FAIL = -1,

diff --git a/tools/perf/tests/thread-mg-share.c b/tools/perf/tests/thread-mg-share.c
index dc05bd62b4a3345baacff5c51acf27f52eddea03..04ecceed4e5b244e7ccf41e1ff2b688eee324178 100644 (file)
--- a/tools/perf/tests/thread-mg-share.c
+++ b/tools/perf/tests/thread-mg-share.c
@@ -43,7 +43,7 @@ int test__thread_mg_share(void)
                        leader && t1 && t2 && t3 && other);
 
        mg = leader->mg;
-       TEST_ASSERT_VAL("wrong refcnt", mg->refcnt == 4);
+       TEST_ASSERT_EQUAL("wrong refcnt", mg->refcnt, 4);
 
        /* test the map groups pointer is shared */
        TEST_ASSERT_VAL("map groups don't match", mg == t1->mg);
@@ -59,25 +59,25 @@ int test__thread_mg_share(void)
        TEST_ASSERT_VAL("failed to find other leader", other_leader);
 
        other_mg = other->mg;
-       TEST_ASSERT_VAL("wrong refcnt", other_mg->refcnt == 2);
+       TEST_ASSERT_EQUAL("wrong refcnt", other_mg->refcnt, 2);
 
        TEST_ASSERT_VAL("map groups don't match", other_mg == other_leader->mg);
 
        /* release thread group */
        thread__put(leader);
-       TEST_ASSERT_VAL("wrong refcnt", mg->refcnt == 3);
+       TEST_ASSERT_EQUAL("wrong refcnt", mg->refcnt, 3);
 
        thread__put(t1);
-       TEST_ASSERT_VAL("wrong refcnt", mg->refcnt == 2);
+       TEST_ASSERT_EQUAL("wrong refcnt", mg->refcnt, 2);
 
        thread__put(t2);
-       TEST_ASSERT_VAL("wrong refcnt", mg->refcnt == 1);
+       TEST_ASSERT_EQUAL("wrong refcnt", mg->refcnt, 1);
 
        thread__put(t3);
 
        /* release other group  */
        thread__put(other_leader);
-       TEST_ASSERT_VAL("wrong refcnt", other_mg->refcnt == 1);
+       TEST_ASSERT_EQUAL("wrong refcnt", other_mg->refcnt, 1);
 
        thread__put(other);