From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753646AbbEAKNz (ORCPT ); Fri, 1 May 2015 06:13:55 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51947 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753526AbbEAKNw (ORCPT ); Fri, 1 May 2015 06:13:52 -0400 Date: Fri, 1 May 2015 03:13:17 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, acme@redhat.com, dzickus@redhat.com, hpa@zytor.com, jolsa@redhat.com, fweisbec@gmail.com, adrian.hunter@intel.com, tglx@linutronix.de, namhyung@kernel.org, linux-kernel@vger.kernel.org, eranian@google.com, dsahern@gmail.com, bp@suse.de Reply-To: linux-kernel@vger.kernel.org, eranian@google.com, dsahern@gmail.com, bp@suse.de, acme@redhat.com, mingo@kernel.org, dzickus@redhat.com, tglx@linutronix.de, namhyung@kernel.org, hpa@zytor.com, fweisbec@gmail.com, adrian.hunter@intel.com, jolsa@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf trace: Enable events when doing system wide tracing and starting a workload Git-Commit-ID: cb24d01d217497fb32467de22d773655f47d3896 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: cb24d01d217497fb32467de22d773655f47d3896 Gitweb: http://git.kernel.org/tip/cb24d01d217497fb32467de22d773655f47d3896 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 22 Apr 2015 10:04:23 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 23 Apr 2015 17:07:59 -0300 perf trace: Enable events when doing system wide tracing and starting a workload commit f7aa222ff397 Author: Arnaldo Carvalho de Melo Date: Tue Feb 3 13:25:39 2015 -0300 perf trace: No need to enable evsels for workload started from perf The assumption was that whenever a workload is specified, the attr.enable_on_exec evsel flag would be set, but that is not happening when perf_record_opts.system_wide is set, for instance That resulted in both perf_evlist__enable() and attr.enable_on_exec being not called/set, which made the events to remain disabled while the workload runs, producing no output. Fix it, by calling perf_evlist__enable() in the 'trace' tool when forking and not targetting a workload started from trace v2: Test against !target__none(), as suggested by Namhyung Kim, that is what is used in perf_evsel__config() when deciding if the attr.enable_on_exec flag to be set. More work is needed to cover other cases such as opts->initial_delay. Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-27z7169pvfxgj8upic636syv@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index e124741..8842218 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2241,10 +2241,11 @@ static int trace__run(struct trace *trace, int argc, const char **argv) if (err < 0) goto out_error_mmap; + if (!target__none(&trace->opts.target)) + perf_evlist__enable(evlist); + if (forks) perf_evlist__start_workload(evlist); - else - perf_evlist__enable(evlist); trace->multiple_threads = evlist->threads->map[0] == -1 || evlist->threads->nr > 1 ||