libperf: Add 'overwrite' to 'struct perf_mmap'

Move 'overwrite' from tools/perf's mmap to libperf's perf_mmap struct.

Committer notes:

Add stdbool.h as we start using 'bool'.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lore.kernel.org/lkml/20190913132355.21634-17-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/lib/include/internal/mmap.h b/tools/perf/lib/include/internal/mmap.h
index ebf5b93754fdfa39b216e041000edb93337146c0..47c09f375fb61160e1cb2c7530213de14740d3ba 100644 (file)
--- a/tools/perf/lib/include/internal/mmap.h
+++ b/tools/perf/lib/include/internal/mmap.h
@@ -4,6 +4,7 @@
 
 #include <linux/refcount.h>
 #include <linux/types.h>
+#include <stdbool.h>
 
 /**
  * struct perf_mmap - perf's ring buffer mmap details
@@ -19,6 +20,7 @@ struct perf_mmap {
        u64              prev;
        u64              start;
        u64              end;
+       bool             overwrite;
 };
 
 #endif /* __LIBPERF_INTERNAL_MMAP_H */

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index d987e0e5d62b78820058a0be4463a7a2ade5931f..16d47a420bc2cde71068619ec0df2f56f0cbfdac 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -709,7 +709,7 @@ static struct mmap *evlist__alloc_mmap(struct evlist *evlist,
 
        for (i = 0; i < evlist->nr_mmaps; i++) {
                map[i].core.fd = -1;
-               map[i].overwrite = overwrite;
+               map[i].core.overwrite = overwrite;
                /*
                 * When the perf_mmap() call is made we grab one refcount, plus
                 * one extra to let perf_mmap__consume() get the last

diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
index 6ce70ff005cb6448b256d82116495ba8833a4ed9..a8850ce2c2ff5dc7cf6ad5f30527626e0dc48319 100644 (file)
--- a/tools/perf/util/mmap.c
+++ b/tools/perf/util/mmap.c
@@ -93,12 +93,12 @@ union perf_event *perf_mmap__read_event(struct mmap *map)
                return NULL;
 
        /* non-overwirte doesn't pause the ringbuffer */
-       if (!map->overwrite)
+       if (!map->core.overwrite)
                map->core.end = perf_mmap__read_head(map);
 
        event = perf_mmap__read(map, &map->core.start, map->core.end);
 
-       if (!map->overwrite)
+       if (!map->core.overwrite)
                map->core.prev = map->core.start;
 
        return event;
@@ -124,7 +124,7 @@ void perf_mmap__put(struct mmap *map)
 
 void perf_mmap__consume(struct mmap *map)
 {
-       if (!map->overwrite) {
+       if (!map->core.overwrite) {
                u64 old = map->core.prev;
 
                perf_mmap__write_tail(map, old);
@@ -447,15 +447,15 @@ static int __perf_mmap__read_init(struct mmap *md)
        unsigned char *data = md->core.base + page_size;
        unsigned long size;
 
-       md->core.start = md->overwrite ? head : old;
-       md->core.end = md->overwrite ? old : head;
+       md->core.start = md->core.overwrite ? head : old;
+       md->core.end = md->core.overwrite ? old : head;
 
        if ((md->core.end - md->core.start) < md->flush)
                return -EAGAIN;
 
        size = md->core.end - md->core.start;
        if (size > (unsigned long)(md->core.mask) + 1) {
-               if (!md->overwrite) {
+               if (!md->core.overwrite) {
                        WARN_ONCE(1, "failed to keep up with mmap data. (warn only once)\n");
 
                        md->core.prev = head;

diff --git a/tools/perf/util/mmap.h b/tools/perf/util/mmap.h
index a3dd53f2bfb8bdd5c96597da23887d82adacc926..d3e74c8da51a41b896cf9571d10b78cc21320307 100644 (file)
--- a/tools/perf/util/mmap.h
+++ b/tools/perf/util/mmap.h
@@ -22,7 +22,6 @@ struct aiocb;
  */
 struct mmap {
        struct perf_mmap        core;
-       bool             overwrite;
        struct auxtrace_mmap auxtrace_mmap;
        char             event_copy[PERF_SAMPLE_MAX_SIZE] __aligned(8);
 #ifdef HAVE_AIO_SUPPORT