From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752483AbcDWNDo (ORCPT ); Sat, 23 Apr 2016 09:03:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39872 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751979AbcDWNDn (ORCPT ); Sat, 23 Apr 2016 09:03:43 -0400 Date: Sat, 23 Apr 2016 06:03:22 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: tglx@linutronix.de, wangnan0@huawei.com, milian.wolff@kdab.com, mingo@kernel.org, adrian.hunter@intel.com, namhyung@kernel.org, hpa@zytor.com, jolsa@kernel.org, acme@redhat.com, dsahern@gmail.com, linux-kernel@vger.kernel.org Reply-To: wangnan0@huawei.com, tglx@linutronix.de, milian.wolff@kdab.com, mingo@kernel.org, adrian.hunter@intel.com, hpa@zytor.com, namhyung@kernel.org, jolsa@kernel.org, dsahern@gmail.com, acme@redhat.com, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf top: Use callchain_param.enabled instead of symbol_conf.use_callchain Git-Commit-ID: e3815264a6c57147f8b5639536b1df3c98244642 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: e3815264a6c57147f8b5639536b1df3c98244642 Gitweb: http://git.kernel.org/tip/e3815264a6c57147f8b5639536b1df3c98244642 Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 18 Apr 2016 12:30:16 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 18 Apr 2016 12:30:16 -0300 perf top: Use callchain_param.enabled instead of symbol_conf.use_callchain One more step in the direction of using just callchain_param for callchain parameters. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Milian Wolff Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-3b1o9kb2dc94zldz0klckti6@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-top.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index f0cfdf3..c130a11 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -917,15 +917,15 @@ out_err: return -1; } -static int perf_top__setup_sample_type(struct perf_top *top __maybe_unused) +static int callchain_param__setup_sample_type(struct callchain_param *callchain) { if (!sort__has_sym) { - if (symbol_conf.use_callchain) { + if (callchain->enabled) { ui__error("Selected -g but \"sym\" not present in --sort/-s."); return -EINVAL; } - } else if (callchain_param.mode != CHAIN_NONE) { - if (callchain_register_param(&callchain_param) < 0) { + } else if (callchain->mode != CHAIN_NONE) { + if (callchain_register_param(callchain) < 0) { ui__error("Can't register callchain params.\n"); return -EINVAL; } @@ -952,7 +952,7 @@ static int __cmd_top(struct perf_top *top) goto out_delete; } - ret = perf_top__setup_sample_type(top); + ret = callchain_param__setup_sample_type(&callchain_param); if (ret) goto out_delete; @@ -1311,7 +1311,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) top.sym_evsel = perf_evlist__first(top.evlist); - if (!symbol_conf.use_callchain) { + if (!callchain_param.enabled) { symbol_conf.cumulate_callchain = false; perf_hpp__cancel_cumulate(); }