Rename "ignore-absolute" parameter to "assume-absolute-clock-classes"

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace-cfg-cli-args.c
index 195c891c0b514ebca801dfd93a276bd2a5fec156..a1eb78b5f00de03d5b0dd474e082ca97217418d5 100644 (file)
--- a/cli/babeltrace-cfg-cli-args.c
+++ b/cli/babeltrace-cfg-cli-args.c
@@ -4066,7 +4066,7 @@ 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, "ignore-absolute", "yes");
+                               &implicit_muxer_args, "assume-absolute-clock-classes", "yes");
                        break;
                case OPT_CLOCK_GMT:
                        append_implicit_component_param(

diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c
index 533ccfaa5f937b4a5341b4b66b8d84b8134caf1d..a148ca41cbff6cf551c1ba491605b76814ee633a 100644 (file)
--- a/plugins/utils/muxer/muxer.c
+++ b/plugins/utils/muxer/muxer.c
@@ -43,7 +43,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#define IGNORE_ABSOLUTE_PARAM_NAME     "ignore-absolute"
+#define ASSUME_ABSOLUTE_CLOCK_CLASSES_PARAM_NAME       "assume-absolute-clock-classes"
 
 struct muxer_comp {
        /* Array of struct bt_private_notification_iterator * (weak refs) */
@@ -225,8 +225,8 @@ struct bt_value *get_default_params(void)
                goto error;
        }
 
-       ret = bt_value_map_insert_bool(params, IGNORE_ABSOLUTE_PARAM_NAME,
-               false);
+       ret = bt_value_map_insert_bool(params,
+               ASSUME_ABSOLUTE_CLOCK_CLASSES_PARAM_NAME, false);
        if (ret) {
                goto error;
        }
@@ -260,7 +260,7 @@ int configure_muxer_comp(struct muxer_comp *muxer_comp, struct bt_value *params)
        }
 
        ignore_absolute = bt_value_map_get(real_params,
-               IGNORE_ABSOLUTE_PARAM_NAME);
+               ASSUME_ABSOLUTE_CLOCK_CLASSES_PARAM_NAME);
        if (!bt_value_is_bool(ignore_absolute)) {
                goto error;
        }