tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

perf mmap: Simplify perf_mmap__read_event()

It isn't necessary to pass the 'overwrite', 'start' and 'end' argument
to perf_mmap__read_event(). Discard them.

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-7-git-send-email-kan.liang@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Kan Liang and committed by
Arnaldo Carvalho de Melo 0019dc87 d6ace3df

+17 -22
+1 -1
tools/perf/arch/x86/tests/perf-time-to-tsc.c
··· 115 115 if (perf_mmap__read_init(md, false, &start, &end) < 0) 116 116 continue; 117 117 118 - while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) { 118 + while ((event = perf_mmap__read_event(md)) != NULL) { 119 119 struct perf_sample sample; 120 120 121 121 if (event->header.type != PERF_RECORD_COMM ||
+1 -1
tools/perf/builtin-kvm.c
··· 757 757 if (err < 0) 758 758 return (err == -EAGAIN) ? 0 : -1; 759 759 760 - while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) { 760 + while ((event = perf_mmap__read_event(md)) != NULL) { 761 761 err = perf_evlist__parse_sample_timestamp(evlist, event, &timestamp); 762 762 if (err) { 763 763 perf_mmap__consume(md);
+1 -1
tools/perf/builtin-top.c
··· 824 824 if (perf_mmap__read_init(md, opts->overwrite, &start, &end) < 0) 825 825 return; 826 826 827 - while ((event = perf_mmap__read_event(md, opts->overwrite, &start, end)) != NULL) { 827 + while ((event = perf_mmap__read_event(md)) != NULL) { 828 828 ret = perf_evlist__parse_sample(evlist, event, &sample); 829 829 if (ret) { 830 830 pr_err("Can't parse sample, err = %d\n", ret);
+1 -1
tools/perf/builtin-trace.c
··· 2509 2509 if (perf_mmap__read_init(md, false, &start, &end) < 0) 2510 2510 continue; 2511 2511 2512 - while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) { 2512 + while ((event = perf_mmap__read_event(md)) != NULL) { 2513 2513 struct perf_sample sample; 2514 2514 2515 2515 ++trace->nr_events;
+1 -1
tools/perf/tests/backward-ring-buffer.c
··· 36 36 u64 start, end; 37 37 38 38 perf_mmap__read_init(map, true, &start, &end); 39 - while ((event = perf_mmap__read_event(map, true, &start, end)) != NULL) { 39 + while ((event = perf_mmap__read_event(map)) != NULL) { 40 40 const u32 type = event->header.type; 41 41 42 42 switch (type) {
+1 -1
tools/perf/tests/bpf.c
··· 183 183 if (perf_mmap__read_init(md, false, &start, &end) < 0) 184 184 continue; 185 185 186 - while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) { 186 + while ((event = perf_mmap__read_event(md)) != NULL) { 187 187 const u32 type = event->header.type; 188 188 189 189 if (type == PERF_RECORD_SAMPLE)
+1 -1
tools/perf/tests/code-reading.c
··· 418 418 if (perf_mmap__read_init(md, false, &start, &end) < 0) 419 419 continue; 420 420 421 - while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) { 421 + while ((event = perf_mmap__read_event(md)) != NULL) { 422 422 ret = process_event(machine, evlist, event, state); 423 423 perf_mmap__consume(md); 424 424 if (ret < 0)
+1 -1
tools/perf/tests/keep-tracking.c
··· 36 36 md = &evlist->mmap[i]; 37 37 if (perf_mmap__read_init(md, false, &start, &end) < 0) 38 38 continue; 39 - while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) { 39 + while ((event = perf_mmap__read_event(md)) != NULL) { 40 40 if (event->header.type == PERF_RECORD_COMM && 41 41 (pid_t)event->comm.pid == getpid() && 42 42 (pid_t)event->comm.tid == getpid() &&
+1 -1
tools/perf/tests/mmap-basic.c
··· 112 112 if (perf_mmap__read_init(md, false, &start, &end) < 0) 113 113 goto out_init; 114 114 115 - while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) { 115 + while ((event = perf_mmap__read_event(md)) != NULL) { 116 116 struct perf_sample sample; 117 117 118 118 if (event->header.type != PERF_RECORD_SAMPLE) {
+1 -1
tools/perf/tests/openat-syscall-tp-fields.c
··· 93 93 if (perf_mmap__read_init(md, false, &start, &end) < 0) 94 94 continue; 95 95 96 - while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) { 96 + while ((event = perf_mmap__read_event(md)) != NULL) { 97 97 const u32 type = event->header.type; 98 98 int tp_flags; 99 99 struct perf_sample sample;
+1 -1
tools/perf/tests/perf-record.c
··· 171 171 if (perf_mmap__read_init(md, false, &start, &end) < 0) 172 172 continue; 173 173 174 - while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) { 174 + while ((event = perf_mmap__read_event(md)) != NULL) { 175 175 const u32 type = event->header.type; 176 176 const char *name = perf_event__name(type); 177 177
+1 -1
tools/perf/tests/sw-clock.c
··· 99 99 if (perf_mmap__read_init(md, false, &start, &end) < 0) 100 100 goto out_init; 101 101 102 - while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) { 102 + while ((event = perf_mmap__read_event(md)) != NULL) { 103 103 struct perf_sample sample; 104 104 105 105 if (event->header.type != PERF_RECORD_SAMPLE)
+1 -1
tools/perf/tests/switch-tracking.c
··· 267 267 if (perf_mmap__read_init(md, false, &start, &end) < 0) 268 268 continue; 269 269 270 - while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) { 270 + while ((event = perf_mmap__read_event(md)) != NULL) { 271 271 cnt += 1; 272 272 ret = add_event(evlist, &events, event); 273 273 perf_mmap__consume(md);
+1 -1
tools/perf/tests/task-exit.c
··· 116 116 if (perf_mmap__read_init(md, false, &start, &end) < 0) 117 117 goto out_init; 118 118 119 - while ((event = perf_mmap__read_event(md, false, &start, end)) != NULL) { 119 + while ((event = perf_mmap__read_event(md)) != NULL) { 120 120 if (event->header.type == PERF_RECORD_EXIT) 121 121 nr_exit++; 122 122
+1 -4
tools/perf/util/mmap.c
··· 75 75 * } 76 76 * perf_mmap__read_done() 77 77 */ 78 - union perf_event *perf_mmap__read_event(struct perf_mmap *map, 79 - bool overwrite __maybe_unused, 80 - u64 *startp __maybe_unused, 81 - u64 end __maybe_unused) 78 + union perf_event *perf_mmap__read_event(struct perf_mmap *map) 82 79 { 83 80 union perf_event *event; 84 81
+1 -3
tools/perf/util/mmap.h
··· 89 89 90 90 union perf_event *perf_mmap__read_forward(struct perf_mmap *map); 91 91 92 - union perf_event *perf_mmap__read_event(struct perf_mmap *map, 93 - bool overwrite, 94 - u64 *startp, u64 end); 92 + union perf_event *perf_mmap__read_event(struct perf_mmap *map); 95 93 96 94 int perf_mmap__push(struct perf_mmap *md, void *to, 97 95 int push(void *to, void *buf, size_t size));
+1 -1
tools/perf/util/python.c
··· 995 995 if (perf_mmap__read_init(md, false, &start, &end) < 0) 996 996 goto end; 997 997 998 - event = perf_mmap__read_event(md, false, &start, end); 998 + event = perf_mmap__read_event(md); 999 999 if (event != NULL) { 1000 1000 PyObject *pyevent = pyrf_event__new(event); 1001 1001 struct pyrf_event *pevent = (struct pyrf_event *)pyevent;