diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-07-05 01:39:18 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-07-05 04:30:21 -0400 |
commit | be9038859e56f729cc9d3b070a35fb8829a73696 (patch) | |
tree | e258cec23a938ba1d1a9a38119420171c52f31c0 /tools/perf | |
parent | 91b4eaea93f5be95f4477554399680a53aff2343 (diff) |
perf report: Use a modifiable string for default callchain options
If the user doesn't provide options to tune his callchain output
(ie: if he uses -c without arguments) then the default value passed
in the OPT_CALLBACK_DEFAULT() macro is used.
But it's parsed later by strtok() which will replace comma separators
to a zero. This may segfault as we are using a read-only string.
Use a modifiable one instead, and also fix the "100%" default
minimum threshold value by turning it into a 0 (output every callchains)
as it was intended in the origin.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <1246772361-9960-2-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/builtin-report.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 9f9575afab08..3db99fd99867 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c | |||
@@ -58,6 +58,8 @@ static char *parent_pattern = default_parent_pattern; | |||
58 | static regex_t parent_regex; | 58 | static regex_t parent_regex; |
59 | 59 | ||
60 | static int exclude_other = 1; | 60 | static int exclude_other = 1; |
61 | |||
62 | static char callchain_default_opt[] = "flat,0"; | ||
61 | static int callchain; | 63 | static int callchain; |
62 | static enum chain_mode callchain_mode; | 64 | static enum chain_mode callchain_mode; |
63 | static double callchain_min_percent = 0.0; | 65 | static double callchain_min_percent = 0.0; |
@@ -1871,7 +1873,7 @@ static const struct option options[] = { | |||
1871 | "Only display entries with parent-match"), | 1873 | "Only display entries with parent-match"), |
1872 | OPT_CALLBACK_DEFAULT('c', "callchain", NULL, "output_type,min_percent", | 1874 | OPT_CALLBACK_DEFAULT('c', "callchain", NULL, "output_type,min_percent", |
1873 | "Display callchains using output_type and min percent threshold. " | 1875 | "Display callchains using output_type and min percent threshold. " |
1874 | "Default: flat,0", &parse_callchain_opt, "flat,100"), | 1876 | "Default: flat,0", &parse_callchain_opt, callchain_default_opt), |
1875 | OPT_STRING('d', "dsos", &dso_list_str, "dso[,dso...]", | 1877 | OPT_STRING('d', "dsos", &dso_list_str, "dso[,dso...]", |
1876 | "only consider symbols in these dsos"), | 1878 | "only consider symbols in these dsos"), |
1877 | OPT_STRING('C', "comms", &comm_list_str, "comm[,comm...]", | 1879 | OPT_STRING('C', "comms", &comm_list_str, "comm[,comm...]", |