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

perf evlist: Rename __group method to __set_leader 



Just like was done for parse_events__set_leader.

Also we need to have the list_entry set_leader method in evlist.c so that we
don't grow another dep in the python binding:

 # ~acme/git/linux/tools/perf/python/twatch.py
 Traceback (most recent call last):
   File "/home/acme/git/linux/tools/perf/python/twatch.py", line 16, in <module>
     import perf
 ImportError: /home/acme/git/build/perf/python/perf.so: undefined symbol: parse_events__set_leader

And also remove a pr_debug from evsel.c so that we avoid this one too:

 # ~acme/git/linux/tools/perf/python/twatch.py
 Traceback (most recent call last):
   File "/home/acme/git/linux/tools/perf/python/twatch.py", line 16, in <module>
     import perf
 ImportError: /home/acme/git/build/perf/python/perf.so: undefined symbol: eprintf

Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Acked-by: default avatarNamhyung Kim <namhyung@gmail.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@gmail.com>
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-0hk9dazg9pora9jylkqngovm@git.kernel.org


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

tools/perf/builtin-record.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static void perf_record__open(struct perf_record *rec) 
	perf_evlist__config_attrs(evlist, opts);



	if (opts->group)

		perf_evlist__group(evlist);

		perf_evlist__set_leader(evlist);



	list_for_each_entry(pos, &evlist->entries, node) {

		struct perf_event_attr *attr = &pos->attr;

tools/perf/builtin-stat.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static int run_perf_stat(int argc __used, const char **argv) 
	}



	if (group)

		perf_evlist__group(evsel_list);

		perf_evlist__set_leader(evsel_list);



	first = list_entry(evsel_list->entries.next, struct perf_evsel, node);

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ static void perf_top__start_counters(struct perf_top *top) 
	struct perf_evlist *evlist = top->evlist;



	if (top->group)

		perf_evlist__group(evlist);

		perf_evlist__set_leader(evlist);



	list_for_each_entry(counter, &evlist->entries, node) {

		struct perf_event_attr *attr = &counter->attr;

tools/perf/util/evlist.c

+15 −2
Original line number Diff line number Diff line
@@ -108,10 +108,23 @@ void perf_evlist__splice_list_tail(struct perf_evlist *evlist, 
	evlist->nr_entries += nr_entries;

}



void perf_evlist__group(struct perf_evlist *evlist)

void __perf_evlist__set_leader(struct list_head *list)

{

	struct perf_evsel *evsel, *leader;



	leader = list_entry(list->next, struct perf_evsel, node);

	leader->leader = NULL;



	list_for_each_entry(evsel, list, node) {

		if (evsel != leader)

			evsel->leader = leader;

	}

}



void perf_evlist__set_leader(struct perf_evlist *evlist)

{

	if (evlist->nr_entries)

		parse_events__set_leader(&evlist->entries);

		__perf_evlist__set_leader(&evlist->entries);

}



int perf_evlist__add_default(struct perf_evlist *evlist)

tools/perf/util/evlist.h

+3 −2
Original line number Diff line number Diff line
@@ -118,6 +118,9 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, 
void perf_evlist__delete_maps(struct perf_evlist *evlist);

int perf_evlist__set_filters(struct perf_evlist *evlist);



void __perf_evlist__set_leader(struct list_head *list);

void perf_evlist__set_leader(struct perf_evlist *evlist);



u64 perf_evlist__sample_type(const struct perf_evlist *evlist);

bool perf_evlist__sample_id_all(const const struct perf_evlist *evlist);

u16 perf_evlist__id_hdr_size(const struct perf_evlist *evlist);
@@ -131,6 +134,4 @@ bool perf_evlist__valid_sample_id_all(const struct perf_evlist *evlist); 
void perf_evlist__splice_list_tail(struct perf_evlist *evlist,

				   struct list_head *list,

				   int nr_entries);



void perf_evlist__group(struct perf_evlist *evlist);

#endif /* __PERF_EVLIST_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE