> > diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
> > index 1a2d7fc..e6d8ed0 100644
> > --- a/tools/perf/builtin-report.c
> > +++ b/tools/perf/builtin-report.c
> > @@ -315,8 +315,9 @@ static int report__setup_sample_type(struct report *rep)
> > return -EINVAL;
> > }
> > if (symbol_conf.use_callchain) {
> > - ui__error("Selected -g but no callchain data. Did "
> > - "you call 'perf record' without -g?\n");
> > + ui__error("Selected -g or --branch-history but no "
> > + "callchain data. Did\n"
>
> An unwanted newline in the message.
It was intentional to make it fit onto a 80 column terminal
>
>
> > + "you call 'perf record' without -g?\n");
> > return -1;
> > }
> > } else if (!rep->dont_use_callchains &&
> > @@ -631,6 +632,16 @@ parse_branch_mode(const struct option *opt
> > __maybe_unused,
> > }
> >
> > static int
> > +parse_branch_call_mode(const struct option *opt __maybe_unused,
> > + const char *str __maybe_unused, int unset)
> > +{
> > + int *branch_mode = opt->value;
> > +
> > + *branch_mode = !unset;
> > + return 0;
> > +}
> > +
> > +static int
> > parse_percent_limit(const struct option *opt, const char *str,
> > int unset __maybe_unused)
> > {
> > @@ -645,7 +656,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[] = {
> > @@ -754,7 +765,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),
>
> Looks like it can be a boolean option, or at least can share
> parse_branch_mode() callback.
No it can't. It's a tristate.
>
>
> > OPT_STRING(0, "objdump", &objdump_path, "path",
> > "objdump binary to use for disassembly and annotations"),
> > OPT_BOOLEAN(0, "demangle", &symbol_conf.demangle,
> > @@ -804,8 +819,16 @@ repeat:
> > has_br_stack = perf_header__has_feat(&session->header,
> > HEADER_BRANCH_STACK);
> >
> > - if (branch_mode == -1 && has_br_stack)
> > + if (branch_mode == -1 && has_br_stack && branch_call_mode == -1)
> > sort__mode = SORT_MODE__BRANCH;
> > + if (branch_call_mode != -1) {
>
> s/-1/1/ ?
-1 means not specified by the user.
-Andi
--
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/
