perf tools: Use perf_evlist__{first,last}, perf_evsel__next
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 9a354cdc2f40344a177d369fb4987a8270dd94df Gitweb: http://git.kernel.org/tip/9a354cdc2f40344a177d369fb4987a8270dd94df Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 13 Nov 2013 15:54:30 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 14 Nov 2013 16:00:10 -0300
perf tools: Use perf_evlist__{first,last}, perf_evsel__next
In a few remaining places where the equivalent open coded variant was still being used.
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[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/tests/parse-events.c | 3 +-- tools/perf/ui/browsers/hists.c | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-)
tools/perf/tests/parse-events.c +1 -2
@@ -441,9 +441,8 @@ static int test__checkevent_pmu_name(struct perf_evlist *evlist)static int test__checkevent_pmu_events (struct perf_evlist *evlist) { -struct perf_evsel *evsel; +struct perf_evsel *evsel =perf_evlist__first (evlist); - evsel = list_entry(evlist->entries.next, struct perf_evsel, node);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->nr_entries);TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->attr.type); TEST_ASSERT_VAL("wrong exclude_user",
tools/perf/ui/browsers/hists.c +4 -5
@@ -1847,13 +1847,13 @@ browse_hists:switch (key) {case K_TAB :if (pos->node.next == &evlist->entries) - pos = list_entry(evlist->entries.next, struct perf_evsel, node); + pos =perf_evlist__first (evlist);else - pos = list_entry(pos->node.next, struct perf_evsel, node); + pos =perf_evsel__next (pos); goto browse_hists;case K_UNTAB :if (pos->node.prev == &evlist->entries) - pos = list_entry(evlist->entries.prev, struct perf_evsel, node); + pos =perf_evlist__last (evlist);else pos = list_entry(pos->node.prev, struct perf_evsel, node); goto browse_hists;
@@ -1943,8 +1943,7 @@ int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help, single_entry:if (nr_entries ==1 ) { -struct perf_evsel *first =list_entry (evlist->entries.next, - struct perf_evsel, node); +struct perf_evsel *first =perf_evlist__first (evlist);const char *ev_name =perf_evsel__name (first); return perf_evsel__hists_browse(first, nr_entries, help,