perf evlist: Set the leader in the perf_evlist__config method
Commit-ID: f77a951826b44b763e4d9fbd2479b6132d2bd7fc Gitweb: http://git.kernel.org/tip/f77a951826b44b763e4d9fbd2479b6132d2bd7fc Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 10 Dec 2012 16:41:31 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 11 Dec 2012 17:19:01 -0300
perf evlist: Set the leader in the perf_evlist__config method
Since we need to ensure the leader is set before configuring the evsel perf_event_attrs.
Reducing the boilerplate needed by tools, helping, for instance, 'perf trace', that wasn't setting the leader.
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-record.c | 9 +-------- tools/perf/builtin-trace.c | 2 +- tools/perf/tests/perf-record.c | 2 +- tools/perf/util/evlist.c | 10 ++++++++-- tools/perf/util/evlist.h | 4 ++-- 5 files changed, 13 insertions(+), 14 deletions(-)
tools/perf/builtin-record.c +1 -8
@@ -230,14 +230,7 @@ static int perf_record__open(struct perf_record *rec)struct perf_record_opts *opts = &rec->opts;int rc =0 ; -/* -* Set the evsel leader links before we configure attributes, -* since some might depend on this info. -*/ -if (opts->group) -perf_evlist__set_leader (evlist); - -perf_evlist__config_attrs (evlist, opts); +perf_evlist__config (evlist, opts);list_for_each_entry (pos, &evlist->entries, node) {struct perf_event_attr *attr = &pos->attr;
tools/perf/builtin-trace.c +1 -1
@@ -455,7 +455,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) goto out_delete_evlist; } -perf_evlist__config_attrs (evlist, &trace->opts); +perf_evlist__config (evlist, &trace->opts);signal (SIGCHLD , sig_handler);signal (SIGINT , sig_handler);
tools/perf/tests/perf-record.c +1 -1
@@ -106,7 +106,7 @@ int test__PERF_RECORD(void)perf_evsel__set_sample_bit (evsel,CPU );perf_evsel__set_sample_bit (evsel,TID );perf_evsel__set_sample_bit (evsel,TIME ); -perf_evlist__config_attrs (evlist, &opts); +perf_evlist__config (evlist, &opts); err =sched__get_first_possible_cpu (evlist->workload.pid, &cpu_mask);if (err <0 ) {
tools/perf/util/evlist.c +8 -2
@@ -49,10 +49,16 @@ struct perf_evlist *perf_evlist__new(struct cpu_map *cpus,return evlist; } -void perf_evlist__config_attrs (struct perf_evlist *evlist, -struct perf_record_opts *opts) +void perf_evlist__config (struct perf_evlist *evlist, +struct perf_record_opts *opts) {struct perf_evsel *evsel; +/* +* Set the evsel leader links before we configure attributes, +* since some might depend on this info. +*/ +if (opts->group) +perf_evlist__set_leader (evlist);if (evlist->cpus->map[0 ] <0 ) opts->no_inherit = true;
tools/perf/util/evlist.h +2 -2
@@ -76,8 +76,8 @@ union perf_event *perf_evlist__mmap_read(struct perf_evlist *self, int idx);int perf_evlist__open (struct perf_evlist *evlist); -void perf_evlist__config_attrs (struct perf_evlist *evlist, -struct perf_record_opts *opts); +void perf_evlist__config (struct perf_evlist *evlist, +struct perf_record_opts *opts); int perf_evlist__prepare_workload(struct perf_evlist *evlist, struct perf_record_opts *opts,