diff options
| author |   Kan Liang <kan.liang@linux.intel.com> | 2018-03-06 10:36:07 -0500 |
|---|---|---|
| committer |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-03-08 10:05:53 -0300 |
| commit | b9bae2c841b73eac6bfed510bc24a3051754ff51 (patch) | |
| tree | 8533c197b859d64024805e0f4f6b9c2e778c20db /tools/perf/util/mmap.c | |
| parent | perf mmap: Simplify perf_mmap__read_event() (diff) | |
| download | linux-dev-b9bae2c841b73eac6bfed510bc24a3051754ff51.tar.xz linux-dev-b9bae2c841b73eac6bfed510bc24a3051754ff51.zip | |
perf mmap: Simplify perf_mmap__read_init()
It isn't necessary to pass the 'start', 'end' and 'overwrite' arguments
to perf_mmap__read_init(). The data is stored in the struct perf_mmap.
Discard the parameters.
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-8-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 | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c index 2fbe4c8a02d2..074c4fd3b67e 100644 --- a/tools/perf/util/mmap.c +++ b/tools/perf/util/mmap.c @@ -235,16 +235,13 @@ static int overwrite_rb_find_range(void *buf, int mask, u64 head, u64 *start, u6 /* * Report the start and end of the available data in ringbuffer */ -int perf_mmap__read_init(struct perf_mmap *md, bool overwrite, - u64 *startp, u64 *endp) +int perf_mmap__read_init(struct perf_mmap *md) { u64 head = perf_mmap__read_head(md); u64 old = md->prev; unsigned char *data = md->base + page_size; unsigned long size; - *startp = overwrite ? head : old; - *endp = overwrite ? old : head; md->start = md->overwrite ? head : old; md->end = md->overwrite ? old : head; @@ -267,8 +264,6 @@ int perf_mmap__read_init(struct perf_mmap *md, bool overwrite, */ if (overwrite_rb_find_range(data, md->mask, head, &md->start, &md->end)) return -EINVAL; - *startp = md->start; - *endp = md->end; } return 0; @@ -278,13 +273,12 @@ int perf_mmap__push(struct perf_mmap *md, void *to, int push(void *to, void *buf, size_t size)) { u64 head = perf_mmap__read_head(md); - u64 end, start; unsigned char *data = md->base + page_size; unsigned long size; void *buf; int rc = 0; - rc = perf_mmap__read_init(md, md->overwrite, &start, &end); + rc = perf_mmap__read_init(md); if (rc < 0) return (rc == -EAGAIN) ? 0 : -1; |