On Fri, Sep 26, 2014 at 04:37:09PM -0700, Andi Kleen wrote:

SNIP

>       OPT_BOOLEAN('x', "exclude-other", &symbol_conf.exclude_other,
>                   "Only display entries with parent-match"),
> -     OPT_CALLBACK_DEFAULT('g', "call-graph", &report, 
> "output_type,min_percent[,print_limit],call_order",
> -                  "Display callchains using output_type (graph, flat, 
> fractal, or none) , min percent threshold, optional print limit, callchain 
> order, key (function or address). "
> +     OPT_CALLBACK_DEFAULT('g', "call-graph", &report, 
> "output_type,min_percent[,print_limit],call_order[,branch]",
> +                  "Display callchains using output_type (graph, flat, 
> fractal, or none) , min percent threshold, optional print limit, callchain 
> order, key (function or address), add branches. "
>                    "Default: fractal,0.5,callee,function", 
> &report_parse_callchain_opt, callchain_default_opt),
>       OPT_BOOLEAN(0, "children", &symbol_conf.cumulate_callchain,
>                   "Accumulate callchains of children and show total overhead 
> as well"),
> diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
> index 08f0fbf..265457c 100644
> --- a/tools/perf/util/callchain.c
> +++ b/tools/perf/util/callchain.c
> @@ -61,6 +61,8 @@ parse_callchain_report_opt(const char *arg)
>                       callchain_param.key = CCKEY_FUNCTION;
>               else if (!strncmp(tok, "address", strlen(tok)))
>                       callchain_param.key = CCKEY_ADDRESS;
> +             else if (!strncmp(tok, "branch", strlen(tok)))
> +                     callchain_param.branch_callstack = 1;

this needs to be rebased to latest Namhyung's changes
which got in..

could you please rebase on Arnaldo's perf/core?

jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to