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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <YhQAt+iSkc2VcvEP@krava>
Date:   Mon, 21 Feb 2022 22:14:31 +0100
From:   Jiri Olsa <olsajiri@...il.com>
To:     Mahmoud Abumandour <ma.mandourr@...il.com>
Cc:     Ingo Molnar <mingo@...hat.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Arnaldo Carvalho de Melo <acme@...nel.org>,
        Mark Rutland <mark.rutland@....com>,
        Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
        Jiri Olsa <jolsa@...nel.org>,
        Namhyung Kim <namhyung@...nel.org>,
        linux-perf-users@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] perf data: don't mention --to-ctf if it's not supported

On Sun, Feb 20, 2022 at 01:39:52PM +0200, Mahmoud Abumandour wrote:
> From: Mahmoud Mandour <ma.mandourr@...il.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@...il.com>

Acked-by: Jiri Olsa <jolsa@...nel.org>

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
>