Re: [PATCH v11 1/3]: perf util: map data buffer for preserving collected data

Jiri Olsa
2018-10-08T10:51:02Z

On Mon, Oct 08, 2018 at 09:14:29AM +0300, Alexey Budankov wrote:

SNIP

> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index be440df29615..af2f8c965d7a 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -1029,7 +1029,9 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages,
> * So &mp should not be passed through const pointer.
> */
> struct mmap_params mp;
> -
> +#ifdef HAVE_AIO_SUPPORT
> + mp.nr_cblocks = 0;
> +#endif
> if (!evlist->mmap)
> evlist->mmap = perf_evlist__alloc_mmap(evlist, false);
> if (!evlist->mmap)
> diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
> index cdb95b3a1213..db8f16f8a363 100644
> --- a/tools/perf/util/mmap.c
> +++ b/tools/perf/util/mmap.c
> @@ -153,8 +153,19 @@ void __weak auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp __mayb
> {
> }
>
> +#ifdef HAVE_AIO_SUPPORT
> +static void perf_mmap__aio_munmap(struct perf_mmap *map)
> +{
> + if (map->data)
> + zfree(&map->data);
> +}

if we really need to keep this optional for compilation,
please make it as single block with dummy functions
for when it's not compiled in, like:

#ifdef
static void perf_mmap__aio_munmap(struct perf_mmap *map)
{
if (map->data)
zfree(&map->data);
}
#else
static void perf_mmap__aio_munmap(struct perf_mmap *map) { }
#endif

thanks,
jirka

> +#endif
> +
> void perf_mmap__munmap(struct perf_mmap *map)
> {
> +#ifdef HAVE_AIO_SUPPORT
> + perf_mmap__aio_munmap(map);
> +#endif
> if (map->base != NULL) {
> munmap(map->base, perf_mmap__mmap_len(map));
> map->base = NULL;
> @@ -164,8 +175,40 @@ void perf_mmap__munmap(struct perf_mmap *map)
> auxtrace_mmap__munmap(&map->auxtrace_mmap);
> }

SNIP