diff options
author | Kan Liang <kan.liang@linux.intel.com> | 2018-03-06 10:36:03 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-03-08 10:05:51 -0300 |
commit | b9de0f6e507b2f0ee305aba338b79941deb5a461 (patch) | |
tree | 2f8e8dd2361e2d4f50a055d68fb7339918534521 /tools/perf/util/mmap.c | |
parent | 07a9461da67292ffdf3f4a02522caf475b1151d7 (diff) | |
download | lwn-b9de0f6e507b2f0ee305aba338b79941deb5a461.tar.gz lwn-b9de0f6e507b2f0ee305aba338b79941deb5a461.zip |
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: Kan Liang <kan.liang@linux.intel.com>
Suggested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/mmap.c')
-rw-r--r-- | tools/perf/util/mmap.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c index 8c1d033638c2..2933942abfe2 100644 --- a/tools/perf/util/mmap.c +++ b/tools/perf/util/mmap.c @@ -76,8 +76,9 @@ static union perf_event *perf_mmap__read(struct perf_mmap *map, * perf_mmap__read_done() */ union perf_event *perf_mmap__read_event(struct perf_mmap *map, - bool overwrite, - u64 *startp, u64 end) + bool overwrite __maybe_unused, + u64 *startp __maybe_unused, + u64 end __maybe_unused) { union perf_event *event; @@ -87,17 +88,14 @@ union perf_event *perf_mmap__read_event(struct perf_mmap *map, if (!refcount_read(&map->refcnt)) return NULL; - if (startp == NULL) - return NULL; - /* non-overwirte doesn't pause the ringbuffer */ - if (!overwrite) - end = perf_mmap__read_head(map); + if (!map->overwrite) + 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) - map->prev = *startp; + if (!map->overwrite) + map->prev = map->start; return event; } |