From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752644AbdI2UIi (ORCPT ); Fri, 29 Sep 2017 16:08:38 -0400 Received: from terminus.zytor.com ([65.50.211.136]:50169 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752486AbdI2UIg (ORCPT ); Fri, 29 Sep 2017 16:08:36 -0400 Date: Fri, 29 Sep 2017 13:05:08 -0700 From: tip-bot for Mengting Zhang Message-ID: Cc: wangnan0@huawei.com, acme@redhat.com, zhangmengting@huawei.com, mingo@kernel.org, tglx@linutronix.de, alexander.shishkin@linux.intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org, peterz@infradead.org, huawei.libin@huawei.com, jolsa@kernel.org, kjlx@templeofstupid.com, namhyung@kernel.org, ak@linux.intel.com, milian.wolff@kdab.com, yao.jin@linux.intel.com Reply-To: mingo@kernel.org, zhangmengting@huawei.com, acme@redhat.com, wangnan0@huawei.com, hpa@zytor.com, alexander.shishkin@linux.intel.com, tglx@linutronix.de, namhyung@kernel.org, kjlx@templeofstupid.com, huawei.libin@huawei.com, peterz@infradead.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, milian.wolff@kdab.com, yao.jin@linux.intel.com, ak@linux.intel.com In-Reply-To: <1506154694-39691-1-git-send-email-zhangmengting@huawei.com> References: <1506154694-39691-1-git-send-email-zhangmengting@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf report: Fix debug messages with --call-graph option Git-Commit-ID: 9789e7e93f2b892098d7684ac8131092aa617814 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: 9789e7e93f2b892098d7684ac8131092aa617814 Gitweb: https://git.kernel.org/tip/9789e7e93f2b892098d7684ac8131092aa617814 Author: Mengting Zhang AuthorDate: Sat, 23 Sep 2017 16:18:14 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 25 Sep 2017 12:20:12 -0300 perf report: Fix debug messages with --call-graph option With --call-graph option, perf report can display call chains using type, min percent threshold, optional print limit and order. And the default call-graph parameter is 'graph,0.5,caller,function,percent'. Before this patch, 'perf report --call-graph' shows incorrect debug messages as below: # perf report --call-graph Invalid callchain mode: 0.5 Invalid callchain order: 0.5 Invalid callchain sort key: 0.5 Invalid callchain config key: 0.5 Invalid callchain mode: caller Invalid callchain mode: function Invalid callchain order: function Invalid callchain mode: percent Invalid callchain order: percent Invalid callchain sort key: percent That is because in function __parse_callchain_report_opt(),each field of the call-graph parameter is passed to parse_callchain_{mode,order, sort_key,value} in turn until it meets the matching value. For example, the order field "caller" is passed to parse_callchain_mode() firstly and obviously it doesn't match any mode field. Therefore parse_callchain_mode() will shows the debug message "Invalid callchain mode: caller", which could confuse users. The patch fixes this issue by moving the warning out of the function parse_callchain_{mode,order,sort_key,value}. Signed-off-by: Mengting Zhang Acked-by: Jiri Olsa Tested-by: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: Andi Kleen Cc: Krister Johansen Cc: Li Bin Cc: Milian Wolff Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Cc: Yao Jin Link: http://lkml.kernel.org/r/1506154694-39691-1-git-send-email-zhangmengting@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/callchain.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index 510b513..be09d77 100644 --- a/tools/perf/util/callchain.c +++ b/tools/perf/util/callchain.c @@ -65,8 +65,6 @@ static int parse_callchain_mode(const char *value) callchain_param.mode = CHAIN_FOLDED; return 0; } - - pr_err("Invalid callchain mode: %s\n", value); return -1; } @@ -82,8 +80,6 @@ static int parse_callchain_order(const char *value) callchain_param.order_set = true; return 0; } - - pr_err("Invalid callchain order: %s\n", value); return -1; } @@ -105,8 +101,6 @@ static int parse_callchain_sort_key(const char *value) callchain_param.branch_callstack = 1; return 0; } - - pr_err("Invalid callchain sort key: %s\n", value); return -1; } @@ -124,8 +118,6 @@ static int parse_callchain_value(const char *value) callchain_param.value = CCVAL_COUNT; return 0; } - - pr_err("Invalid callchain config key: %s\n", value); return -1; } @@ -319,12 +311,27 @@ int perf_callchain_config(const char *var, const char *value) return ret; } - if (!strcmp(var, "print-type")) - return parse_callchain_mode(value); - if (!strcmp(var, "order")) - return parse_callchain_order(value); - if (!strcmp(var, "sort-key")) - return parse_callchain_sort_key(value); + if (!strcmp(var, "print-type")){ + int ret; + ret = parse_callchain_mode(value); + if (ret == -1) + pr_err("Invalid callchain mode: %s\n", value); + return ret; + } + if (!strcmp(var, "order")){ + int ret; + ret = parse_callchain_order(value); + if (ret == -1) + pr_err("Invalid callchain order: %s\n", value); + return ret; + } + if (!strcmp(var, "sort-key")){ + int ret; + ret = parse_callchain_sort_key(value); + if (ret == -1) + pr_err("Invalid callchain sort key: %s\n", value); + return ret; + } if (!strcmp(var, "threshold")) { callchain_param.min_percent = strtod(value, &endptr); if (value == endptr) {