cli: make `--clock-force-correlate` use `force-clock-class-origin-unix-epoch`

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

diff --git a/src/cli/babeltrace2-cfg-cli-args.c b/src/cli/babeltrace2-cfg-cli-args.c
index e7ee709a91f2b1504f7e0133870aff6905843121..fa1c1f54ee3ffb908e755ac31c258fce7a6e7dd8 100644 (file)
--- a/src/cli/babeltrace2-cfg-cli-args.c
+++ b/src/cli/babeltrace2-cfg-cli-args.c
@@ -2148,6 +2148,8 @@ void print_convert_usage(FILE *fp)
        fprintf(fp, "\n");
        fprintf(fp, "Implicit `source.ctf.fs` component options:\n");
        fprintf(fp, "\n");
+       fprintf(fp, "      --clock-force-correlate       Force the origin of all clocks\n");
+       fprintf(fp, "                                    to the Unix epoch\n");
        fprintf(fp, "      --clock-offset=SEC            Set clock offset to SEC seconds\n");
        fprintf(fp, "      --clock-offset-ns=NS          Set clock offset to NS ns\n");
        fprintf(fp, "\n");
@@ -2175,11 +2177,6 @@ void print_convert_usage(FILE *fp)
        fprintf(fp, "  -w, --output=PATH                 Write output text to PATH instead of\n");
        fprintf(fp, "                                    the standard output\n");
        fprintf(fp, "\n");
-       fprintf(fp, "Implicit `filter.utils.muxer` component options:\n");
-       fprintf(fp, "\n");
-       fprintf(fp, "      --clock-force-correlate       Assume that clocks are inherently\n");
-       fprintf(fp, "                                    correlated across traces\n");
-       fprintf(fp, "\n");
        fprintf(fp, "Implicit `filter.utils.trimmer` component options:\n");
        fprintf(fp, "\n");
        fprintf(fp, "  -b, --begin=BEGIN                 Set the beginning time of the conversion\n");
@@ -2981,6 +2978,9 @@ end:
  * Create `struct implicit_component_args` structures for each of the
  * source components we identified.  Add them to `component_args`.
  *
+ * `non_opts` is an array of the non-option arguments passed on the command
+ * line.
+ *
  * `non_opt_params` is an array where each element is an array of
  * strings containing all the arguments to `--params` that apply to the
  * non-option argument at the same index.  For example, if, for a
@@ -2996,6 +2996,7 @@ end:
 static
 int create_implicit_component_args_from_auto_discovered_sources(
                const struct auto_source_discovery *auto_disc,
+               const bt_value *non_opts,
                const bt_value *non_opt_params,
                const bt_value *non_opt_loglevels,
                GPtrArray *component_args)
@@ -3086,6 +3087,42 @@ int create_implicit_component_args_from_auto_discovered_sources(
                        }
                }
 
+               /*
+                * If single input and a src.ctf.fs component, provide the
+                * relative path from the path passed on the command line to the
+                * found trace.
+                */
+               if (bt_value_array_get_length(res->inputs) == 1 &&
+                               strcmp(res->plugin_name, "ctf") == 0 &&
+                               strcmp(res->source_cc_name, "fs") == 0) {
+                       const bt_value *orig_idx_value =
+                               bt_value_array_borrow_element_by_index(
+                                       res->original_input_indices, 0);
+                       uint64_t orig_idx = bt_value_integer_unsigned_get(orig_idx_value);
+                       const bt_value *non_opt_value =
+                               bt_value_array_borrow_element_by_index_const(
+                                       non_opts, orig_idx);
+                       const char *non_opt = bt_value_string_get(non_opt_value);
+                       const bt_value *input_value =
+                               bt_value_array_borrow_element_by_index_const(
+                                       res->inputs, 0);
+                       const char *input = bt_value_string_get(input_value);
+
+                       BT_ASSERT(orig_indices_count == 1);
+                       BT_ASSERT(g_str_has_prefix(input, non_opt));
+
+                       input += strlen(non_opt);
+
+                       while (G_IS_DIR_SEPARATOR(*input)) {
+                               input++;
+                       }
+
+                       if (strlen(input) > 0) {
+                               append_string_parameter_to_args(comp->extra_params,
+                                       "trace-name", input);
+                       }
+               }
+
                status = append_parameter_to_args(comp->extra_params, "inputs", res->inputs);
                if (status != 0) {
                        goto error;
@@ -3189,6 +3226,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
        const char *auto_source_discovery_restrict_plugin_name = NULL;
        const char *auto_source_discovery_restrict_component_class_name = NULL;
 
+       bool ctf_fs_source_force_clock_class_unix_epoch_origin = false;
        gchar *ctf_fs_source_clock_class_offset_arg = NULL;
        gchar *ctf_fs_source_clock_class_offset_ns_arg = NULL;
        *retcode = 0;
@@ -3661,9 +3699,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                        implicit_text_args.exists = true;
                        break;
                case OPT_CLOCK_FORCE_CORRELATE:
-                       append_implicit_component_param(
-                               &implicit_muxer_args,
-                               "assume-absolute-clock-classes", "yes");
+                       ctf_fs_source_force_clock_class_unix_epoch_origin = true;
                        break;
                case OPT_CLOCK_GMT:
                        append_implicit_component_param(
@@ -4064,7 +4100,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                        }
 
                        status = create_implicit_component_args_from_auto_discovered_sources(
-                               &auto_disc, non_opt_params, non_opt_loglevels,
+                               &auto_disc, non_opts, non_opt_params, non_opt_loglevels,
                                discovered_source_args);
                        if (status != 0) {
                                goto error;
@@ -4072,6 +4108,23 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                }
        }
 
+
+       /*
+        * If --clock-force-correlated was given, apply it to any src.ctf.fs
+        * component.
+        */
+       if (ctf_fs_source_force_clock_class_unix_epoch_origin) {
+               int n;
+
+               n = append_multiple_implicit_components_param(
+                       discovered_source_args, "source.ctf.fs", "force-clock-class-origin-unix-epoch",
+                       "yes");
+               if (n == 0) {
+                       BT_CLI_LOGE_APPEND_CAUSE("--clock-force-correlate specified, but no source.ctf.fs component instantiated.");
+                       goto error;
+               }
+       }
+
        /* If --clock-offset was given, apply it to any src.ctf.fs component. */
        if (ctf_fs_source_clock_class_offset_arg) {
                int n;