lkml.org 
[lkml]   [2016]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH v16 05/15] perf tools: Record mmap cookie into fdarray private field
On Thu, Jul 14, 2016 at 08:34:37AM +0000, Wang Nan wrote:
> Insetad of saving a index into fdarray entries private field, save the
> corresponding 'struct perf_mmap' pointer, and release them directly
> using perf_mmap__put().
>
> Following commits introduce multiple mmap arrays to evlist. Without this
> patch, perf_evlist__munmap_filtered() is unable to retrive correct
> 'struct perf_mmap' pointer.
>
> Signed-off-by: Wang Nan <wangnan0@huawei.com>
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: He Kuang <hekuang@huawei.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Masami Hiramatsu <mhiramat@kernel.org>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Zefan Li <lizefan@huawei.com>
> Cc: Nilay Vaish <nilayvaish@gmail.com>
> Cc: pi3orama@163.com
> ---
> tools/perf/util/evlist.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index a4137e0..1462085 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -30,6 +30,7 @@
> static void perf_evlist__mmap_put(struct perf_evlist *evlist, int idx);
> static void __perf_evlist__munmap(struct perf_evlist *evlist, int idx);
> static void perf_mmap__munmap(struct perf_mmap *map);
> +static void perf_mmap__put(struct perf_mmap *map);
>
> #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
> #define SID(e, x, y) xyarray__entry(e->sample_id, x, y)
> @@ -466,7 +467,8 @@ int perf_evlist__alloc_pollfd(struct perf_evlist *evlist)
> return 0;
> }
>
> -static int __perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd, int idx, short revent)
> +static int __perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd,
> + struct perf_mmap *map, short revent)
> {
> int pos = fdarray__add(&evlist->pollfd, fd, revent | POLLERR | POLLHUP);
> /*
> @@ -474,7 +476,7 @@ static int __perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd, int idx
> * close the associated evlist->mmap[] entry.
> */
> if (pos >= 0) {
> - evlist->pollfd.priv[pos].idx = idx;
> + evlist->pollfd.priv[pos].ptr = map;

looks like there's no user for idx now, patch below compiles for me
I guess we should remove it..

jirka


---
diff --git a/tools/lib/api/fd/array.h b/tools/lib/api/fd/array.h
index 71287dddc05f..54041a4ded39 100644
--- a/tools/lib/api/fd/array.h
+++ b/tools/lib/api/fd/array.h
@@ -21,7 +21,6 @@ struct fdarray {
int nr_autogrow;
struct pollfd *entries;
union {
- int idx;
void *ptr;
} *priv;
};
\
 
 \ /
  Last update: 2016-07-15 17:41    [W:0.144 / U:0.360 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site