Commit be903885 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar

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: default avatarFrederic 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: default avatarIngo Molnar <mingo@elte.hu>
parent 91b4eaea
...@@ -58,6 +58,8 @@ static char *parent_pattern = default_parent_pattern; ...@@ -58,6 +58,8 @@ static char *parent_pattern = default_parent_pattern;
static regex_t parent_regex; static regex_t parent_regex;
static int exclude_other = 1; static int exclude_other = 1;
static char callchain_default_opt[] = "flat,0";
static int callchain; static int callchain;
static enum chain_mode callchain_mode; static enum chain_mode callchain_mode;
static double callchain_min_percent = 0.0; static double callchain_min_percent = 0.0;
...@@ -1871,7 +1873,7 @@ static const struct option options[] = { ...@@ -1871,7 +1873,7 @@ static const struct option options[] = {
"Only display entries with parent-match"), "Only display entries with parent-match"),
OPT_CALLBACK_DEFAULT('c', "callchain", NULL, "output_type,min_percent", OPT_CALLBACK_DEFAULT('c', "callchain", NULL, "output_type,min_percent",
"Display callchains using output_type and min percent threshold. " "Display callchains using output_type and min percent threshold. "
"Default: flat,0", &parse_callchain_opt, "flat,100"), "Default: flat,0", &parse_callchain_opt, callchain_default_opt),
OPT_STRING('d', "dsos", &dso_list_str, "dso[,dso...]", OPT_STRING('d', "dsos", &dso_list_str, "dso[,dso...]",
"only consider symbols in these dsos"), "only consider symbols in these dsos"),
OPT_STRING('C', "comms", &comm_list_str, "comm[,comm...]", OPT_STRING('C', "comms", &comm_list_str, "comm[,comm...]",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment