libperf: Add 'event_copy' to 'struct perf_mmap' (4443e6d7) · Commits · 戴 / test

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -2,10 +2,14 @@
		#ifndef __LIBPERF_INTERNAL_MMAP_H
		#define __LIBPERF_INTERNAL_MMAP_H

		#include <linux/compiler.h>
		#include <linux/refcount.h>
		#include <linux/types.h>
		#include <stdbool.h>

		/* perf sample has 16 bits size limit */
		#define PERF_SAMPLE_MAX_SIZE (1 << 16)

		/**
		* struct perf_mmap - perf's ring buffer mmap details
		*
		@@ -21,6 +25,7 @@ struct perf_mmap {
		u64 start;
		u64 end;
		bool overwrite;
		char event_copy[PERF_SAMPLE_MAX_SIZE] __aligned(8);
		};

		#endif /* __LIBPERF_INTERNAL_MMAP_H */

+2 −2

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ static union perf_event perf_mmap__read(struct mmap map,
		if ((startp & map->core.mask) + size != ((startp + size) & map->core.mask)) {
		unsigned int offset = *startp;
		unsigned int len = min(sizeof(*event), size), cpy;
		void *dst = map->event_copy;
		void *dst = map->core.event_copy;

		do {
		cpy = min(map->core.mask + 1 - (offset & map->core.mask), len);
		@@ -61,7 +61,7 @@ static union perf_event perf_mmap__read(struct mmap map,
		len -= cpy;
		} while (len);

		event = (union perf_event *)map->event_copy;
		event = (union perf_event *)map->core.event_copy;
		}

		*startp += size;

+0 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ struct aiocb;
		struct mmap {
		struct perf_mmap core;
		struct auxtrace_mmap auxtrace_mmap;
		char event_copy[PERF_SAMPLE_MAX_SIZE] __aligned(8);
		#ifdef HAVE_AIO_SUPPORT
		struct {
		void **data;