From 63dab225f334e0e21f7106aed8d888b500b53ce6 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Tue, 14 Aug 2012 16:35:48 -0300 Subject: [PATCH] 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 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 import perf ImportError: /home/acme/git/build/perf/python/perf.so: undefined symbol: eprintf Acked-by: Jiri Olsa Acked-by: Namhyung Kim Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Mike Galbraith Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-0hk9dazg9pora9jylkqngovm@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/util/evlist.c | 17 +++++++++++++++-- tools/perf/util/evlist.h | 5 +++-- tools/perf/util/evsel.c | 4 ---- tools/perf/util/parse-events.c | 19 +++---------------- tools/perf/util/parse-events.h | 3 +-- tools/perf/util/parse-events.y | 4 ++-- tools/perf/util/python.c | 2 +- 10 files changed, 28 insertions(+), 32 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index f5b6137c0f7e..c4e3b683e79b 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -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; diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 23908a85bba9..7b9c46341e02 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -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); diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 392d2192b75e..5a097beb8685 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -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; diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index feffee3f2bd8..6d09451430d2 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -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) diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index a19ccd7b51fa..7fe677e6c314 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -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 */ diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index f5b68e73d751..6c7dcc1fde5a 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -622,10 +622,6 @@ static int __perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus, err = -errno; goto out_close; } - - pr_debug("event cpu %d, thread %d, fd %d, group %d\n", - cpu, pid, FD(evsel, cpu, thread), - group_fd); } } diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index f6453cd414ae..4393a6b65c51 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -611,31 +611,18 @@ int parse_events_add_pmu(struct list_head **list, int *idx, pmu_event_name(head_config)); } -struct perf_evsel *parse_events__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; - - return leader; -} - int parse_events__modifier_group(struct list_head *list, char *event_mod) { return parse_events__modifier_event(list, event_mod, true); } -void parse_events__group(char *name, struct list_head *list) +void parse_events__set_leader(char *name, struct list_head *list) { struct perf_evsel *leader; - leader = parse_events__set_leader(list); + __perf_evlist__set_leader(list); + leader = list_entry(list->next, struct perf_evsel, node); leader->group_name = name ? strdup(name) : NULL; } diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index e1a184c9e358..0b9782dc3da2 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -92,8 +92,7 @@ int parse_events_add_breakpoint(struct list_head **list, int *idx, void *ptr, char *type); int parse_events_add_pmu(struct list_head **list, int *idx, char *pmu , struct list_head *head_config); -struct perf_evsel *parse_events__set_leader(struct list_head *list); -void parse_events__group(char *name, struct list_head *list); +void parse_events__set_leader(char *name, struct list_head *list); void parse_events_update_lists(struct list_head *list_event, struct list_head *list_all); void parse_events_error(void *data, void *scanner, char const *msg); diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 084c35fc2d26..66850f820df9 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -119,7 +119,7 @@ PE_NAME '{' events '}' { struct list_head *list = $3; - parse_events__group($1, list); + parse_events__set_leader($1, list); $$ = list; } | @@ -127,7 +127,7 @@ PE_NAME '{' events '}' { struct list_head *list = $2; - parse_events__group(NULL, list); + parse_events__set_leader(NULL, list); $$ = list; } diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index f5bba4b8eb9e..27187f0b71f0 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -825,7 +825,7 @@ static PyObject *pyrf_evlist__open(struct pyrf_evlist *pevlist, return NULL; if (group) - perf_evlist__group(evlist); + perf_evlist__set_leader(evlist); if (perf_evlist__open(evlist) < 0) { PyErr_SetFromErrno(PyExc_OSError); -- 2.39.5