From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759166AbbLCJIQ (ORCPT ); Thu, 3 Dec 2015 04:08:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53939 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932723AbbLCJHC (ORCPT ); Thu, 3 Dec 2015 04:07:02 -0500 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , David Ahern , Ingo Molnar , Namhyung Kim , Peter Zijlstra , Adrian Hunter Subject: [PATCH 6/7] perf stat: Move enable_on_exec setup under earlier code Date: Thu, 3 Dec 2015 10:06:45 +0100 Message-Id: <1449133606-14429-7-git-send-email-jolsa@kernel.org> In-Reply-To: <1449133606-14429-1-git-send-email-jolsa@kernel.org> References: <1449133606-14429-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's more readable this way and we can save one perf_evsel__is_group_leader condition in current code. Link: http://lkml.kernel.org/n/tip-y9s28dql028b0as614rkeul9@git.kernel.org Signed-off-by: Jiri Olsa --- 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 2e70610649a1..e74712dee242 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); } -- 2.4.3