Commit 64b4778b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf evlist: Use the right prefix for 'struct evlist' event group methods 



perf_evlist__ is for 'struct perf_evlist' methods, in tools/lib/perf/,
go on completing this split.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7748bb71

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ int cmd_annotate(int argc, const char **argv) 
						      HEADER_BRANCH_STACK);



	if (annotate.group_set)

		perf_evlist__force_leader(annotate.session->evlist);

		evlist__force_leader(annotate.session->evlist);



	ret = symbol__annotation_init();

	if (ret < 0)

tools/perf/builtin-record.c

+1 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ static int record__open(struct record *rec) 
			if ((errno == EINVAL || errno == EBADF) &&

			    pos->leader != pos &&

			    pos->weak_group) {

			        pos = perf_evlist__reset_weak_group(evlist, pos, true);

			        pos = evlist__reset_weak_group(evlist, pos, true);

				goto try_again;

			}

			rc = -errno;

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static void setup_forced_leader(struct report *report, 
				struct evlist *evlist)

{

	if (report->group_set)

		perf_evlist__force_leader(evlist);

		evlist__force_leader(evlist);

}



static int process_feature_event(struct perf_session *session,

tools/perf/builtin-stat.c

+1 −1
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) 
				if ((errno == EINVAL || errno == EBADF) &&

				    counter->leader != counter &&

				    counter->weak_group) {

					perf_evlist__reset_weak_group(evsel_list, counter, false);

					evlist__reset_weak_group(evsel_list, counter, false);

					assert(counter->reset_group);

					second_pass = true;

					continue;

tools/perf/util/auxtrace.c

+2 −4
Original line number Diff line number Diff line
@@ -62,9 +62,7 @@ 
 * Make a group from 'leader' to 'last', requiring that the events were not

 * already grouped to a different leader.

 */

static int perf_evlist__regroup(struct evlist *evlist,

				struct evsel *leader,

				struct evsel *last)

static int evlist__regroup(struct evlist *evlist, struct evsel *leader, struct evsel *last)

{

	struct evsel *evsel;

	bool grp;
@@ -775,7 +773,7 @@ int auxtrace_parse_sample_options(struct auxtrace_record *itr, 
			evsel->core.attr.aux_sample_size = term->val.aux_sample_size;

			/* If possible, group with the AUX event */

			if (aux_evsel && evsel->core.attr.aux_sample_size)

				perf_evlist__regroup(evlist, aux_evsel, evsel);

				evlist__regroup(evlist, aux_evsel, evsel);

		}

	}