summaryrefslogtreecommitdiff
path: root/tools/perf/util/map_groups.h
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2019-05-08 15:20:07 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2019-05-28 18:37:44 -0300
commit4f600bcf657d4d0476d0d96cb38077a72b8fb2af (patch)
tree5035dd3c90434c7c7ce977a5ced41a35d0b47ba4 /tools/perf/util/map_groups.h
parent1c4924220c96392d17e0222c113509fd7b9a0854 (diff)
downloadlwn-4f600bcf657d4d0476d0d96cb38077a72b8fb2af.tar.gz
lwn-4f600bcf657d4d0476d0d96cb38077a72b8fb2af.zip
perf tests: Add map_groups__merge_in test
Add map_groups__merge_in test to test the map_groups__merge_in function usage - merging kcore maps into existing eBPF maps. Committer testing: # perf test merge 59: map_groups__merge_in : Ok # perf test -v merge 59: map_groups__merge_in : --- start --- test child forked, pid 8349 test child finished with 0 ---- end ---- map_groups__merge_in: Ok # Signed-off-by: Jiri Olsa <jolsa@kernel.org> Acked-by: Song Liu <songliubraving@fb.com> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stanislav Fomichev <sdf@google.com> Link: http://lkml.kernel.org/r/20190508132010.14512-10-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/map_groups.h')
-rw-r--r--tools/perf/util/map_groups.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/map_groups.h b/tools/perf/util/map_groups.h
index 4dcda33e0fdf..5f25efa6d6bc 100644
--- a/tools/perf/util/map_groups.h
+++ b/tools/perf/util/map_groups.h
@@ -88,4 +88,6 @@ int map_groups__fixup_overlappings(struct map_groups *mg, struct map *map, FILE
struct map *map_groups__find_by_name(struct map_groups *mg, const char *name);
+int map_groups__merge_in(struct map_groups *kmaps, struct map *new_map);
+
#endif // __PERF_MAP_GROUPS_H