diff options
Diffstat (limited to 'tools/perf/builtin-data.c')
| -rw-r--r-- | tools/perf/builtin-data.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tools/perf/builtin-data.c b/tools/perf/builtin-data.c index b7f9dc85a407..ce51cbf6dc97 100644 --- a/tools/perf/builtin-data.c +++ b/tools/perf/builtin-data.c @@ -3,10 +3,10 @@ #include <stdio.h> #include <string.h> #include "builtin.h" -#include "perf.h" #include "debug.h" #include <subcmd/parse-options.h> #include "data-convert.h" +#include "util/util.h" typedef int (*data_cmd_fn_t)(int argc, const char **argv); @@ -62,21 +62,29 @@ 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); if (to_ctf) { -#ifdef HAVE_LIBBABELTRACE_SUPPORT +#if defined(HAVE_LIBBABELTRACE_SUPPORT) && defined(HAVE_LIBTRACEEVENT) return bt_convert__perf2ctf(input_name, to_ctf, &opts); #else pr_err("The libbabeltrace support is not compiled in. perf should be " "compiled with environment variables LIBBABELTRACE=1 and " - "LIBBABELTRACE_DIR=/path/to/libbabeltrace/\n"); + "LIBBABELTRACE_DIR=/path/to/libbabeltrace/.\n" + "Check also if libbtraceevent devel files are available.\n"); return -1; #endif } |