Re: [PATCH] perf data: don't mention --to-ctf if it's not supported

[Arnaldo Carvalho de Melo <acme@kernel.org>]

Em Mon, Feb 21, 2022 at 10:14:31PM +0100, Jiri Olsa escreveu:
> On Sun, Feb 20, 2022 at 01:39:52PM +0200, Mahmoud Abumandour wrote:
> > From: Mahmoud Mandour <ma.mandourr@gmail.com>
> > 
> > The option `--to-ctf` is only available when perf has libbabeltrace
> > support. Hence, on error, we shouldn't state that user must include
> > `--to-ctf` unless it's supported.
> > 
> > The only user-visible change for this commit is that when `perf` is not
> > configured to support libbabeltrace, the user is only prompted to
> > provide the `--to-json` option instead of bothe `--to-json` and
> > `--to-ctf`.
> > 
> > Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
> 
> Acked-by: Jiri Olsa <jolsa@kernel.org>

Thanks, applied.

- Arnaldo

 
> thanks,
> jirka
> 
> > ---
> >  tools/perf/builtin-data.c | 7 +++++++
> >  1 file changed, 7 insertions(+)
> > 
> > diff --git a/tools/perf/builtin-data.c b/tools/perf/builtin-data.c
> > index b7f9dc85a407..c22d82d2a73c 100644
> > --- a/tools/perf/builtin-data.c
> > +++ b/tools/perf/builtin-data.c
> > @@ -62,10 +62,17 @@ static int cmd_data_convert(int argc, const char **argv)
> >  		pr_err("You cannot specify both --to-ctf and --to-json.\n");
> >  		return -1;
> >  	}
> > +#ifdef HAVE_LIBBABELTRACE_SUPPORT
> >  	if (!to_json && !to_ctf) {
> >  		pr_err("You must specify one of --to-ctf or --to-json.\n");
> >  		return -1;
> >  	}
> > +#else
> > +	if (!to_json) {
> > +		pr_err("You must specify --to-json.\n");
> > +	return -1;
> > +}
> > +#endif
> >  
> >  	if (to_json)
> >  		return bt_convert__perf2json(input_name, to_json, &opts);
> > -- 
> > 2.30.2
> > 

-- 

- Arnaldo