Commit 5f342788 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf evlist: Move leader-sampling configuration 



Move leader-sampling configuration in preparation for adding support for
leader sampling with AUX area events.

Committer notes:

It only makes sense when configuring an evsel that is part of an evlist,
so the only case where it is called outside perf_evlist__config(), in
some 'perf test' entry, is safe, and even there we should just use
perf_evlist__config(), but since in that case we have just one evsel in
the evlist, it is equivalent.

Also fixed up this problem:

  util/record.c: In function ‘perf_evlist__config’:
  util/record.c:223:3: error: too many arguments to function ‘perf_evsel__config_leader_sampling’
    223 |   perf_evsel__config_leader_sampling(evsel, evlist);
        |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  util/record.c:170:13: note: declared here
    170 | static void perf_evsel__config_leader_sampling(struct evsel *evsel)
        |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lore.kernel.org/lkml/20200401101613.6201-14-adrian.hunter@intel.com


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

tools/perf/util/evsel.c

+0 −19
Original line number Diff line number Diff line
@@ -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;

tools/perf/util/record.c

+29 −0
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE