From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932136AbeAQQ36 (ORCPT ); Wed, 17 Jan 2018 11:29:58 -0500 Received: from terminus.zytor.com ([65.50.211.136]:45753 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753671AbeAQQ34 (ORCPT ); Wed, 17 Jan 2018 11:29:56 -0500 Date: Wed, 17 Jan 2018 08:27:18 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: tmricht@linux.vnet.ibm.com, hpa@zytor.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, mingo@kernel.org, brueckner@linux.vnet.ibm.com, namhyung@kernel.org, wangnan0@huawei.com, tglx@linutronix.de, acme@redhat.com, adrian.hunter@intel.com Reply-To: wangnan0@huawei.com, acme@redhat.com, tglx@linutronix.de, adrian.hunter@intel.com, tmricht@linux.vnet.ibm.com, hpa@zytor.com, dsahern@gmail.com, mingo@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, brueckner@linux.vnet.ibm.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evsel: Check if callchain is enabled before setting it up Git-Commit-ID: 1688c2fdf6e72633c7f463da3878b58eef01ba56 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: 1688c2fdf6e72633c7f463da3878b58eef01ba56 Gitweb: https://git.kernel.org/tip/1688c2fdf6e72633c7f463da3878b58eef01ba56 Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 12 Jan 2018 16:21:04 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 12 Jan 2018 16:57:16 -0300 perf evsel: Check if callchain is enabled before setting it up The construct: if (callchain_param) perf_evsel__config_callchain(evsel, opts, &callchain_param); happens in several places, so make perf_evsel__config_callchain() work just like free(NULL), do nothing if param->enabled is not set. Cc: Adrian Hunter Cc: David Ahern Cc: Hendrick Brueckner Cc: Jiri Olsa Cc: Namhyung Kim Cc: Thomas Richter Cc: Wang Nan Link: https://lkml.kernel.org/n/tip-ykk0qzxnxwx3o611ctjnmxav@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evsel.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 4eea3b4..efa2e62 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -651,9 +651,9 @@ int perf_evsel__group_desc(struct perf_evsel *evsel, char *buf, size_t size) return ret; } -void perf_evsel__config_callchain(struct perf_evsel *evsel, - struct record_opts *opts, - struct callchain_param *param) +static void __perf_evsel__config_callchain(struct perf_evsel *evsel, + struct record_opts *opts, + struct callchain_param *param) { bool function = perf_evsel__is_function_event(evsel); struct perf_event_attr *attr = &evsel->attr; @@ -699,6 +699,14 @@ void perf_evsel__config_callchain(struct perf_evsel *evsel, } } +void perf_evsel__config_callchain(struct perf_evsel *evsel, + struct record_opts *opts, + struct callchain_param *param) +{ + if (param->enabled) + return __perf_evsel__config_callchain(evsel, opts, param); +} + static void perf_evsel__reset_callgraph(struct perf_evsel *evsel, struct callchain_param *param)