[PATCH 47/73] perf tools: Use perf_mmap way to detect aux mmap

From: Jiri Olsa
Date: Fri Sep 13 2019 - 09:25:58 EST


We will move this code into libperf shortly, so we
need to free it of 'struct auxtrace_mmap' usage,
because it won't be available in libperf (for now).

The perf_event_mmap_page::aux_size is set when the
aux mmap is mapped, so the check is equivalent.

Link: http://lkml.kernel.org/n/tip-nmj5fchj8wdglxj7d1voxj66@xxxxxxxxxxxxxx
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
tools/perf/util/mmap.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
index b904a7a57fdf..4b1d1ae79042 100644
--- a/tools/perf/util/mmap.c
+++ b/tools/perf/util/mmap.c
@@ -106,7 +106,9 @@ union perf_event *perf_mmap__read_event(struct mmap *map)

static bool perf_mmap__empty(struct mmap *map)
{
- return perf_mmap__read_head(map) == map->core.prev && !map->auxtrace_mmap.base;
+ struct perf_event_mmap_page *pc = map->core.base;
+
+ return perf_mmap__read_head(map) == map->core.prev && !pc->aux_size;
}

void perf_mmap__consume(struct mmap *map)
--
2.21.0