|
@@ -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)
|
|
|
|
|
|
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,
|
|
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,
|
|
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;
|
|
|
|
|