perf evlist: Introduce perf_evlist__filter_pollfd method
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 1ddec7f0d0ab5b71cf2cc5a782441c20e7afbcfb Gitweb: http://git.kernel.org/tip/1ddec7f0d0ab5b71cf2cc5a782441c20e7afbcfb Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 12 Aug 2014 23:04:11 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 25 Sep 2014 16:46:53 -0300
perf evlist: Introduce perf_evlist__filter_pollfd method
To remove all entries in evlist->pollfd[] that have revents matching at least one of the bits in the specified mask.
It'll adjust evlist->nr_fds to the number of unfiltered fds and will return this value, as a convenience and to avoid requiring direct access to internal state of perf_evlist objects.
This will be used after polling the evlist fds so that we remove fds that were closed by the kernel.
Acked-by Jiri Olsa <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Don Zickus <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/evlist.c | 21 +++++++++++++++++++++ tools/perf/util/evlist.h | 2 ++ 2 files changed, 23 insertions(+)
tools/perf/util/evlist.c +21 -0
@@ -428,6 +428,27 @@ void perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd) evlist->nr_fds++; } +int perf_evlist__filter_pollfd (struct perf_evlist *evlist,short revents_and_mask) +{ +int fd, nr_fds =0 ; + +if (evlist->nr_fds ==0 ) +return 0 ; + +for (fd =0 ; fd < evlist->nr_fds; ++fd) { +if (evlist->pollfd[fd].revents & revents_and_mask) +continue ; + +if (fd != nr_fds) + evlist->pollfd[nr_fds] = evlist->pollfd[fd]; + + ++nr_fds; + } + + evlist->nr_fds = nr_fds; +return nr_fds; +} +static void perf_evlist__id_hash (struct perf_evlist *evlist,struct perf_evsel *evsel,int cpu,int thread,u64 id)
tools/perf/util/evlist.h +2 -0
@@ -84,6 +84,8 @@ void perf_evlist__id_add(struct perf_evlist *evlist, struct perf_evsel *evsel,void perf_evlist__add_pollfd (struct perf_evlist *evlist,int fd); +int perf_evlist__filter_pollfd (struct perf_evlist *evlist,short revents_and_mask); +struct perf_evsel *perf_evlist__id2evsel (struct perf_evlist *evlist,u64 id);struct perf_sample_id *perf_evlist__id2sid (struct perf_evlist *evlist,u64 id);