From: tip-bot for Taeung Song <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:perf/core] perf ftrace: Add ftrace.tracer config option
Date: Wed, 1 Feb 2017 06:43:58 -0800 [thread overview]
Message-ID: <tip-b05d1093987a78695766b71a2d723aa65b5c25c5@git.kernel.org> (raw)
In-Reply-To: <1485862711-20216-3-git-send-email-treeze.taeung@gmail.com>
Commit-ID: b05d1093987a78695766b71a2d723aa65b5c25c5
Gitweb: http://git.kernel.org/tip/b05d1093987a78695766b71a2d723aa65b5c25c5
Author: Taeung Song <treeze.taeung@gmail.com>
AuthorDate: Tue, 31 Jan 2017 20:38:29 +0900
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
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
<idle>-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 <treeze.taeung@gmail.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
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 <acme@redhat.com>
---
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)
next prev parent reply other threads:[~2017-02-01 14:44 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-31 11:38 [PATCH v2 0/4] Add ftrace config and refactor several parts Taeung Song
2017-01-31 11:38 ` [PATCH v2 1/4] perf tools: Create for_each_event macro for tracepoints iteration Taeung Song
2017-01-31 12:21 ` Arnaldo Carvalho de Melo
2017-01-31 12:23 ` Arnaldo Carvalho de Melo
2017-01-31 17:32 ` Steven Rostedt
2017-02-01 7:02 ` Taeung Song
2017-02-01 14:43 ` [tip:perf/core] " tip-bot for Taeung Song
2017-01-31 11:38 ` [PATCH v2 2/4] perf ftrace: Add ftrace.tracer config option Taeung Song
2017-01-31 12:46 ` Arnaldo Carvalho de Melo
2017-01-31 13:15 ` Arnaldo Carvalho de Melo
2017-02-01 7:27 ` Taeung Song
2017-02-01 14:43 ` tip-bot for Taeung Song [this message]
2017-01-31 11:38 ` [PATCH v2 3/4] perf tools: Check NULL after zalloc() and Use zfree() instead of free() in parse-events.c Taeung Song
2017-01-31 13:23 ` Arnaldo Carvalho de Melo
2017-02-01 8:04 ` Taeung Song
2017-01-31 11:38 ` [PATCH v2 4/4] perf tools: Increase index if perf_evsel__new_idx() succeeded Taeung Song
2017-01-31 13:25 ` Arnaldo Carvalho de Melo
2017-02-01 8:04 ` Taeung Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-b05d1093987a78695766b71a2d723aa65b5c25c5@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=treeze.taeung@gmail.com \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome