Skip to contentSkip to conversation

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

PATCH Applied Mahmoud Abumandour 3 participants 3 messages Feb 20, 2022 – Feb 23, 2022 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf data: don't mention --to-ctf if it's not supported

From: Mahmoud Mandour <[email protected]>

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.

---
 tools/perf/builtin-data.c | 7 +++++++
 1 file changed, 7 insertions(+)
tools/perf/builtin-data.c +7 -0
index b7f9dc85a407..c22d82d2a73c 100644
@@ -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);
Signature · 1 line
2.30.2
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Mahmoud Abumandour

From: Mahmoud Mandour <[email protected]>

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.

Quoted 6 lines

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.

thanks,
jirka

Quoted 29 lines
---
 tools/perf/builtin-data.c | 7 +++++++
 1 file changed, 7 insertions(+)
tools/perf/builtin-data.c +7 -0
index b7f9dc85a407..c22d82d2a73c 100644
@@ -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);
Signature · 1 line
2.30.2
maintainer Applied
#2 lore raw

Em Mon, Feb 21, 2022 at 10:14:31PM +0100, Jiri Olsa escreveu:

Quoted 7 lines · Mahmoud Abumandour
Quoted 6 lines

From: Mahmoud Mandour <[email protected]>

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.

Quoted 8 lines
Quoted 6 lines

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.

Thanks, applied.

- Arnaldo

Quoted 32 lines

thanks,
jirka

Quoted 29 lines
---
 tools/perf/builtin-data.c | 7 +++++++
 1 file changed, 7 insertions(+)
tools/perf/builtin-data.c +7 -0
index b7f9dc85a407..c22d82d2a73c 100644
@@ -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);
Signature · 1 line
2.30.2
Signature · 1 line
- Arnaldo