Commit 8c4c7016 authored by Mahmoud Mandour's avatar Mahmoud Mandour Committed by Arnaldo Carvalho de Melo
Browse files

perf data: Don't mention --to-ctf if it's not supported 



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: default avatarMahmoud Mandour <ma.mandourr@gmail.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220220113952.138280-1-ma.mandourr@gmail.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 65e7c963

tools/perf/builtin-data.c

+7 −0
Original line number Diff line number Diff line
@@ -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);