Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fda3459 authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

perf mmap: Store mmap scope in struct perf_mmap() 



There is too much boilerplate in the perf_mmap__read*() interfaces.

The 'start' and 'end' variables should be stored in struct perf_mmap at
initialization. They will be used later.

The old 'startp' and 'endp' pointers are used by perf_mmap__read_event()
now.  They cannot be removed. So the old 'startp/endp' and new
'md->start/md->end' will exist simultaneously now.  The old one will be
removed later.

Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Suggested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1520350567-80082-2-git-send-email-kan.liang@linux.intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2c5f6d87

tools/perf/util/mmap.c

+8 −4
Original line number Diff line number Diff line
@@ -250,13 +250,15 @@ int perf_mmap__read_init(struct perf_mmap *md, bool overwrite, 


	*startp = overwrite ? head : old;

	*endp = overwrite ? old : head;

	md->start = md->overwrite ? head : old;

	md->end = md->overwrite ? old : head;



	if (*startp == *endp)

	if (md->start == md->end)

		return -EAGAIN;



	size = *endp - *startp;

	size = md->end - md->start;

	if (size > (unsigned long)(md->mask) + 1) {

		if (!overwrite) {

		if (!md->overwrite) {

			WARN_ONCE(1, "failed to keep up with mmap data. (warn only once)\n");



			md->prev = head;
@@ -268,8 +270,10 @@ int perf_mmap__read_init(struct perf_mmap *md, bool overwrite, 
		 * Backward ring buffer is full. We still have a chance to read

		 * most of data from it.

		 */

		if (overwrite_rb_find_range(data, md->mask, head, startp, endp))

		if (overwrite_rb_find_range(data, md->mask, head, &md->start, &md->end))

			return -EINVAL;

		*startp = md->start;

		*endp = md->end;

	}



	return 0;

tools/perf/util/mmap.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ struct perf_mmap { 
	int		 fd;

	refcount_t	 refcnt;

	u64		 prev;

	u64		 start;

	u64		 end;

	bool		 overwrite;

	struct auxtrace_mmap auxtrace_mmap;

	char		 event_copy[PERF_SAMPLE_MAX_SIZE] __aligned(8);