diff options
author | Jiri Olsa <jolsa@kernel.org> | 2015-10-16 06:41:15 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-10-19 17:04:01 -0400 |
commit | 1fe7a30028eeccd92e6fccfbeb8c5c3811b11b64 (patch) | |
tree | 8e2a4a120cd27dfb35084e9514bacec97bc2351a /tools/perf/tests/topology.c | |
parent | f1cbb8f35719e36803f226d1bbf08ac12cedcd76 (diff) |
perf cpu_map: Add data arg to cpu_map__build_map callback
Adding data arg to cpu_map__build_map callback, so we could pass data
along to the callback. It'll be needed in following patches to retrieve
topology info from perf.data.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Kan Liang <kan.liang@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1444992092-17897-41-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/tests/topology.c')
-rw-r--r-- | tools/perf/tests/topology.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c index c3aff53a976a..f5bb096c3bd9 100644 --- a/tools/perf/tests/topology.c +++ b/tools/perf/tests/topology.c | |||
@@ -73,10 +73,10 @@ static int check_cpu_topology(char *path, struct cpu_map *map) | |||
73 | 73 | ||
74 | for (i = 0; i < map->nr; i++) { | 74 | for (i = 0; i < map->nr; i++) { |
75 | TEST_ASSERT_VAL("Core ID doesn't match", | 75 | TEST_ASSERT_VAL("Core ID doesn't match", |
76 | (session->header.env.cpu[map->map[i]].core_id == (cpu_map__get_core(map, i) & 0xffff))); | 76 | (session->header.env.cpu[map->map[i]].core_id == (cpu_map__get_core(map, i, NULL) & 0xffff))); |
77 | 77 | ||
78 | TEST_ASSERT_VAL("Socket ID doesn't match", | 78 | TEST_ASSERT_VAL("Socket ID doesn't match", |
79 | (session->header.env.cpu[map->map[i]].socket_id == cpu_map__get_socket(map, i))); | 79 | (session->header.env.cpu[map->map[i]].socket_id == cpu_map__get_socket(map, i, NULL))); |
80 | } | 80 | } |
81 | 81 | ||
82 | perf_session__delete(session); | 82 | perf_session__delete(session); |