From: Andi Kleen <[email protected]> Fix the logic to allow overriding event default periods with -c or -F on the command line. I'm not sure I understand this if() fully, but this change makes all cases I tested work (tracepoint with default, default, ,-c, -F)
This fixed specifying -c / -F with json event list events, which have a default period. It should do the same for trace point events. Cc: [email protected] v2: Simplify, just change || to && Signed-off-by: Andi Kleen <[email protected]> --- tools/perf/util/evsel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 5c28d82..d9ceede 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -592,7 +592,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts) * We default some events to a 1 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); -- 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
