Commit 353120b4 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

libperf: Add perf_mmap__init() function 



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: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 26d5310e

tools/perf/lib/Build

+1 −0
Original line number Diff line number Diff line
@@ -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

tools/perf/lib/include/internal/mmap.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */

tools/perf/lib/mmap.c

0 → 100644
+9 −0
Original line number Diff line number Diff line 
// 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);

}

tools/perf/util/evlist.c

+2 −3
Original line number Diff line number Diff line
@@ -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
@@ -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;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE