diff options
author | Taeung Song <treeze.taeung@gmail.com> | 2017-01-31 06:38:29 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-01-31 14:20:09 -0500 |
commit | b05d1093987a78695766b71a2d723aa65b5c25c5 (patch) | |
tree | b0c48fedc93e8e8339469cc7806fc8efb597d3f4 /tools/perf | |
parent | 43d41deb71fe1850264e5dd8109211683954ea14 (diff) |
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>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/builtin-ftrace.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c index 414444d0e919..c3e643666c72 100644 --- a/tools/perf/builtin-ftrace.c +++ b/tools/perf/builtin-ftrace.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include "evlist.h" | 17 | #include "evlist.h" |
18 | #include "target.h" | 18 | #include "target.h" |
19 | #include "thread_map.h" | 19 | #include "thread_map.h" |
20 | #include "util/config.h" | ||
20 | 21 | ||
21 | 22 | ||
22 | #define DEFAULT_TRACER "function_graph" | 23 | #define DEFAULT_TRACER "function_graph" |
@@ -198,6 +199,26 @@ out: | |||
198 | return done ? 0 : -1; | 199 | return done ? 0 : -1; |
199 | } | 200 | } |
200 | 201 | ||
202 | static int perf_ftrace_config(const char *var, const char *value, void *cb) | ||
203 | { | ||
204 | struct perf_ftrace *ftrace = cb; | ||
205 | |||
206 | if (prefixcmp(var, "ftrace.")) | ||
207 | return 0; | ||
208 | |||
209 | if (strcmp(var, "ftrace.tracer")) | ||
210 | return -1; | ||
211 | |||
212 | if (!strcmp(value, "function_graph") || | ||
213 | !strcmp(value, "function")) { | ||
214 | ftrace->tracer = value; | ||
215 | return 0; | ||
216 | } | ||
217 | |||
218 | pr_err("Please select \"function_graph\" (default) or \"function\"\n"); | ||
219 | return -1; | ||
220 | } | ||
221 | |||
201 | int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused) | 222 | int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused) |
202 | { | 223 | { |
203 | int ret; | 224 | int ret; |
@@ -218,6 +239,10 @@ int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused) | |||
218 | OPT_END() | 239 | OPT_END() |
219 | }; | 240 | }; |
220 | 241 | ||
242 | ret = perf_config(perf_ftrace_config, &ftrace); | ||
243 | if (ret < 0) | ||
244 | return -1; | ||
245 | |||
221 | argc = parse_options(argc, argv, ftrace_options, ftrace_usage, | 246 | argc = parse_options(argc, argv, ftrace_options, ftrace_usage, |
222 | PARSE_OPT_STOP_AT_NON_OPTION); | 247 | PARSE_OPT_STOP_AT_NON_OPTION); |
223 | if (!argc) | 248 | if (!argc) |