Re: [PATCH 2/8] perf, tools: Add --branch-history option to report

[Jiri Olsa <jolsa@redhat.com>]

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

SNIP

> @@ -564,7 +575,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)
>  	struct perf_session *session;
>  	struct stat st;
>  	bool has_br_stack = false;
> -	int branch_mode = -1;
> +	int branch_mode = -1, branch_call_mode = -1;
>  	int ret = -1;
>  	char callchain_default_opt[] = "fractal,0.5,callee";
>  	const char * const report_usage[] = {
> @@ -675,7 +686,11 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)
>  	OPT_BOOLEAN(0, "group", &symbol_conf.event_group,
>  		    "Show event group information together"),
>  	OPT_CALLBACK_NOOPT('b', "branch-stack", &branch_mode, "",
> -		    "use branch records for histogram filling", parse_branch_mode),
> +		    "use branch records for per branch histogram filling",
> +		    parse_branch_mode),
> +	OPT_CALLBACK_NOOPT(0, "branch-history", &branch_call_mode, "",
> +		    "add last branch records to call history",
> +		    parse_branch_call_mode),

I think we've been through this before, but why's not
branch_mode and branch_call_mode bools? sry if we already
sorted this out, but I couldnt find it

>  	OPT_STRING(0, "objdump", &objdump_path, "path",
>  		   "objdump binary to use for disassembly and annotations"),
>  	OPT_BOOLEAN(0, "demangle", &symbol_conf.demangle,
> @@ -732,10 +747,20 @@ repeat:
>  	has_br_stack = perf_header__has_feat(&session->header,
>  					     HEADER_BRANCH_STACK);
>  
> -	if ((branch_mode == -1 && has_br_stack) || branch_mode == 1) {
> +	if (((branch_mode == -1 && has_br_stack) || branch_mode == 1) &&
> +	    branch_call_mode == -1) {
>  		sort__mode = SORT_MODE__BRANCH;
>  		symbol_conf.cumulate_callchain = false;
>  	}
> +	if (branch_call_mode != -1) {
> +		callchain_param.branch_callstack = 1;
> +		callchain_param.key = CCKEY_ADDRESS;
> +		symbol_conf.use_callchain = true;
> +		callchain_register_param(&callchain_param);
> +		if (sort_order == default_sort_order)
> +			sort_order = "srcline,symbol,dso";
> +		branch_mode = 0;
> +	}

also why set branch_mode if there's no further usage of it?

thanks,
jirka