Commit 2c5f6d87 authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo

perf evlist: Store 'overwrite' in struct perf_mmap

It has been determined that the map is for overwrite mode
(evlist->overwrite_mmap) or non-overwrite mode (evlist->mmap) when
calling perf_evlist__alloc_mmap().

Store the information in struct perf_mmap, which will be used later to
simplify the perf_mmap__read*() interfaces.
Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Suggested-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarJiri 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-1-git-send-email-kan.liang@linux.intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c199c11d
...@@ -722,7 +722,8 @@ void perf_evlist__munmap(struct perf_evlist *evlist) ...@@ -722,7 +722,8 @@ void perf_evlist__munmap(struct perf_evlist *evlist)
zfree(&evlist->overwrite_mmap); zfree(&evlist->overwrite_mmap);
} }
static struct perf_mmap *perf_evlist__alloc_mmap(struct perf_evlist *evlist) static struct perf_mmap *perf_evlist__alloc_mmap(struct perf_evlist *evlist,
bool overwrite)
{ {
int i; int i;
struct perf_mmap *map; struct perf_mmap *map;
...@@ -736,6 +737,7 @@ static struct perf_mmap *perf_evlist__alloc_mmap(struct perf_evlist *evlist) ...@@ -736,6 +737,7 @@ static struct perf_mmap *perf_evlist__alloc_mmap(struct perf_evlist *evlist)
for (i = 0; i < evlist->nr_mmaps; i++) { for (i = 0; i < evlist->nr_mmaps; i++) {
map[i].fd = -1; map[i].fd = -1;
map[i].overwrite = overwrite;
/* /*
* When the perf_mmap() call is made we grab one refcount, plus * When the perf_mmap() call is made we grab one refcount, plus
* one extra to let perf_mmap__consume() get the last * one extra to let perf_mmap__consume() get the last
...@@ -779,7 +781,7 @@ static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx, ...@@ -779,7 +781,7 @@ static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx,
maps = evlist->overwrite_mmap; maps = evlist->overwrite_mmap;
if (!maps) { if (!maps) {
maps = perf_evlist__alloc_mmap(evlist); maps = perf_evlist__alloc_mmap(evlist, true);
if (!maps) if (!maps)
return -1; return -1;
evlist->overwrite_mmap = maps; evlist->overwrite_mmap = maps;
...@@ -1029,7 +1031,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, ...@@ -1029,7 +1031,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages,
struct mmap_params mp; struct mmap_params mp;
if (!evlist->mmap) if (!evlist->mmap)
evlist->mmap = perf_evlist__alloc_mmap(evlist); evlist->mmap = perf_evlist__alloc_mmap(evlist, false);
if (!evlist->mmap) if (!evlist->mmap)
return -ENOMEM; return -ENOMEM;
......
...@@ -20,6 +20,7 @@ struct perf_mmap { ...@@ -20,6 +20,7 @@ struct perf_mmap {
int fd; int fd;
refcount_t refcnt; refcount_t refcnt;
u64 prev; u64 prev;
bool overwrite;
struct auxtrace_mmap auxtrace_mmap; struct auxtrace_mmap auxtrace_mmap;
char event_copy[PERF_SAMPLE_MAX_SIZE] __aligned(8); char event_copy[PERF_SAMPLE_MAX_SIZE] __aligned(8);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment