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

perf evlist: Use the right prefix for 'struct evlist' methods: evlist__set_leader() 



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 56933029

tools/perf/builtin-stat.c

+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) 
	}



	if (group)

		perf_evlist__set_leader(evsel_list);

		evlist__set_leader(evsel_list);



	if (affinity__setup(&affinity) < 0)

		return -1;

tools/perf/util/evlist.c

+4 −4
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ int __evlist__set_tracepoints_handlers(struct evlist *evlist, 
	return err;

}



void __perf_evlist__set_leader(struct list_head *list)

void __evlist__set_leader(struct list_head *list)

{

	struct evsel *evsel, *leader;
@@ -226,11 +226,11 @@ void __perf_evlist__set_leader(struct list_head *list) 
	}

}



void perf_evlist__set_leader(struct evlist *evlist)

void evlist__set_leader(struct evlist *evlist)

{

	if (evlist->core.nr_entries) {

		evlist->nr_groups = evlist->core.nr_entries > 1 ? 1 : 0;

		__perf_evlist__set_leader(&evlist->core.entries);

		__evlist__set_leader(&evlist->core.entries);

	}

}
@@ -1694,7 +1694,7 @@ void perf_evlist__force_leader(struct evlist *evlist) 
	if (!evlist->nr_groups) {

		struct evsel *leader = evlist__first(evlist);



		perf_evlist__set_leader(evlist);

		evlist__set_leader(evlist);

		leader->forced_leader = true;

	}

}

tools/perf/util/evlist.h

+2 −2
Original line number Diff line number Diff line
@@ -220,8 +220,8 @@ void perf_evlist__set_selected(struct evlist *evlist, 
int perf_evlist__create_maps(struct evlist *evlist, struct target *target);

int perf_evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel);



void __perf_evlist__set_leader(struct list_head *list);

void perf_evlist__set_leader(struct evlist *evlist);

void __evlist__set_leader(struct list_head *list);

void evlist__set_leader(struct evlist *evlist);



u64 __evlist__combined_sample_type(struct evlist *evlist);

u64 evlist__combined_sample_type(struct evlist *evlist);

tools/perf/util/parse-events.c

+1 −1
Original line number Diff line number Diff line
@@ -1769,7 +1769,7 @@ void parse_events__set_leader(char *name, struct list_head *list, 
	if (parse_events__set_leader_for_uncore_aliase(name, list, parse_state))

		return;



	__perf_evlist__set_leader(list);

	__evlist__set_leader(list);

	leader = list_entry(list->next, struct evsel, core.node);

	leader->group_name = name ? strdup(name) : NULL;

}

tools/perf/util/python.c

+1 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ static PyObject *pyrf_evlist__open(struct pyrf_evlist *pevlist, 
		return NULL;



	if (group)

		perf_evlist__set_leader(evlist);

		evlist__set_leader(evlist);



	if (evlist__open(evlist) < 0) {

		PyErr_SetFromErrno(PyExc_OSError);