diff options
| -rw-r--r-- | tools/perf/util/evsel.c | 19 | ||||
| -rw-r--r-- | tools/perf/util/record.c | 29 |
2 files changed, 29 insertions, 19 deletions
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index f320adaf1326..8300e8c7aea8 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1002,25 +1002,6 @@ void perf_evsel__config(struct evsel *evsel, struct record_opts *opts, } } - /* - * Disable sampling for all group members other - * than leader in case leader 'leads' the sampling. - */ - if ((leader != evsel) && leader->sample_read) { - attr->freq = 0; - attr->sample_freq = 0; - attr->sample_period = 0; - attr->write_backward = 0; - - /* - * We don't get sample for slave events, we make them - * when delivering group leader sample. Set the slave - * event to follow the master sample_type to ease up - * report. - */ - attr->sample_type = leader->core.attr.sample_type; - } - if (opts->no_samples) attr->sample_freq = 0; diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c index 7def66168503..8870ae451cac 100644 --- a/tools/perf/util/record.c +++ b/tools/perf/util/record.c @@ -167,6 +167,31 @@ bool perf_can_aux_sample(void) return true; } +static void perf_evsel__config_leader_sampling(struct evsel *evsel) +{ + struct perf_event_attr *attr = &evsel->core.attr; + struct evsel *leader = evsel->leader; + + /* + * Disable sampling for all group members other + * than leader in case leader 'leads' the sampling. + */ + if (leader != evsel && leader->sample_read) { + attr->freq = 0; + attr->sample_freq = 0; + attr->sample_period = 0; + attr->write_backward = 0; + + /* + * We don't get sample for slave events, we make them + * when delivering group leader sample. Set the slave + * event to follow the master sample_type to ease up + * report. + */ + attr->sample_type = leader->core.attr.sample_type; + } +} + void perf_evlist__config(struct evlist *evlist, struct record_opts *opts, struct callchain_param *callchain) { @@ -193,6 +218,10 @@ void perf_evlist__config(struct evlist *evlist, struct record_opts *opts, evsel->core.attr.comm_exec = 1; } + /* Configure leader sampling here now that the sample type is known */ + evlist__for_each_entry(evlist, evsel) + perf_evsel__config_leader_sampling(evsel); + if (opts->full_auxtrace) { /* * Need to be able to synthesize and parse selected events with |