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

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

perf mmap: Use the stored data in perf_mmap__read_event() 



Using the 'start', 'end' and 'overwrite' which are stored in
struct perf_mmap to replace the parameters of perf_mmap__read_event().
The parameters will be discarded later.

No functional change.

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-4-git-send-email-kan.liang@linux.intel.com


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

tools/perf/util/mmap.c

+8 −10
Original line number Original line Diff line number Diff line
@@ -76,8 +76,9 @@ static union perf_event *perf_mmap__read(struct perf_mmap *map, 
 * perf_mmap__read_done()

 * perf_mmap__read_done()

 */

 */

union perf_event *perf_mmap__read_event(struct perf_mmap *map,

union perf_event *perf_mmap__read_event(struct perf_mmap *map,

					bool overwrite,

					bool overwrite __maybe_unused,

					u64 *startp, u64 end)

					u64 *startp __maybe_unused,

					u64 end __maybe_unused)

{

{

	union perf_event *event;

	union perf_event *event;
@@ -87,17 +88,14 @@ union perf_event *perf_mmap__read_event(struct perf_mmap *map, 
	if (!refcount_read(&map->refcnt))

	if (!refcount_read(&map->refcnt))

		return NULL;

		return NULL;





	if (startp == NULL)

		return NULL;



	/* non-overwirte doesn't pause the ringbuffer */

	/* non-overwirte doesn't pause the ringbuffer */

	if (!overwrite)

	if (!map->overwrite)

		end = perf_mmap__read_head(map);

		map->end = perf_mmap__read_head(map);





	event = perf_mmap__read(map, startp, end);

	event = perf_mmap__read(map, &map->start, map->end);





	if (!overwrite)

	if (!map->overwrite)

		map->prev = *startp;

		map->prev = map->start;





	return event;

	return event;

}

}