perf evlist: Introduce poll method for common code idiom
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: f66a889dbc96dd342c87232d74f0956076707746 Gitweb: http://git.kernel.org/tip/f66a889dbc96dd342c87232d74f0956076707746 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 18 Aug 2014 17:25:59 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 25 Sep 2014 16:46:55 -0300
perf evlist: Introduce poll method for common code idiom
Since we have access two evlist members in all these poll calls, provide a helper.
This will also help to make the patch introducing the pollfd class more clear, as the evlist specific uses will be hiden away perf_evlist__poll().
Acked-by Jiri Olsa <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc Corey Ashford <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jean Pihet <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-top.c | 4 ++-- tools/perf/builtin-trace.c | 2 +- tools/perf/tests/open-syscall-tp-fields.c | 2 +- tools/perf/tests/perf-record.c | 2 +- tools/perf/tests/task-exit.c | 2 +- tools/perf/util/evlist.c | 5 +++++ tools/perf/util/evlist.h | 2 ++ tools/perf/util/python.c | 2 +- 9 files changed, 15 insertions(+), 8 deletions(-)
tools/perf/builtin-record.c +1 -1
@@ -459,7 +459,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)if (hits == rec->samples) {if (done)break ; - err =poll (rec->evlist->pollfd, rec->evlist->nr_fds,-1 ); + err =perf_evlist__poll (rec->evlist,-1 );/* * Propagate error, only if there's any. Ignore positive * number of returned events and interrupt error.
tools/perf/builtin-top.c +2 -2
@@ -964,7 +964,7 @@ static int __cmd_top(struct perf_top *top)perf_evlist__enable (top->evlist);/* Wait for a minimal set of events before starting the snapshot */ -poll (top->evlist->pollfd, top->evlist->nr_fds,100 ); +perf_evlist__poll (top->evlist,100 );perf_top__mmap_read (top);
@@ -991,7 +991,7 @@ static int __cmd_top(struct perf_top *top)perf_top__mmap_read (top);if (hits == top->samples) - ret =poll (top->evlist->pollfd, top->evlist->nr_fds,100 ); + ret =perf_evlist__poll (top->evlist,100 ); } ret =0 ;
tools/perf/builtin-trace.c +1 -1
@@ -2171,7 +2171,7 @@ next_event:if (trace->nr_events == before) {int timeout = done ?100 :-1 ; -if (poll (evlist->pollfd, evlist->nr_fds, timeout) >0 ) +if (perf_evlist__poll (evlist, timeout) >0 ) goto again; }else { goto again;
tools/perf/tests/open-syscall-tp-fields.c +1 -1
@@ -105,7 +105,7 @@ int test__syscall_open_tp_fields(void) }if (nr_events == before) -poll (evlist->pollfd, evlist->nr_fds,10 ); +perf_evlist__poll (evlist,10 );if (++nr_polls >5 ) {pr_debug ("%s: no events!\n" , __func__);
tools/perf/tests/perf-record.c +1 -1
@@ -268,7 +268,7 @@ int test__PERF_RECORD(void)* perf_event_attr.wakeup_events, just PERF_EVENT_SAMPLE does. */ if (total_events == before && false) -poll (evlist->pollfd, evlist->nr_fds,-1 ); +perf_evlist__poll (evlist,-1 );sleep (1 );if (++wakeups >5 ) {
tools/perf/tests/task-exit.c +1 -1
@@ -105,7 +105,7 @@ retry: }if (!exited || !nr_exit) { -poll (evlist->pollfd, evlist->nr_fds,-1 ); +perf_evlist__poll (evlist,-1 ); goto retry; }
tools/perf/util/evlist.c +5 -0
@@ -475,6 +475,11 @@ int perf_evlist__filter_pollfd(struct perf_evlist *evlist, short revents_and_masreturn nr_fds; } +int perf_evlist__poll (struct perf_evlist *evlist,int timeout) +{ +return poll (evlist->pollfd, evlist->nr_fds, timeout); +} +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
@@ -87,6 +87,8 @@ int perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd);int perf_evlist__alloc_pollfd (struct perf_evlist *evlist);int perf_evlist__filter_pollfd (struct perf_evlist *evlist,short revents_and_mask); +int perf_evlist__poll (struct perf_evlist *evlist,int timeout); +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);
tools/perf/util/python.c +1 -1
@@ -736,7 +736,7 @@ static PyObject *pyrf_evlist__poll(struct pyrf_evlist *pevlist,if (!PyArg_ParseTupleAndKeywords (args, kwargs,"|i" , kwlist, &timeout))return NULL ; - n =poll (evlist->pollfd, evlist->nr_fds, timeout); + n =perf_evlist__poll (evlist, timeout);if (n <0 ) {PyErr_SetFromErrno (PyExc_OSError);return NULL ;