From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933152AbbLHEe5 (ORCPT ); Mon, 7 Dec 2015 23:34:57 -0500 Received: from terminus.zytor.com ([198.137.202.10]:50815 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932545AbbLHEez (ORCPT ); Mon, 7 Dec 2015 23:34:55 -0500 Date: Mon, 7 Dec 2015 20:34:40 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: jolsa@kernel.org, namhyung@kernel.org, hpa@zytor.com, mingo@kernel.org, acme@redhat.com, a.p.zijlstra@chello.nl, tglx@linutronix.de, adrian.hunter@intel.com, dsahern@gmail.com, linux-kernel@vger.kernel.org Reply-To: jolsa@kernel.org, namhyung@kernel.org, hpa@zytor.com, mingo@kernel.org, acme@redhat.com, a.p.zijlstra@chello.nl, tglx@linutronix.de, adrian.hunter@intel.com, dsahern@gmail.com, linux-kernel@vger.kernel.org In-Reply-To: <1449133606-14429-7-git-send-email-jolsa@kernel.org> References: <1449133606-14429-7-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf stat: Move enable_on_exec setup under earlier code Git-Commit-ID: c8280cec2a196f2ffea83dd755b17eb020ca1b83 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: c8280cec2a196f2ffea83dd755b17eb020ca1b83 Gitweb: http://git.kernel.org/tip/c8280cec2a196f2ffea83dd755b17eb020ca1b83 Author: Jiri Olsa AuthorDate: Thu, 3 Dec 2015 10:06:45 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 7 Dec 2015 18:12:59 -0300 perf stat: Move enable_on_exec setup under earlier code It's more readable this way and we can save one perf_evsel__is_group_leader condition in current code. Signed-off-by: Jiri Olsa Cc: Adrian Hunter Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1449133606-14429-7-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-stat.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 2e70610..e74712d 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -173,17 +173,20 @@ static int create_perf_stat_counter(struct perf_evsel *evsel) * either manually by us or by kernel via enable_on_exec * set later. */ - if (perf_evsel__is_group_leader(evsel)) + if (perf_evsel__is_group_leader(evsel)) { attr->disabled = 1; - if (target__has_cpu(&target)) - return perf_evsel__open_per_cpu(evsel, perf_evsel__cpus(evsel)); - - if (!target__has_task(&target) && perf_evsel__is_group_leader(evsel)) { - if (!initial_delay) + /* + * In case of initial_delay we enable tracee + * events manually. + */ + if (target__none(&target) && !initial_delay) attr->enable_on_exec = 1; } + if (target__has_cpu(&target)) + return perf_evsel__open_per_cpu(evsel, perf_evsel__cpus(evsel)); + return perf_evsel__open_per_thread(evsel, evsel_list->threads); }