Skip to content

Commit

Permalink
libperf: Add perf_mmap__init() function
Browse files Browse the repository at this point in the history
Add perf_mmap__init() function to initialize 'struct perf_mmap' objects.

Add it to a new mmap.c source file, that will carry all the mmap related
functions.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20191007125344.14268-2-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Jiri Olsa authored and Arnaldo Carvalho de Melo committed Oct 10, 2019
1 parent 26d5310 commit 353120b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
1 change: 1 addition & 0 deletions tools/perf/lib/Build
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ libperf-y += cpumap.o
libperf-y += threadmap.o
libperf-y += evsel.o
libperf-y += evlist.o
libperf-y += mmap.o
libperf-y += zalloc.o
libperf-y += xyarray.o
libperf-y += lib.o
Expand Down
2 changes: 2 additions & 0 deletions tools/perf/lib/include/internal/mmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,6 @@ struct perf_mmap {
char event_copy[PERF_SAMPLE_MAX_SIZE] __aligned(8);
};

void perf_mmap__init(struct perf_mmap *map, bool overwrite);

#endif /* __LIBPERF_INTERNAL_MMAP_H */
9 changes: 9 additions & 0 deletions tools/perf/lib/mmap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
#include <internal/mmap.h>

void perf_mmap__init(struct perf_mmap *map, bool overwrite)
{
map->fd = -1;
map->overwrite = overwrite;
refcount_set(&map->refcnt, 0);
}
5 changes: 2 additions & 3 deletions tools/perf/util/evlist.c
Original file line number Diff line number Diff line change
Expand Up @@ -629,8 +629,6 @@ static struct mmap *evlist__alloc_mmap(struct evlist *evlist,
return NULL;

for (i = 0; i < evlist->core.nr_mmaps; i++) {
map[i].core.fd = -1;
map[i].core.overwrite = overwrite;
/*
* When the perf_mmap() call is made we grab one refcount, plus
* one extra to let perf_mmap__consume() get the last
Expand All @@ -640,8 +638,9 @@ static struct mmap *evlist__alloc_mmap(struct evlist *evlist,
* Each PERF_EVENT_IOC_SET_OUTPUT points to this mmap and
* thus does perf_mmap__get() on it.
*/
refcount_set(&map[i].core.refcnt, 0);
perf_mmap__init(&map[i].core, overwrite);
}

return map;
}

Expand Down

0 comments on commit 353120b

Please sign in to comment.