[PATCH 20/40] perf tools: Add a test case for timed map groups handling
A test case for verifying thread->mg and ->mg_list handling during
time change and new thread__find_addr_map_by_time() and friends.
Cc: Frederic Weisbecker
Signed-off-by: Namhyung Kim
---
tools/perf/tests/Build| 1 +
tools/perf/tests/builtin-test.c | 4 ++
tools/perf/tests/tests.h | 1 +
tools/perf/tests/thread-mg-time.c | 93 +++
4 files changed, 99 insertions(+)
create mode 100644 tools/perf/tests/thread-mg-time.c
diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
index 5ad495823b49..cfd59c61bcd2 100644
--- a/tools/perf/tests/Build
+++ b/tools/perf/tests/Build
@@ -27,6 +27,7 @@ perf-y += mmap-thread-lookup.o
perf-y += thread-comm.o
perf-y += thread-mg-share.o
perf-y += thread-lookup-time.o
+perf-y += thread-mg-time.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 e83c7ce1b38a..c5dbeb3d75b1 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -179,6 +179,10 @@ static struct test {
.func = test__thread_lookup_time,
},
{
+ .desc = "Test thread map group handling with time",
+ .func = test__thread_mg_time,
+ },
+ {
.func = NULL,
},
};
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index e9aa78c3d8fc..a2e1f729ae23 100644
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -63,6 +63,7 @@ int test__fdarray__add(void);
int test__kmod_path__parse(void);
int test__thread_comm(void);
int test__thread_lookup_time(void);
+int test__thread_mg_time(void);
#if defined(__x86_64__) || defined(__i386__) || defined(__arm__)
#ifdef HAVE_DWARF_UNWIND_SUPPORT
diff --git a/tools/perf/tests/thread-mg-time.c
b/tools/perf/tests/thread-mg-time.c
new file mode 100644
index ..841777125a64
--- /dev/null
+++ b/tools/perf/tests/thread-mg-time.c
@@ -0,0 +1,93 @@
+#include "tests.h"
+#include "machine.h"
+#include "thread.h"
+#include "map.h"
+#include "debug.h"
+
+#define PERF_MAP_START 0x4
+
+int test__thread_mg_time(void)
+{
+ struct machines machines;
+ struct machine *machine;
+ struct thread *t;
+ struct map_groups *mg;
+ struct map *map, *old_map;
+ struct addr_location al = { .map = NULL, };
+
+ /*
+* This test is to check whether it can retrieve a correct map
+* for a given time. When multi-file data storage is enabled,
+* those task/comm/mmap events are processed first so the
+* later sample should find a matching comm properly.
+*/
+ machines__init();
+ machine =
+
+ /* this is needed to add/find map by time */
+ perf_has_index = true;
+
+ t = machine__findnew_thread(machine, 0, 0);
+ mg = t->mg;
+
+ map = dso__new_map("/usr/bin/perf");
+ map->start = PERF_MAP_START;
+ map->end = PERF_MAP_START + 0x1000;
+
+ thread__insert_map(t, map);
+
+ if (verbose > 1)
+ map_groups__fprintf(t->mg, stderr);
+
+ thread__find_addr_map(t, PERF_RECORD_MISC_USER, MAP__FUNCTION,
+ PERF_MAP_START, );
+
+ TEST_ASSERT_VAL("cannot find mapping for perf", al.map != NULL);
+ TEST_ASSERT_VAL("non matched mapping found", al.map == map);
+ TEST_ASSERT_VAL("incorrect map groups", al.map->groups == mg);
+ TEST_ASSERT_VAL("incorrect map groups", al.map->groups == t->mg);
+
+ thread__find_addr_map_by_time(t, PERF_RECORD_MISC_USER, MAP__FUNCTION,
+ PERF_MAP_START, , -1ULL);
+
+ TEST_ASSERT_VAL("cannot find timed mapping for perf", al.map != NULL);
+ TEST_ASSERT_VAL("non matched timed mapping", al.map == map);
+ TEST_ASSERT_VAL("incorrect timed map groups", al.map->groups == mg);
+ TEST_ASSERT_VAL("incorrect map groups", al.map->groups == t->mg);
+
+
+ pr_debug("simulate EXEC event (generate new mg)\n");
+ __thread__set_comm(t, "perf-test", 1, true);
+
+ old_map = map;
+
+ map = dso__new_map("/usr/bin/perf-test");
+ map->start = PERF_MAP_START;
+ map->end = PERF_MAP_START + 0x2000;
+
+ thread__insert_map(t, map);
+
+ if (verbose > 1)
+ map_groups__fprintf(t->mg, stderr);
+
+ thread__find_addr_map(t, PERF_RECORD_MISC_USER, MAP__FUNCTION,
+ PERF_MAP_START + 4, );
+
+ TEST_ASSERT_VAL("cannot find mapping for perf-test", al.map != NULL);
+ TEST_ASSERT_VAL("invalid mapping found", al.map == map);
+ TEST_ASSERT_VAL("incorrect map groups", al.map->groups != mg);
+ TEST_ASSERT_VAL("incorrect map groups", al.map->groups == t->mg);
+
+ pr_debug("searching map in the old mag groups\n");
+ thread__find_addr_map_by_time(t, PERF_RECORD_MISC_USER, MAP__FUNCTION,
+
[PATCH 20/40] perf tools: Add a test case for timed map groups handling
A test case for verifying thread-mg and -mg_list handling during
time change and new thread__find_addr_map_by_time() and friends.
Cc: Frederic Weisbecker fweis...@gmail.com
Signed-off-by: Namhyung Kim namhy...@kernel.org
---
tools/perf/tests/Build| 1 +
tools/perf/tests/builtin-test.c | 4 ++
tools/perf/tests/tests.h | 1 +
tools/perf/tests/thread-mg-time.c | 93 +++
4 files changed, 99 insertions(+)
create mode 100644 tools/perf/tests/thread-mg-time.c
diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
index 5ad495823b49..cfd59c61bcd2 100644
--- a/tools/perf/tests/Build
+++ b/tools/perf/tests/Build
@@ -27,6 +27,7 @@ perf-y += mmap-thread-lookup.o
perf-y += thread-comm.o
perf-y += thread-mg-share.o
perf-y += thread-lookup-time.o
+perf-y += thread-mg-time.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 e83c7ce1b38a..c5dbeb3d75b1 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -179,6 +179,10 @@ static struct test {
.func = test__thread_lookup_time,
},
{
+ .desc = Test thread map group handling with time,
+ .func = test__thread_mg_time,
+ },
+ {
.func = NULL,
},
};
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index e9aa78c3d8fc..a2e1f729ae23 100644
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -63,6 +63,7 @@ int test__fdarray__add(void);
int test__kmod_path__parse(void);
int test__thread_comm(void);
int test__thread_lookup_time(void);
+int test__thread_mg_time(void);
#if defined(__x86_64__) || defined(__i386__) || defined(__arm__)
#ifdef HAVE_DWARF_UNWIND_SUPPORT
diff --git a/tools/perf/tests/thread-mg-time.c
b/tools/perf/tests/thread-mg-time.c
new file mode 100644
index ..841777125a64
--- /dev/null
+++ b/tools/perf/tests/thread-mg-time.c
@@ -0,0 +1,93 @@
+#include tests.h
+#include machine.h
+#include thread.h
+#include map.h
+#include debug.h
+
+#define PERF_MAP_START 0x4
+
+int test__thread_mg_time(void)
+{
+ struct machines machines;
+ struct machine *machine;
+ struct thread *t;
+ struct map_groups *mg;
+ struct map *map, *old_map;
+ struct addr_location al = { .map = NULL, };
+
+ /*
+* This test is to check whether it can retrieve a correct map
+* for a given time. When multi-file data storage is enabled,
+* those task/comm/mmap events are processed first so the
+* later sample should find a matching comm properly.
+*/
+ machines__init(machines);
+ machine = machines.host;
+
+ /* this is needed to add/find map by time */
+ perf_has_index = true;
+
+ t = machine__findnew_thread(machine, 0, 0);
+ mg = t-mg;
+
+ map = dso__new_map(/usr/bin/perf);
+ map-start = PERF_MAP_START;
+ map-end = PERF_MAP_START + 0x1000;
+
+ thread__insert_map(t, map);
+
+ if (verbose 1)
+ map_groups__fprintf(t-mg, stderr);
+
+ thread__find_addr_map(t, PERF_RECORD_MISC_USER, MAP__FUNCTION,
+ PERF_MAP_START, al);
+
+ TEST_ASSERT_VAL(cannot find mapping for perf, al.map != NULL);
+ TEST_ASSERT_VAL(non matched mapping found, al.map == map);
+ TEST_ASSERT_VAL(incorrect map groups, al.map-groups == mg);
+ TEST_ASSERT_VAL(incorrect map groups, al.map-groups == t-mg);
+
+ thread__find_addr_map_by_time(t, PERF_RECORD_MISC_USER, MAP__FUNCTION,
+ PERF_MAP_START, al, -1ULL);
+
+ TEST_ASSERT_VAL(cannot find timed mapping for perf, al.map != NULL);
+ TEST_ASSERT_VAL(non matched timed mapping, al.map == map);
+ TEST_ASSERT_VAL(incorrect timed map groups, al.map-groups == mg);
+ TEST_ASSERT_VAL(incorrect map groups, al.map-groups == t-mg);
+
+
+ pr_debug(simulate EXEC event (generate new mg)\n);
+ __thread__set_comm(t, perf-test, 1, true);
+
+ old_map = map;
+
+ map = dso__new_map(/usr/bin/perf-test);
+ map-start = PERF_MAP_START;
+ map-end = PERF_MAP_START + 0x2000;
+
+ thread__insert_map(t, map);
+
+ if (verbose 1)
+ map_groups__fprintf(t-mg, stderr);
+
+ thread__find_addr_map(t, PERF_RECORD_MISC_USER, MAP__FUNCTION,
+ PERF_MAP_START + 4, al);
+
+ TEST_ASSERT_VAL(cannot find mapping for perf-test, al.map != NULL);
+ TEST_ASSERT_VAL(invalid mapping found, al.map == map);
+ TEST_ASSERT_VAL(incorrect map groups, al.map-groups != mg);
+ TEST_ASSERT_VAL(incorrect map groups, al.map-groups == t-mg);
+
+ pr_debug(searching map in the old mag groups\n);
+ thread__find_addr_map_by_time(t, PERF_RECORD_MISC_USER, MAP__FUNCTION,
+
