Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a354cdc authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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 <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-4vjnloi5fisilykwxalb5nel@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 9d4ecc88

tools/perf/tests/parse-events.c

+1 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -1847,13 +1847,13 @@ static int perf_evsel_menu__run(struct perf_evsel_menu *menu, 
			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,