Fix: bt_component_create is not hidden

[babeltrace.git] / cli / babeltrace-cfg-cli-args.c

diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace-cfg-cli-args.c
index cd8fb1892d831656017865e400f0918c941c715a..9c6db059e01f1411984aaaf05044d7312c356989 100644 (file)
--- a/cli/babeltrace-cfg-cli-args.c
+++ b/cli/babeltrace-cfg-cli-args.c
@@ -22,6 +22,9 @@
  * SOFTWARE.
  */
 
+#define BT_LOG_TAG "CLI-CFG-CLI-ARGS"
+#include "logging.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
@@ -39,9 +42,6 @@
 #include "babeltrace-cfg-cli-args.h"
 #include "babeltrace-cfg-cli-args-connect.h"
 
-#define BT_LOG_TAG "CLI-CFG-ARGS"
-#include "logging.h"
-
 /*
  * Error printf() macro which prepends "Error: " the first time it's
  * called. This gives a nicer feel than having a bunch of error prefixes
@@ -1410,7 +1410,7 @@ int append_env_var_plugin_paths(struct bt_value *plugin_paths)
        const char *envvar;
 
        if (bt_common_is_setuid_setgid()) {
-               printf_debug("Skipping non-system plugin paths for setuid/setgid binary\n");
+               BT_LOGI_STR("Skipping non-system plugin paths for setuid/setgid binary.");
                goto end;
        }
 
@@ -1437,7 +1437,7 @@ int append_home_and_system_plugin_paths(struct bt_value *plugin_paths,
 
        if (!omit_home_plugin_path) {
                if (bt_common_is_setuid_setgid()) {
-                       printf_debug("Skipping non-system plugin paths for setuid/setgid binary\n");
+                       BT_LOGI_STR("Skipping non-system plugin paths for setuid/setgid binary.");
                } else {
                        char *home_plugin_dir =
                                bt_common_get_home_plugin_path();
@@ -1703,7 +1703,7 @@ int bt_config_append_plugin_paths_check_setuid_setgid(
        int ret = 0;
 
        if (bt_common_is_setuid_setgid()) {
-               printf_debug("Skipping non-system plugin paths for setuid/setgid binary\n");
+               BT_LOGI_STR("Skipping non-system plugin paths for setuid/setgid binary.");
                goto end;
        }
 
@@ -2868,7 +2868,7 @@ void print_convert_usage(FILE *fp)
        fprintf(fp, "                                    `text`:\n");
        fprintf(fp, "                                      Create an implicit `sink.text.pretty`\n");
        fprintf(fp, "                                      component\n");
-       fprintf(fp, "                                    `text`:\n");
+       fprintf(fp, "                                    `ctf`:\n");
        fprintf(fp, "                                      Create an implicit `sink.ctf.fs`\n");
        fprintf(fp, "                                      component\n");
        fprintf(fp, "                                    `dummy`:\n");
@@ -3596,6 +3596,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
        bool got_output_format_opt = false;
        bool trimmer_has_begin = false;
        bool trimmer_has_end = false;
+       bool stream_intersection_mode = false;
        GString *cur_name = NULL;
        GString *cur_name_prefix = NULL;
        const char *leftover = NULL;
@@ -4093,17 +4094,21 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                        break;
                case OPT_CLOCK_FORCE_CORRELATE:
                        append_implicit_component_param(
-                               &implicit_muxer_args, "assume-absolute-clock-classes", "yes");
+                               &implicit_muxer_args,
+                               "assume-absolute-clock-classes", "yes");
                        break;
                case OPT_CLOCK_GMT:
                        append_implicit_component_param(
                                &implicit_text_args, "clock-gmt", "yes");
+                       append_implicit_component_param(
+                               &implicit_trimmer_args, "clock-gmt", "yes");
                        implicit_text_args.exists = true;
                        break;
                case OPT_CLOCK_OFFSET:
                        base_implicit_ctf_input_args.exists = true;
-                       ret = append_implicit_component_extra_param(
-                               &base_implicit_ctf_input_args, "clock-offset-cycles", arg);
+                       append_implicit_component_param(
+                                       &implicit_muxer_args,
+                                       "clock-class-offset-s", arg);
                        if (ret) {
                                goto error;
                        }
@@ -4112,7 +4117,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                        base_implicit_ctf_input_args.exists = true;
                        ret = append_implicit_component_extra_param(
                                &base_implicit_ctf_input_args,
-                               "clock-offset-ns", arg);
+                               "clock-class-offset-ns", arg);
                        if (ret) {
                                goto error;
                        }
@@ -4265,10 +4270,11 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                        print_run_args_0 = true;
                        break;
                case OPT_STREAM_INTERSECTION:
-                       append_implicit_component_param(
-                               &base_implicit_ctf_input_args,
-                               "stream-intersection", "yes");
-                       base_implicit_ctf_input_args.exists = true;
+                       /*
+                        * Applies to all traces implementing the trace-info
+                        * query.
+                        */
+                       stream_intersection_mode = true;
                        break;
                case OPT_VERBOSE:
                        if (*log_level != 'V' && *log_level != 'D') {
@@ -4704,6 +4710,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                goto error;
        }
 
+       cfg->cmd_data.run.stream_intersection_mode = stream_intersection_mode;
        goto end;
 
 error: