From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755442AbbIAIb2 (ORCPT ); Tue, 1 Sep 2015 04:31:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54362 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752741AbbIAIbY (ORCPT ); Tue, 1 Sep 2015 04:31:24 -0400 Date: Tue, 1 Sep 2015 01:31:13 -0700 From: tip-bot for Kan Liang Message-ID: Cc: hpa@zytor.com, acme@redhat.com, tglx@linutronix.de, jolsa@kernel.org, kan.liang@intel.com, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: jolsa@kernel.org, tglx@linutronix.de, acme@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, kan.liang@intel.com, mingo@kernel.org In-Reply-To: <1440138194-17001-1-git-send-email-kan.liang@intel.com> References: <1440138194-17001-1-git-send-email-kan.liang@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf evlist: Open event on evsel cpus and threads Git-Commit-ID: d988d5ee647861706bc7a391ddbc29429b50f00e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d988d5ee647861706bc7a391ddbc29429b50f00e Gitweb: http://git.kernel.org/tip/d988d5ee647861706bc7a391ddbc29429b50f00e Author: Kan Liang AuthorDate: Fri, 21 Aug 2015 02:23:14 -0400 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 31 Aug 2015 17:28:01 -0300 perf evlist: Open event on evsel cpus and threads An evsel may have different cpus and threads than the evlist it is in. Use it's own cpus and threads, when opening the evsel in 'perf record'. Signed-off-by: Kan Liang Cc: Jiri Olsa Link: http://lkml.kernel.org/r/1440138194-17001-1-git-send-email-kan.liang@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 2 +- tools/perf/util/evlist.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index a660022..1d14f38 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -279,7 +279,7 @@ static int record__open(struct record *rec) evlist__for_each(evlist, pos) { try_again: - if (perf_evsel__open(pos, evlist->cpus, evlist->threads) < 0) { + if (perf_evsel__open(pos, pos->cpus, pos->threads) < 0) { if (perf_evsel__fallback(pos, errno, msg, sizeof(msg))) { if (verbose) ui__warning("%s\n", msg); diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 8d00039..d51a520 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1181,6 +1181,10 @@ int perf_evlist__apply_filters(struct perf_evlist *evlist, struct perf_evsel **e if (evsel->filter == NULL) continue; + /* + * filters only work for tracepoint event, which doesn't have cpu limit. + * So evlist and evsel should always be same. + */ err = perf_evsel__apply_filter(evsel, ncpus, nthreads, evsel->filter); if (err) { *err_evsel = evsel;