lkml.org 
[lkml]   [2021]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v4 5/8] perf session: Move unmap code to reader__mmap
Date
Moving unmapping code into reader__mmap, so the mmap code
is located together. Moving head/file_offset computation into
reader__mmap function, so all the offset computation is
located together and in one place only.

Suggested-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Namhyung Kim <namhyung@gmail.com>
Reviewed-by: Riccardo Mancini <rickyman7@gmail.com>
Tested-by: Riccardo Mancini <rickyman7@gmail.com>
Signed-off-by: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
---
tools/perf/util/session.c | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 50258319bb26..d7b008837fd6 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -2187,13 +2187,9 @@ static int
reader__init(struct reader *rd, bool *one_mmap)
{
u64 data_size = rd->data_size;
- u64 page_offset;
char **mmaps = rd->mmaps;

- page_offset = page_size * (rd->data_offset / page_size);
- rd->file_offset = page_offset;
- rd->head = rd->data_offset - page_offset;
-
+ rd->head = rd->data_offset;
data_size += rd->data_offset;

rd->mmap_size = MMAP_SIZE;
@@ -2224,6 +2220,7 @@ reader__mmap(struct reader *rd, struct perf_session *session)
{
int mmap_prot, mmap_flags;
char *buf, **mmaps = rd->mmaps;
+ u64 page_offset;

mmap_prot = PROT_READ;
mmap_flags = MAP_SHARED;
@@ -2235,6 +2232,15 @@ reader__mmap(struct reader *rd, struct perf_session *session)
mmap_flags = MAP_PRIVATE;
}

+ if (mmaps[rd->mmap_idx]) {
+ munmap(mmaps[rd->mmap_idx], rd->mmap_size);
+ mmaps[rd->mmap_idx] = NULL;
+ }
+
+ page_offset = page_size * (rd->head / page_size);
+ rd->file_offset += page_offset;
+ rd->head -= page_offset;
+
buf = mmap(NULL, rd->mmap_size, mmap_prot, mmap_flags, rd->fd,
rd->file_offset);
if (buf == MAP_FAILED) {
@@ -2256,9 +2262,8 @@ static int
reader__process_events(struct reader *rd, struct perf_session *session,
struct ui_progress *prog)
{
- u64 page_offset, size;
+ u64 size;
int err = 0;
- char **mmaps = rd->mmaps;
union perf_event *event;
s64 skip;

@@ -2279,17 +2284,8 @@ reader__process_events(struct reader *rd, struct perf_session *session,
if (IS_ERR(event))
return PTR_ERR(event);

- if (!event) {
- if (mmaps[rd->mmap_idx]) {
- munmap(mmaps[rd->mmap_idx], rd->mmap_size);
- mmaps[rd->mmap_idx] = NULL;
- }
-
- page_offset = page_size * (rd->head / page_size);
- rd->file_offset += page_offset;
- rd->head -= page_offset;
+ if (!event)
goto remap;
- }

size = event->header.size;

--
2.19.0
\
 
 \ /
  Last update: 2021-10-13 11:08    [W:0.058 / U:0.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site