Commit 17314e23 authored Jun 09, 2014 by Namhyung Kim Committed by Jiri Olsa Jun 12, 2014

perf record: Fix to honor user freq/interval properly



When configuring event perf checked a wrong condition that user
specified both of freq (-F) and period (-c) or the event has no
default value.  This worked because most of events don't have default
value and only tracepoint events have default of 1 (and it's not
desirable to change it for those events).

However, Andi's downloadable event patch changes the situation so it
cannot change the value for those events.  Fix it by allowing override
the default value if user gives one of the options.

  $ perf record -a -e uops_retired.all -F 4000 sleep 1
  [ perf record: Woken up 1 times to write data ]
  [ perf record: Captured and wrote 0.325 MB perf.data (~14185 samples) ]

  $ perf evlist -F
  cpu/uops_retired.all/: sample_freq=4000

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/1402292617-26278-1-git-send-email-namhyung@kernel.org


Signed-off-by: Jiri Olsa <jolsa@kernel.org>

parent 7184062b

tools/perf/util/evsel.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -589,10 +589,10 @@ void perf_evsel__config(struct perf_evsel evsel, struct record_opts opts)
		}

		/*
		* We default some events to a 1 default interval. But keep
		* We default some events to have a default interval. But keep
		* it a weak assumption overridable by the user.
		*/
		if (!attr->sample_period \|\| (opts->user_freq != UINT_MAX &&
		if (!attr->sample_period \|\| (opts->user_freq != UINT_MAX \|\|
		opts->user_interval != ULLONG_MAX)) {
		if (opts->freq) {
		perf_evsel__set_sample_bit(evsel, PERIOD);

Admin message