From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752038AbdBAOo7 (ORCPT ); Wed, 1 Feb 2017 09:44:59 -0500 Received: from terminus.zytor.com ([65.50.211.136]:48508 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750863AbdBAOo4 (ORCPT ); Wed, 1 Feb 2017 09:44:56 -0500 Date: Wed, 1 Feb 2017 06:43:58 -0800 From: tip-bot for Taeung Song Message-ID: Cc: hpa@zytor.com, wangnan0@huawei.com, treeze.taeung@gmail.com, namhyung@kernel.org, tglx@linutronix.de, peterz@infradead.org, linux-kernel@vger.kernel.org, acme@redhat.com, mingo@kernel.org, jolsa@kernel.org Reply-To: hpa@zytor.com, namhyung@kernel.org, wangnan0@huawei.com, treeze.taeung@gmail.com, linux-kernel@vger.kernel.org, peterz@infradead.org, tglx@linutronix.de, jolsa@kernel.org, mingo@kernel.org, acme@redhat.com In-Reply-To: <1485862711-20216-3-git-send-email-treeze.taeung@gmail.com> References: <1485862711-20216-3-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf ftrace: Add ftrace.tracer config option Git-Commit-ID: b05d1093987a78695766b71a2d723aa65b5c25c5 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: b05d1093987a78695766b71a2d723aa65b5c25c5 Gitweb: http://git.kernel.org/tip/b05d1093987a78695766b71a2d723aa65b5c25c5 Author: Taeung Song AuthorDate: Tue, 31 Jan 2017 20:38:29 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 31 Jan 2017 16:20:09 -0300 perf ftrace: Add ftrace.tracer config option Currently 'perf ftrace' command allows selecting 'function_graph' or 'function', defaulting to 'function_graph'. Add ftrace.tracer config option to select the default tracer: # cat ~/.perfconfig [ftrace] tracer = function # perf ftrace usleep 123456 | head -10 <...>-14450 [002] d... 10089.284231: finish_task_switch <-__schedule <...>-14450 [002] .... 10089.284232: finish_wait <-pipe_wait <...>-14450 [002] .... 10089.284232: mutex_lock <-pipe_wait <...>-14450 [002] .... 10089.284232: _cond_resched <-mutex_lock Committer notes: Retesting it with invalid variables, invalid values for ftrace.tracer, and a valid one: # cat ~/.perfconfig [ftrace] trace = function # perf ftrace usleep 1 Error: wrong config key-value pair ftrace.trace=function # cat ~/.perfconfig [ftrace] tracer = functin # perf ftrace usleep 1 Please select "function_graph" (default) or "function" Error: wrong config key-value pair ftrace.tracer=functin # cat ~/.perfconfig [ftrace] tracer = function # perf ftrace usleep 1 | head -5 -0 [000] d... 3855.820847: switch_mm_irqs_off <-__schedule <...>-18550 [000] d... 3855.820849: finish_task_switch <-__schedule <...>-18550 [000] d... 3855.820851: smp_irq_work_interrupt <-irq_work_interrupt <...>-18550 [000] d... 3855.820851: irq_enter <-smp_irq_work_interrupt <...>-18550 [000] d... 3855.820851: rcu_irq_enter <-irq_enter # Signed-off-by: Taeung Song Tested-by: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1485862711-20216-3-git-send-email-treeze.taeung@gmail.com [ Added missign space in error message, changed the logic to make it more compact and less error prone ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-ftrace.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c index 414444d..c3e6436 100644 --- a/tools/perf/builtin-ftrace.c +++ b/tools/perf/builtin-ftrace.c @@ -17,6 +17,7 @@ #include "evlist.h" #include "target.h" #include "thread_map.h" +#include "util/config.h" #define DEFAULT_TRACER "function_graph" @@ -198,6 +199,26 @@ out: return done ? 0 : -1; } +static int perf_ftrace_config(const char *var, const char *value, void *cb) +{ + struct perf_ftrace *ftrace = cb; + + if (prefixcmp(var, "ftrace.")) + return 0; + + if (strcmp(var, "ftrace.tracer")) + return -1; + + if (!strcmp(value, "function_graph") || + !strcmp(value, "function")) { + ftrace->tracer = value; + return 0; + } + + pr_err("Please select \"function_graph\" (default) or \"function\"\n"); + return -1; +} + int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused) { int ret; @@ -218,6 +239,10 @@ int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused) OPT_END() }; + ret = perf_config(perf_ftrace_config, &ftrace); + if (ret < 0) + return -1; + argc = parse_options(argc, argv, ftrace_options, ftrace_usage, PARSE_OPT_STOP_AT_NON_OPTION); if (!argc)