perf evlist: Fix type for references to data_head/tail

The data_head and data_tail fields are defined as __u64 in
linux/perf_event.h, but perf userspace uses int and unsigned int.

Convert all references to u64 for consistency.

Signed-off-by: David Ahern <dsahern@gmail.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1428420037-26599-1-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index ac610488d2e1e618271e3ec3384385291474c08a..c3efdfb630b5b664349ed9e40c41374d3863752d 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -70,8 +70,8 @@ static int process_synthesized_event(struct perf_tool *tool,
 static int record__mmap_read(struct record *rec, int idx)
 {
        struct perf_mmap *md = &rec->evlist->mmap[idx];
-       unsigned int head = perf_mmap__read_head(md);
-       unsigned int old = md->prev;
+       u64 head = perf_mmap__read_head(md);
+       u64 old = md->prev;
        unsigned char *data = md->base + page_size;
        unsigned long size;
        void *buf;

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 76ef7ee62640d0b1cb4a85a667faea4b576d2014..080be93eea969f9893bd789cde845bf4a94a37bd 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -634,8 +634,8 @@ static struct perf_evsel *perf_evlist__event2evsel(struct perf_evlist *evlist,
 union perf_event *perf_evlist__mmap_read(struct perf_evlist *evlist, int idx)
 {
        struct perf_mmap *md = &evlist->mmap[idx];
-       unsigned int head = perf_mmap__read_head(md);
-       unsigned int old = md->prev;
+       u64 head = perf_mmap__read_head(md);
+       u64 old = md->prev;
        unsigned char *data = md->base + page_size;
        union perf_event *event = NULL;
 
@@ -716,7 +716,7 @@ void perf_evlist__mmap_consume(struct perf_evlist *evlist, int idx)
        struct perf_mmap *md = &evlist->mmap[idx];
 
        if (!evlist->overwrite) {
-               unsigned int old = md->prev;
+               u64 old = md->prev;
 
                perf_mmap__write_tail(md, old);
        }

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index fb19c47b8aac009ef25b5b52e6397cd2534d211f..b5cce95d644e0c3af3c04d5edd91cdaf3aabb20d 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -27,7 +27,7 @@ struct perf_mmap {
        void             *base;
        int              mask;
        int              refcnt;
-       unsigned int     prev;
+       u64              prev;
        char             event_copy[PERF_SAMPLE_MAX_SIZE] __attribute__((aligned(8)));
 };
 
@@ -189,16 +189,15 @@ size_t perf_evlist__fprintf(struct perf_evlist *evlist, FILE *fp);
 int perf_evlist__strerror_open(struct perf_evlist *evlist, int err, char *buf, size_t size);
 int perf_evlist__strerror_mmap(struct perf_evlist *evlist, int err, char *buf, size_t size);
 
-static inline unsigned int perf_mmap__read_head(struct perf_mmap *mm)
+static inline u64 perf_mmap__read_head(struct perf_mmap *mm)
 {
        struct perf_event_mmap_page *pc = mm->base;
-       int head = ACCESS_ONCE(pc->data_head);
+       u64 head = ACCESS_ONCE(pc->data_head);
        rmb();
        return head;
 }
 
-static inline void perf_mmap__write_tail(struct perf_mmap *md,
-                                        unsigned long tail)
+static inline void perf_mmap__write_tail(struct perf_mmap *md, u64 tail)
 {
        struct perf_event_mmap_page *pc = md->base;