diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-10-05 16:05:35 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-10-05 16:59:43 -0400 |
commit | def02db0d662b0edd83f80e3c18f660fc414decb (patch) | |
tree | 504737e708e1e6c64aeabc1f08b6933c5d59f7b2 | |
parent | 035827e9f2bd71a280f4eb58c65811d377ab2217 (diff) |
perf callchain: Switch default to 'graph,0.5,caller'
Which is the most common default found in other similar tools.
Requested-by: Ingo Molnar <mingo@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Chandler Carruth <chandlerc@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://www.youtube.com/watch?v=nXaxk27zwlk
Link: http://lkml.kernel.org/n/tip-v8lq36aispvdwgxdmt9p9jd9@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | tools/perf/Documentation/perf-report.txt | 2 | ||||
-rw-r--r-- | tools/perf/builtin-report.c | 4 | ||||
-rw-r--r-- | tools/perf/util/util.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt index ce499035e6d8..e4fdeeb51123 100644 --- a/tools/perf/Documentation/perf-report.txt +++ b/tools/perf/Documentation/perf-report.txt | |||
@@ -192,7 +192,7 @@ OPTIONS | |||
192 | when available. Usually more convenient to use --branch-history | 192 | when available. Usually more convenient to use --branch-history |
193 | for this. | 193 | for this. |
194 | 194 | ||
195 | Default: fractal,0.5,callee,function. | 195 | Default: graph,0.5,caller |
196 | 196 | ||
197 | --children:: | 197 | --children:: |
198 | Accumulate callchain of children to parent entry so that then can | 198 | Accumulate callchain of children to parent entry so that then can |
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index b5623639f67d..3b23b25d1589 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c | |||
@@ -633,7 +633,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) | |||
633 | bool has_br_stack = false; | 633 | bool has_br_stack = false; |
634 | int branch_mode = -1; | 634 | int branch_mode = -1; |
635 | bool branch_call_mode = false; | 635 | bool branch_call_mode = false; |
636 | char callchain_default_opt[] = "fractal,0.5,callee"; | 636 | char callchain_default_opt[] = "graph,0.5,caller"; |
637 | const char * const report_usage[] = { | 637 | const char * const report_usage[] = { |
638 | "perf report [<options>]", | 638 | "perf report [<options>]", |
639 | NULL | 639 | NULL |
@@ -701,7 +701,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) | |||
701 | "Only display entries with parent-match"), | 701 | "Only display entries with parent-match"), |
702 | OPT_CALLBACK_DEFAULT('g', "call-graph", &report, "output_type,min_percent[,print_limit],call_order[,branch]", | 702 | OPT_CALLBACK_DEFAULT('g', "call-graph", &report, "output_type,min_percent[,print_limit],call_order[,branch]", |
703 | "Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit, callchain order, key (function or address), add branches. " | 703 | "Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit, callchain order, key (function or address), add branches. " |
704 | "Default: fractal,0.5,callee,function", &report_parse_callchain_opt, callchain_default_opt), | 704 | "Default: graph,0.5,caller", &report_parse_callchain_opt, callchain_default_opt), |
705 | OPT_BOOLEAN(0, "children", &symbol_conf.cumulate_callchain, | 705 | OPT_BOOLEAN(0, "children", &symbol_conf.cumulate_callchain, |
706 | "Accumulate callchains of children and show total overhead as well"), | 706 | "Accumulate callchains of children and show total overhead as well"), |
707 | OPT_INTEGER(0, "max-stack", &report.max_stack, | 707 | OPT_INTEGER(0, "max-stack", &report.max_stack, |
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index ce465b259e52..c1bf9ff210b0 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c | |||
@@ -17,9 +17,9 @@ | |||
17 | #include "callchain.h" | 17 | #include "callchain.h" |
18 | 18 | ||
19 | struct callchain_param callchain_param = { | 19 | struct callchain_param callchain_param = { |
20 | .mode = CHAIN_GRAPH_REL, | 20 | .mode = CHAIN_GRAPH_ABS, |
21 | .min_percent = 0.5, | 21 | .min_percent = 0.5, |
22 | .order = ORDER_CALLEE, | 22 | .order = ORDER_CALLER, |
23 | .key = CCKEY_FUNCTION | 23 | .key = CCKEY_FUNCTION |
24 | }; | 24 | }; |
25 | 25 | ||