From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754419AbaEOWDT (ORCPT ); Thu, 15 May 2014 18:03:19 -0400 Received: from mga02.intel.com ([134.134.136.20]:60436 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751163AbaEOWDS (ORCPT ); Thu, 15 May 2014 18:03:18 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,1062,1389772800"; d="scan'208";a="512437970" From: Andi Kleen To: jolsa@redhat.com Cc: linux-kernel@vger.kernel.org, namhyung@kernel.org, acme@infradead.org, Andi Kleen , fweisbec@gmail.com Subject: [PATCH 9/9] perf, tools, record: Always allow to overide default period v2 Date: Thu, 15 May 2014 15:03:12 -0700 Message-Id: <1400191392-11569-10-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1400191392-11569-1-git-send-email-andi@firstfloor.org> References: <1400191392-11569-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen 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: fweisbec@gmail.com v2: Simplify, just change || to && Signed-off-by: Andi Kleen --- 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