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>

diff --git a/tools/perf/arch/x86/tests/perf-time-to-tsc.c b/tools/perf/arch/x86/tests/perf-time-to-tsc.c
index 17cf7fc3c7d5650705442af3bf5e96872ba546eb..7a7721604b86d95eaf5d90d9a7638318b2240f88 100644 (file)
--- a/tools/perf/arch/x86/tests/perf-time-to-tsc.c
+++ b/tools/perf/arch/x86/tests/perf-time-to-tsc.c
@@ -61,7 +61,6 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe
        u64 test_tsc, comm1_tsc, comm2_tsc;
        u64 test_time, comm1_time = 0, comm2_time = 0;
        struct perf_mmap *md;
-       u64 end, start;
 
        threads = thread_map__new(-1, getpid(), UINT_MAX);
        CHECK_NOT_NULL__(threads);
@@ -112,7 +111,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe
 
        for (i = 0; i < evlist->nr_mmaps; i++) {
                md = &evlist->mmap[i];
-               if (perf_mmap__read_init(md, false, &start, &end) < 0)
+               if (perf_mmap__read_init(md) < 0)
                        continue;
 
                while ((event = perf_mmap__read_event(md)) != NULL) {

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index e9f69b8f8e251ebfc6e614b5d7e2b34c568ef4d9..72e2ca096bf5da04e48246303085488d5e78f9c4 100644 (file)
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -746,14 +746,13 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx,
        struct perf_evlist *evlist = kvm->evlist;
        union perf_event *event;
        struct perf_mmap *md;
-       u64 end, start;
        u64 timestamp;
        s64 n = 0;
        int err;
 
        *mmap_time = ULLONG_MAX;
        md = &evlist->mmap[idx];
-       err = perf_mmap__read_init(md, false, &start, &end);
+       err = perf_mmap__read_init(md);
        if (err < 0)
                return (err == -EAGAIN) ? 0 : -1;
 

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index eb19cf92a3887ea1de33714c6e7c4bffe9d07583..0a26b56afcc5d974e64be252c2afe8d07eb27e01 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -817,11 +817,10 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
        struct perf_session *session = top->session;
        union perf_event *event;
        struct machine *machine;
-       u64 end, start;
        int ret;
 
        md = opts->overwrite ? &evlist->overwrite_mmap[idx] : &evlist->mmap[idx];
-       if (perf_mmap__read_init(md, opts->overwrite, &start, &end) < 0)
+       if (perf_mmap__read_init(md) < 0)
                return;
 
        while ((event = perf_mmap__read_event(md)) != NULL) {

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 29fda506ac757eff7048563b07d78a85a4a39e79..87b95c9410b4d71774f4a4818300ac264e03e1fc 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2503,10 +2503,9 @@ again:
        for (i = 0; i < evlist->nr_mmaps; i++) {
                union perf_event *event;
                struct perf_mmap *md;
-               u64 end, start;
 
                md = &evlist->mmap[i];
-               if (perf_mmap__read_init(md, false, &start, &end) < 0)
+               if (perf_mmap__read_init(md) < 0)
                        continue;
 
                while ((event = perf_mmap__read_event(md)) != NULL) {

diff --git a/tools/perf/tests/backward-ring-buffer.c b/tools/perf/tests/backward-ring-buffer.c
index e0eae1053ddc5f34cd6e0cbff0c8af5aa4e037e7..6d598cc071ae23d5f0f9c5210077a7efaff79d7d 100644 (file)
--- a/tools/perf/tests/backward-ring-buffer.c
+++ b/tools/perf/tests/backward-ring-buffer.c
@@ -33,9 +33,8 @@ static int count_samples(struct perf_evlist *evlist, int *sample_count,
        for (i = 0; i < evlist->nr_mmaps; i++) {
                struct perf_mmap *map = &evlist->overwrite_mmap[i];
                union perf_event *event;
-               u64 start, end;
 
-               perf_mmap__read_init(map, true, &start, &end);
+               perf_mmap__read_init(map);
                while ((event = perf_mmap__read_event(map)) != NULL) {
                        const u32 type = event->header.type;
 

diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
index 384c20f4c902344a4fdf72557e0c02fe296b5240..79b54f8ddebf7ce9f5d59ef3255a1ddab3626c4a 100644 (file)
--- a/tools/perf/tests/bpf.c
+++ b/tools/perf/tests/bpf.c
@@ -177,10 +177,9 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
        for (i = 0; i < evlist->nr_mmaps; i++) {
                union perf_event *event;
                struct perf_mmap *md;
-               u64 end, start;
 
                md = &evlist->mmap[i];
-               if (perf_mmap__read_init(md, false, &start, &end) < 0)
+               if (perf_mmap__read_init(md) < 0)
                        continue;
 
                while ((event = perf_mmap__read_event(md)) != NULL) {

diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index f7919666bc2c03db018537a59c2304c758bb5228..99936352df4f0654a025399ececc5dabadf8e159 100644 (file)
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -410,12 +410,11 @@ static int process_events(struct machine *machine, struct perf_evlist *evlist,
 {
        union perf_event *event;
        struct perf_mmap *md;
-       u64 end, start;
        int i, ret;
 
        for (i = 0; i < evlist->nr_mmaps; i++) {
                md = &evlist->mmap[i];
-               if (perf_mmap__read_init(md, false, &start, &end) < 0)
+               if (perf_mmap__read_init(md) < 0)
                        continue;
 
                while ((event = perf_mmap__read_event(md)) != NULL) {

diff --git a/tools/perf/tests/keep-tracking.c b/tools/perf/tests/keep-tracking.c
index ad477b7cf238a23f2beb10b08758b9ab3db315c1..17c46f3e6f1ef45731966829ce606325c3e5c281 100644 (file)
--- a/tools/perf/tests/keep-tracking.c
+++ b/tools/perf/tests/keep-tracking.c
@@ -28,13 +28,12 @@ static int find_comm(struct perf_evlist *evlist, const char *comm)
 {
        union perf_event *event;
        struct perf_mmap *md;
-       u64 end, start;
        int i, found;
 
        found = 0;
        for (i = 0; i < evlist->nr_mmaps; i++) {
                md = &evlist->mmap[i];
-               if (perf_mmap__read_init(md, false, &start, &end) < 0)
+               if (perf_mmap__read_init(md) < 0)
                        continue;
                while ((event = perf_mmap__read_event(md)) != NULL) {
                        if (event->header.type == PERF_RECORD_COMM &&

diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c
index 7790eb3303e6438f543a4910ff640a9de8081005..bb8e6bcb0d967a22291df3896fc90a43bd81bc78 100644 (file)
--- a/tools/perf/tests/mmap-basic.c
+++ b/tools/perf/tests/mmap-basic.c
@@ -39,7 +39,6 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
        struct perf_evsel *evsels[nsyscalls], *evsel;
        char sbuf[STRERR_BUFSIZE];
        struct perf_mmap *md;
-       u64 end, start;
 
        threads = thread_map__new(-1, getpid(), UINT_MAX);
        if (threads == NULL) {
@@ -109,7 +108,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
                }
 
        md = &evlist->mmap[0];
-       if (perf_mmap__read_init(md, false, &start, &end) < 0)
+       if (perf_mmap__read_init(md) < 0)
                goto out_init;
 
        while ((event = perf_mmap__read_event(md)) != NULL) {

diff --git a/tools/perf/tests/openat-syscall-tp-fields.c b/tools/perf/tests/openat-syscall-tp-fields.c
index b0be2da65da734a79878cfcd5edb328e072f9e69..344dc3ac24695001a8c25c14fd23937499041bbe 100644 (file)
--- a/tools/perf/tests/openat-syscall-tp-fields.c
+++ b/tools/perf/tests/openat-syscall-tp-fields.c
@@ -87,10 +87,9 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest
                for (i = 0; i < evlist->nr_mmaps; i++) {
                        union perf_event *event;
                        struct perf_mmap *md;
-                       u64 end, start;
 
                        md = &evlist->mmap[i];
-                       if (perf_mmap__read_init(md, false, &start, &end) < 0)
+                       if (perf_mmap__read_init(md) < 0)
                                continue;
 
                        while ((event = perf_mmap__read_event(md)) != NULL) {

diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c
index 59be0942b787a41ab812144bc88447ac65bdd630..34394cc0507748630eb83dbadeb4d73bd4f9e9f3 100644 (file)
--- a/tools/perf/tests/perf-record.c
+++ b/tools/perf/tests/perf-record.c
@@ -165,10 +165,9 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
                for (i = 0; i < evlist->nr_mmaps; i++) {
                        union perf_event *event;
                        struct perf_mmap *md;
-                       u64 end, start;
 
                        md = &evlist->mmap[i];
-                       if (perf_mmap__read_init(md, false, &start, &end) < 0)
+                       if (perf_mmap__read_init(md) < 0)
                                continue;
 
                        while ((event = perf_mmap__read_event(md)) != NULL) {

diff --git a/tools/perf/tests/sw-clock.c b/tools/perf/tests/sw-clock.c
index 403f2d9cee9641adae0057068957ff1f8cd56918..f9490b23789321cdbb38486b1182baa4a7ea7d9d 100644 (file)
--- a/tools/perf/tests/sw-clock.c
+++ b/tools/perf/tests/sw-clock.c
@@ -40,7 +40,6 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
        struct cpu_map *cpus;
        struct thread_map *threads;
        struct perf_mmap *md;
-       u64 end, start;
 
        attr.sample_freq = 500;
 
@@ -96,7 +95,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
        perf_evlist__disable(evlist);
 
        md = &evlist->mmap[0];
-       if (perf_mmap__read_init(md, false, &start, &end) < 0)
+       if (perf_mmap__read_init(md) < 0)
                goto out_init;
 
        while ((event = perf_mmap__read_event(md)) != NULL) {

diff --git a/tools/perf/tests/switch-tracking.c b/tools/perf/tests/switch-tracking.c
index 99839de3caeefc38b43518252f71321353f41b3e..9b5be51e5e7b1a8fa1d5ef1b84af1dce51b2a9f4 100644 (file)
--- a/tools/perf/tests/switch-tracking.c
+++ b/tools/perf/tests/switch-tracking.c
@@ -259,12 +259,11 @@ static int process_events(struct perf_evlist *evlist,
        LIST_HEAD(events);
        struct event_node *events_array, *node;
        struct perf_mmap *md;
-       u64 end, start;
        int i, ret;
 
        for (i = 0; i < evlist->nr_mmaps; i++) {
                md = &evlist->mmap[i];
-               if (perf_mmap__read_init(md, false, &start, &end) < 0)
+               if (perf_mmap__read_init(md) < 0)
                        continue;
 
                while ((event = perf_mmap__read_event(md)) != NULL) {

diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c
index 2df0c0573e2c6041c2eb4bd9322fc7e380b11638..e92fa6029ac772dd350d9948b25a36fbfb917256 100644 (file)
--- a/tools/perf/tests/task-exit.c
+++ b/tools/perf/tests/task-exit.c
@@ -48,7 +48,6 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused
        struct cpu_map *cpus;
        struct thread_map *threads;
        struct perf_mmap *md;
-       u64 end, start;
 
        signal(SIGCHLD, sig_handler);
 
@@ -113,7 +112,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused
 
 retry:
        md = &evlist->mmap[0];
-       if (perf_mmap__read_init(md, false, &start, &end) < 0)
+       if (perf_mmap__read_init(md) < 0)
                goto out_init;
 
        while ((event = perf_mmap__read_event(md)) != NULL) {

diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
index 2fbe4c8a02d228e3347639988c36820aa2bd51a4..074c4fd3b67e8b75936790deb00255c5fac17c79 100644 (file)
--- 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;
 

diff --git a/tools/perf/util/mmap.h b/tools/perf/util/mmap.h
index ae9499b801105c16650dab13e9d59e88e263813a..d82294db1295333096eb1111349f1411ff7f8120 100644 (file)
--- a/tools/perf/util/mmap.h
+++ b/tools/perf/util/mmap.h
@@ -96,7 +96,6 @@ int perf_mmap__push(struct perf_mmap *md, void *to,
 
 size_t perf_mmap__mmap_len(struct perf_mmap *map);
 
-int perf_mmap__read_init(struct perf_mmap *md, bool overwrite,
-                        u64 *startp, u64 *endp);
+int perf_mmap__read_init(struct perf_mmap *md);
 void perf_mmap__read_done(struct perf_mmap *map);
 #endif /*__PERF_MMAP_H */

diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index 4798db93e7ee8924ab7bb1748dfddca7b00b449f..b956868fd44503e1e1607f99f2e11c87c907e207 100644 (file)
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -984,7 +984,6 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
        int sample_id_all = 1, cpu;
        static char *kwlist[] = { "cpu", "sample_id_all", NULL };
        struct perf_mmap *md;
-       u64 end, start;
        int err;
 
        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist,
@@ -992,7 +991,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
                return NULL;
 
        md = &evlist->mmap[cpu];
-       if (perf_mmap__read_init(md, false, &start, &end) < 0)
+       if (perf_mmap__read_init(md) < 0)
                goto end;
 
        event = perf_mmap__read_event(md);