Commit ce4326d2 authored by David Sharp's avatar David Sharp Committed by Arnaldo Carvalho de Melo
Browse files

perf record: Set PERF_RECORD_PERIOD if attr->freq is set. 



evsel__config() would only set PERF_RECORD_PERIOD if it set attr->freq
from perf record options. When it is set by libpfm events, it would not
get set. This changes evsel__config to see if attr->freq is set outside
of whether or not it changes attr->freq itself.

Signed-off-by: default avatarDavid Sharp <dhsharp@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrii Nakryiko <andriin@fb.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: KP Singh <kpsingh@chromium.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Martin KaFai Lau <kafai@fb.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Yonghong Song <yhs@fb.com>
Cc: david sharp <dhsharp@google.com>
Link: http://lore.kernel.org/lkml/20200912025655.1337192-2-irogers@google.com


Signed-off-by: default avatarIan Rogers <irogers@google.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d2c73501

tools/perf/util/evsel.c

+6 −1
Original line number Diff line number Diff line
@@ -979,13 +979,18 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts, 
	if (!attr->sample_period || (opts->user_freq != UINT_MAX ||

				     opts->user_interval != ULLONG_MAX)) {

		if (opts->freq) {

			evsel__set_sample_bit(evsel, PERIOD);

			attr->freq		= 1;

			attr->sample_freq	= opts->freq;

		} else {

			attr->sample_period = opts->default_interval;

		}

	}

	/*

	 * If attr->freq was set (here or earlier), ask for period

	 * to be sampled.

	 */

	if (attr->freq)

		evsel__set_sample_bit(evsel, PERIOD);



	if (opts->no_samples)

		attr->sample_freq = 0;