sink.text.details: adapt to latest libbabeltrace2 API

This patch makes a `sink.text.details` component write the details of
the following MIP 1 features:

Clock class:
    • Namespace
    • UID
    • Precision if unknown
    • Accuracy
    • Custom origin (namespace, name, and UID)

Stream class:
    • UID

Event class:
    • UID

Bit array field class:
    • Flags (sorted, like enumeration field class mappings)

Trace:
    • Namespace
    • UID

The clock class term "offset from origin" is more accurate and modern
than "offset", therefore I'm changing this too and updating existing
expectation files accordingly.

Also, what used to be

    Origin is Unix epoch: Yes

with MIP 0 is now the same for any MIP:

    Origin: Unix epoch

When the origin is unknown, whatever the MIP version, there's no origin
line (like most missing/empty properties of `sink.text.details`).

Here's a hypothetical MIP-1 clock class output example:

    Default clock class:
      Namespace: lttng.org,2009
      Name: monotonic
      UID: boot-id:7d19f00b-f1c7-49ea-a0a1-5f1a6a062a29
      User attributes:
        lttng.org,2009:
          tag: provigo
          original-index: 4
      Description: Monotonic Clock
      Frequency (Hz): 1,000,000,000
      Precision (cycles): 0
      Accuracy (cycles): 1000
      Offset from origin (s): 1,564,079,206
      Offset from origin (cycles): 484,157,338
      Origin:
        Namespace: quebec.ca,2017
        Name: referendum
        UID: 1995

The component only writes UIDs when the `with-uid` parameter is true
(the default). This is analogous to the `with-uuid` parameter. You may
specify both `with-uuid` and `with-uid` parameters: the former only
applies under MIP 0 and the latter under MIP 1.

Also changing some tests which set `with-uuid` to false to also set
`with-uid` to false, should they work under MIP 1.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I2411acb49a878e2eb135af86bc9f618cfd284987
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12757

diff --git a/src/plugins/text/details/details.c b/src/plugins/text/details/details.c
index 65ad9b7b1350a002c85045431554991df09ab633..a884e6bc0e0849e39089c23a760255e50fa08005 100644 (file)
--- a/src/plugins/text/details/details.c
+++ b/src/plugins/text/details/details.c
@@ -29,6 +29,7 @@
 #define WITH_STREAM_CLASS_NAMESPACE_PARAM_NAME "with-stream-class-namespace"
 #define WITH_STREAM_NAME_PARAM_NAME "with-stream-name"
 #define WITH_UUID_PARAM_NAME "with-uuid"
+#define WITH_UID_PARAM_NAME "with-uid"
 #define COMPACT_PARAM_NAME "compact"
 
 bt_component_class_get_supported_mip_versions_method_status
@@ -237,6 +238,7 @@ static const struct bt_param_validation_map_value_entry_descr details_params[] =
        { WITH_STREAM_CLASS_NAME_PARAM_NAME, BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { .type = BT_VALUE_TYPE_BOOL } },
        { WITH_STREAM_NAME_PARAM_NAME, BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { .type = BT_VALUE_TYPE_BOOL } },
        { WITH_UUID_PARAM_NAME, BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { .type = BT_VALUE_TYPE_BOOL } },
+       { WITH_UID_PARAM_NAME, BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_OPTIONAL, { .type = BT_VALUE_TYPE_BOOL } },
        BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_END
 };
 
@@ -317,6 +319,10 @@ bt_component_class_initialize_method_status configure_details_comp(
        configure_bool_opt(params, WITH_UUID_PARAM_NAME, true,
                &details_comp->cfg.with_uuid);
 
+       /* With UID? */
+       configure_bool_opt(params, WITH_UID_PARAM_NAME, true,
+                    &details_comp->cfg.with_uid);
+
        status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
        goto end;
 
@@ -344,6 +350,7 @@ void log_configuration(bt_self_component_sink *comp,
                details_comp->cfg.with_stream_class_name);
        BT_COMP_LOGI("  With stream name: %d", details_comp->cfg.with_stream_name);
        BT_COMP_LOGI("  With UUID: %d", details_comp->cfg.with_uuid);
+       BT_COMP_LOGI("  With UID: %d", details_comp->cfg.with_uid);
 }
 
 bt_component_class_initialize_method_status details_init(

diff --git a/src/plugins/text/details/details.h b/src/plugins/text/details/details.h
index 853ed6b3106ab2c622a5ef2b6607e33052328697..8d2ebc405a5e264ca73f606fb4df7b34cddfcbed 100644 (file)
--- a/src/plugins/text/details/details.h
+++ b/src/plugins/text/details/details.h
@@ -99,6 +99,9 @@ struct details_comp {
 
                /* Write UUID */
                bool with_uuid;
+
+               /* Write UID */
+               bool with_uid;
        } cfg;
 
        /*

diff --git a/src/plugins/text/details/write.c b/src/plugins/text/details/write.c
index e1a736b1128ba175fdc9b7ffb555926eefda8b6c..f1c6203a3ec7e3c70a1e22242e6bedd1db95815d 100644 (file)
--- a/src/plugins/text/details/write.c
+++ b/src/plugins/text/details/write.c
@@ -554,7 +554,7 @@ struct int_range {
        } upper;
 };
 
-struct enum_field_class_mapping {
+struct field_class_mapping_or_flag {
        /* Weak */
        const char *label;
 
@@ -563,8 +563,9 @@ struct enum_field_class_mapping {
 };
 
 static
-gint compare_enum_field_class_mappings(struct enum_field_class_mapping **a,
-               struct enum_field_class_mapping **b)
+gint compare_field_class_mappings_or_flags(
+               struct field_class_mapping_or_flag **a,
+               struct field_class_mapping_or_flag **b)
 {
        return strcmp((*a)->label, (*b)->label);
 }
@@ -659,14 +660,15 @@ end:
 }
 
 static
-void destroy_enum_field_class_mapping(struct enum_field_class_mapping *mapping)
+void destroy_field_class_mapping_or_flag(
+               struct field_class_mapping_or_flag *mapping_or_flag)
 {
-       if (mapping->ranges) {
-               g_array_free(mapping->ranges, TRUE);
-               mapping->ranges = NULL;
+       if (mapping_or_flag->ranges) {
+               g_array_free(mapping_or_flag->ranges, TRUE);
+               mapping_or_flag->ranges = NULL;
        }
 
-       g_free(mapping);
+       g_free(mapping_or_flag);
 }
 
 static
@@ -711,7 +713,7 @@ void write_enum_field_class_mappings(struct details_write_ctx *ctx,
                BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION;
 
        mappings = g_ptr_array_new_with_free_func(
-               (GDestroyNotify) destroy_enum_field_class_mapping);
+               (GDestroyNotify) destroy_field_class_mapping_or_flag);
        BT_ASSERT_DBG(mappings);
 
        /*
@@ -721,8 +723,8 @@ void write_enum_field_class_mappings(struct details_write_ctx *ctx,
        for (i = 0; i < bt_field_class_enumeration_get_mapping_count(fc); i++) {
                const void *fc_mapping;
                const void *fc_range_set;
-               struct enum_field_class_mapping *mapping = g_new0(
-                       struct enum_field_class_mapping, 1);
+               struct field_class_mapping_or_flag *mapping = g_new0(
+                       struct field_class_mapping_or_flag, 1);
 
                BT_ASSERT_DBG(mapping);
 
@@ -749,11 +751,11 @@ void write_enum_field_class_mappings(struct details_write_ctx *ctx,
 
        /* Sort mappings (ranges are already sorted within mappings) */
        g_ptr_array_sort(mappings,
-               (GCompareFunc) compare_enum_field_class_mappings);
+               (GCompareFunc) compare_field_class_mappings_or_flags);
 
        /* Write mappings */
        for (i = 0; i < mappings->len; i++) {
-               struct enum_field_class_mapping *mapping = mappings->pdata[i];
+               struct field_class_mapping_or_flag *mapping = mappings->pdata[i];
 
                write_nl(ctx);
                write_prop_name_line(ctx, mapping->label);
@@ -769,6 +771,59 @@ void write_enum_field_class_mappings(struct details_write_ctx *ctx,
        g_ptr_array_free(mappings, TRUE);
 }
 
+static
+void write_bit_array_field_class_flags(struct details_write_ctx *ctx,
+               const bt_field_class *fc)
+{
+       GPtrArray *flags;
+       uint64_t i;
+       uint64_t range_i;
+
+       flags = g_ptr_array_new_with_free_func(
+               (GDestroyNotify) destroy_field_class_mapping_or_flag);
+       BT_ASSERT_DBG(flags);
+
+       /*
+        * Copy field class's flags to our own arrays and structures to
+        * sort them.
+        */
+       for (i = 0; i < bt_field_class_bit_array_get_flag_count(fc); i++) {
+               const bt_field_class_bit_array_flag *fc_flag;
+               struct field_class_mapping_or_flag *flag = g_new0(
+                       struct field_class_mapping_or_flag, 1);
+
+               BT_ASSERT_DBG(flag);
+               fc_flag = bt_field_class_bit_array_borrow_flag_by_index_const(
+                       fc, i);
+               flag->label = bt_field_class_bit_array_flag_get_label(fc_flag);
+               flag->ranges = range_set_to_int_ranges(
+                       bt_field_class_bit_array_flag_borrow_index_ranges_const(
+                               fc_flag), false);
+               BT_ASSERT_DBG(flag->ranges);
+               g_ptr_array_add(flags, flag);
+       }
+
+       /* Sort flags (ranges are already sorted within flags) */
+       g_ptr_array_sort(flags,
+               (GCompareFunc) compare_field_class_mappings_or_flags);
+
+       /* Write mappings */
+       for (i = 0; i < flags->len; i++) {
+               struct field_class_mapping_or_flag *flag = flags->pdata[i];
+
+               write_nl(ctx);
+               write_prop_name_line(ctx, flag->label);
+
+               for (range_i = 0; range_i < flag->ranges->len; range_i++) {
+                       write_sp(ctx);
+                       write_int_range(ctx,
+                               int_range_at(flag->ranges, range_i), false);
+               }
+       }
+
+       g_ptr_array_free(flags, TRUE);
+}
+
 static const char *PACKET_CONTEXT_STR = "Packet context";
 static const char *EVENT_COMMON_CONTEXT_STR = "Event common context";
 static const char *EVENT_SPECIFIC_CONTEXT_STR = "Event specific context";
@@ -1040,7 +1095,17 @@ void write_field_class(struct details_write_ctx *ctx, const bt_field_class *fc)
                color_fg_blue(ctx), type, color_reset(ctx));
 
        /* Write field class's single-line properties */
-       if (bt_field_class_type_is(fc_type, BT_FIELD_CLASS_TYPE_ENUMERATION)) {
+       if (fc_type == BT_FIELD_CLASS_TYPE_BIT_ARRAY &&
+                       ctx->details_comp->mip_version >= 1) {
+               uint64_t flag_count =
+                       bt_field_class_bit_array_get_flag_count(fc);
+
+               write_sp(ctx);
+               write_uint_prop_value(ctx, flag_count);
+               g_string_append_printf(ctx->str, " flag%s)",
+                       plural(flag_count));
+       } else if (bt_field_class_type_is(
+                       fc_type, BT_FIELD_CLASS_TYPE_ENUMERATION)) {
                uint64_t mapping_count =
                        bt_field_class_enumeration_get_mapping_count(fc);
 
@@ -1176,7 +1241,30 @@ void write_field_class(struct details_write_ctx *ctx, const bt_field_class *fc)
        }
 
        /* Write field class's complex properties */
-       if (bt_field_class_type_is(fc_type, BT_FIELD_CLASS_TYPE_ENUMERATION)) {
+       if (fc_type == BT_FIELD_CLASS_TYPE_BIT_ARRAY &&
+                       ctx->details_comp->mip_version >= 1) {
+               uint64_t flag_count =
+                       bt_field_class_bit_array_get_flag_count(fc);
+
+               if (flag_count > 0) {
+                       if (wrote_user_attrs) {
+                               write_nl(ctx);
+                               write_indent(ctx);
+                               write_prop_name(ctx, "Flags");
+                               g_string_append_c(ctx->str, ':');
+                               incr_indent(ctx);
+                       } else {
+                               /* Each flag starts with its own newline */
+                               g_string_append_c(ctx->str, ':');
+                       }
+
+                       write_bit_array_field_class_flags(ctx, fc);
+
+                       if (wrote_user_attrs) {
+                               decr_indent(ctx);
+                       }
+               }
+       } else if (bt_field_class_type_is(fc_type, BT_FIELD_CLASS_TYPE_ENUMERATION)) {
                uint64_t mapping_count =
                        bt_field_class_enumeration_get_mapping_count(fc);
 
@@ -1362,7 +1450,7 @@ void write_event_class(struct details_write_ctx *ctx, const bt_event_class *ec)
        write_indent(ctx);
        write_obj_type_name(ctx, "Event class");
 
-       /* Write name, namespace and ID */
+       /* Write name, namespace, UID, and ID */
        if (name) {
                g_string_append_printf(ctx->str, " `%s%s%s`",
                        color_fg_green(ctx), name, color_reset(ctx));
@@ -1371,13 +1459,22 @@ void write_event_class(struct details_write_ctx *ctx, const bt_event_class *ec)
        g_string_append(ctx->str, " (");
 
        if (ctx->details_comp->mip_version >= 1) {
-               const char *ns = bt_event_class_get_namespace(ec);
+               const char *str = bt_event_class_get_namespace(ec);
 
-               if (ns) {
+               if (str) {
                        g_string_append(ctx->str, "Namespace `");
-                       write_none_str(ctx, ns);
+                       write_str_prop_value(ctx, str);
                        g_string_append(ctx->str, "`, ");
                }
+
+               if (ctx->details_comp->cfg.with_uid) {
+                       str = bt_event_class_get_uid(ec);
+                       if (str) {
+                               g_string_append(ctx->str, "UID `");
+                               write_str_prop_value(ctx, str);
+                               g_string_append(ctx->str, "`, ");
+                       }
+               }
        }
 
        g_string_append(ctx->str, "ID ");
@@ -1476,13 +1573,38 @@ void write_clock_class_prop_lines(struct details_write_ctx *ctx,
 {
        int64_t offset_seconds;
        uint64_t offset_cycles;
+       uint64_t prec;
        const char *str;
 
+       if (ctx->details_comp->mip_version >= 1) {
+               str = bt_clock_class_get_namespace(cc);
+               if (str) {
+                       write_str_prop_line(ctx, "Namespace", str);
+               }
+       }
+
        str = bt_clock_class_get_name(cc);
        if (str) {
                write_str_prop_line(ctx, "Name", str);
        }
 
+       if (ctx->details_comp->mip_version >= 1 &&
+                       ctx->details_comp->cfg.with_uid) {
+               str = bt_clock_class_get_uid(cc);
+               if (str) {
+                       write_str_prop_line(ctx, "UID", str);
+               }
+       }
+
+       if (ctx->details_comp->mip_version == 0 &&
+                       ctx->details_comp->cfg.with_uuid) {
+               bt_uuid uuid = bt_clock_class_get_uuid(cc);
+
+               if (uuid) {
+                       write_uuid_prop_line(ctx, "UUID", uuid);
+               }
+       }
+
        write_user_attributes(ctx,
                bt_clock_class_borrow_user_attributes_const(cc), true, NULL);
        str = bt_clock_class_get_description(cc);
@@ -1492,19 +1614,57 @@ void write_clock_class_prop_lines(struct details_write_ctx *ctx,
 
        write_uint_prop_line(ctx, "Frequency (Hz)",
                bt_clock_class_get_frequency(cc));
-       write_uint_prop_line(ctx, "Precision (cycles)",
-               bt_clock_class_get_precision(cc));
+
+       if (bt_clock_class_get_opt_precision(cc, &prec) ==
+                       BT_PROPERTY_AVAILABILITY_AVAILABLE) {
+               write_uint_prop_line(ctx, "Precision (cycles)", prec);
+       }
+
+       if (ctx->details_comp->mip_version >= 1) {
+               uint64_t accuracy;
+
+               if (bt_clock_class_get_accuracy(cc, &accuracy) ==
+                               BT_PROPERTY_AVAILABILITY_AVAILABLE) {
+                       write_uint_prop_line(ctx, "Accuracy (cycles)", accuracy);
+               }
+       }
+
        bt_clock_class_get_offset(cc, &offset_seconds, &offset_cycles);
-       write_int_prop_line(ctx, "Offset (s)", offset_seconds);
-       write_uint_prop_line(ctx, "Offset (cycles)", offset_cycles);
-       write_bool_prop_line(ctx, "Origin is Unix epoch",
-               bt_clock_class_origin_is_unix_epoch(cc));
+       write_int_prop_line(ctx, "Offset from origin (s)", offset_seconds);
+       write_uint_prop_line(ctx, "Offset from origin (cycles)", offset_cycles);
 
-       if (ctx->details_comp->cfg.with_uuid) {
-               bt_uuid uuid = bt_clock_class_get_uuid(cc);
+       if (!bt_clock_class_origin_is_unknown(cc)) {
+               write_prop_name_line(ctx, "Origin");
 
-               if (uuid) {
-                       write_uuid_prop_line(ctx, "UUID", uuid);
+               if (bt_clock_class_origin_is_unix_epoch(cc)) {
+                       /* Unix epoch */
+                       write_sp(ctx);
+                       write_str_prop_value(ctx, "Unix epoch");
+                       write_nl(ctx);
+               } else {
+                       /*
+                        * Producer-defined: namespace is optional, name
+                        * and UID always exist.
+                        */
+                       const char *ns;
+
+                       BT_ASSERT_DBG(ctx->details_comp->mip_version >= 1);
+                       write_nl(ctx);
+                       incr_indent(ctx);
+                       ns = bt_clock_class_get_origin_namespace(cc);
+                       if (ns) {
+                               write_str_prop_line(ctx, "Namespace", ns);
+                       }
+
+                       write_str_prop_line(ctx, "Name",
+                               bt_clock_class_get_origin_name(cc));
+
+                       if (ctx->details_comp->cfg.with_uid) {
+                               write_str_prop_line(ctx, "UID",
+                                       bt_clock_class_get_origin_uid(cc));
+                       }
+
+                       decr_indent(ctx);
                }
        }
 }
@@ -1535,7 +1695,7 @@ void write_stream_class(struct details_write_ctx *ctx,
        write_indent(ctx);
        write_obj_type_name(ctx, "Stream class");
 
-       /* Write name, namespace and ID */
+       /* Write name, namespace, UID, and ID */
        if (ctx->details_comp->cfg.with_stream_class_name) {
                const char *name = bt_stream_class_get_name(sc);
 
@@ -1550,13 +1710,22 @@ void write_stream_class(struct details_write_ctx *ctx,
 
        if (ctx->details_comp->cfg.with_stream_class_ns
                        && ctx->details_comp->mip_version >= 1) {
-               const char *ns = bt_stream_class_get_namespace(sc);
+               const char *str = bt_stream_class_get_namespace(sc);
 
-               if (ns) {
+               if (str) {
                        g_string_append(ctx->str, "Namespace `");
-                       write_str_prop_value(ctx, ns);
+                       write_str_prop_value(ctx, str);
                        g_string_append(ctx->str, "`, ");
                }
+
+               if (ctx->details_comp->cfg.with_uid) {
+                       str = bt_stream_class_get_uid(sc);
+                       if (str) {
+                               g_string_append(ctx->str, "UID `");
+                               write_str_prop_value(ctx, str);
+                               g_string_append(ctx->str, "`, ");
+                       }
+               }
        }
 
        g_string_append(ctx->str, "ID ");
@@ -1667,7 +1836,6 @@ void write_trace_class(struct details_write_ctx *ctx, const bt_trace_class *tc)
        write_indent(ctx);
        write_obj_type_name(ctx, "Trace class");
 
-
        for (i = 0; i < bt_trace_class_get_stream_class_count(tc); i++) {
                g_ptr_array_add(stream_classes,
                        (gpointer) bt_trace_class_borrow_stream_class_by_index_const(
@@ -2239,9 +2407,10 @@ void write_trace(struct details_write_ctx *ctx, const bt_trace *trace)
        write_indent(ctx);
        write_obj_type_name(ctx, "Trace");
 
-       /* Write name */
+       /* Write name, namespace, and UID */
        if (ctx->details_comp->cfg.with_trace_name) {
                const char *name = bt_trace_get_name(trace);
+
                if (name) {
                        g_string_append(ctx->str, " `");
                        write_str_prop_value(ctx, name);
@@ -2249,11 +2418,40 @@ void write_trace(struct details_write_ctx *ctx, const bt_trace *trace)
                }
        }
 
+       if (ctx->details_comp->mip_version >= 1) {
+               const char *ns = bt_trace_get_namespace(trace);
+               const char *uid = ctx->details_comp->cfg.with_uid ?
+                       bt_trace_get_uid(trace) : NULL;
+
+               if (ns || uid) {
+                       g_string_append(ctx->str, " (");
+
+                       if (ns) {
+                               g_string_append(ctx->str, "Namespace `");
+                               write_str_prop_value(ctx, ns);
+                               g_string_append_c(ctx->str, '`');
+                       }
+
+                       if (uid) {
+                               if (ns) {
+                                       g_string_append(ctx->str, ", ");
+                               }
+
+                               g_string_append(ctx->str, "UID `");
+                               write_str_prop_value(ctx, uid);
+                               g_string_append_c(ctx->str, '`');
+                       }
+
+                       g_string_append(ctx->str, ")");
+               }
+       }
+
        /* Write properties */
        incr_indent(ctx);
 
        /* Write UUID */
-       if (ctx->details_comp->cfg.with_uuid) {
+       if (ctx->details_comp->mip_version == 0 &&
+                       ctx->details_comp->cfg.with_uuid) {
                bt_uuid uuid = bt_trace_get_uuid(trace);
 
                if (uuid) {

diff --git a/tests/data/plugins/flt.lttng-utils.debug-info/trace-debug-info.expect b/tests/data/plugins/flt.lttng-utils.debug-info/trace-debug-info.expect
index e800e9c4bf680a44117ff921235ccd9cca9b4941..deb89caf27e31ccfe2bba68a31d2e3db70b62694 100644 (file)
--- a/tests/data/plugins/flt.lttng-utils.debug-info/trace-debug-info.expect
+++ b/tests/data/plugins/flt.lttng-utils.debug-info/trace-debug-info.expect
@@ -9,13 +9,13 @@ Trace class:
     Discarded packets have default clock snapshots: Yes
     Default clock class:
       Name: monotonic
+      UUID: c56ad62a-6a35-4722-9807-d8e0f118a367
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,563,264,475
-      Offset (cycles): 374,722,151
-      Origin is Unix epoch: Yes
-      UUID: c56ad62a-6a35-4722-9807-d8e0f118a367
+      Offset from origin (s): 1,563,264,475
+      Offset from origin (cycles): 374,722,151
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event common context field class: Structure (3 members):

diff --git a/tests/data/plugins/flt.utils.muxer/succeed/diff-inactivity-msg-cs.expect b/tests/data/plugins/flt.utils.muxer/succeed/diff-inactivity-msg-cs.expect
index c018a3e62d436778a4edb8356c67983d012687b1..023ba2a22bfaf0ae0d80209a2d1c2acc6dac1766 100644 (file)
--- a/tests/data/plugins/flt.utils.muxer/succeed/diff-inactivity-msg-cs.expect
+++ b/tests/data/plugins/flt.utils.muxer/succeed/diff-inactivity-msg-cs.expect
@@ -4,9 +4,9 @@ Message iterator inactivity:
     Name: Chicoutimi
     Frequency (Hz): 1
     Precision (cycles): 0
-    Offset (s): 0
-    Offset (cycles): 0
-    Origin is Unix epoch: Yes
+    Offset from origin (s): 0
+    Offset from origin (cycles): 0
+    Origin: Unix epoch
 
 [0 cycles, 0 ns from origin]
 Message iterator inactivity:
@@ -14,6 +14,6 @@ Message iterator inactivity:
     Name: La Baie
     Frequency (Hz): 1
     Precision (cycles): 0
-    Offset (s): 0
-    Offset (cycles): 0
-    Origin is Unix epoch: Yes
+    Offset from origin (s): 0
+    Offset from origin (cycles): 0
+    Origin: Unix epoch

diff --git a/tests/data/plugins/sink.ctf.fs/succeed/trace-double.expect b/tests/data/plugins/sink.ctf.fs/succeed/trace-double.expect
index bf7b1afd0ca8ede00676fa1e2c47aa660b154818..2e31935a05d8ba016f4b674a2337950ae1a38b39 100644 (file)
--- a/tests/data/plugins/sink.ctf.fs/succeed/trace-double.expect
+++ b/tests/data/plugins/sink.ctf.fs/succeed/trace-double.expect
@@ -11,9 +11,8 @@ Trace class:
       Name: default
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 1
-      Offset (s): 0
-      Offset (cycles): 0
-      Origin is Unix epoch: No
+      Offset from origin (s): 0
+      Offset from origin (cycles): 0
     Event class `ev` (ID 0):
       Payload field class: Structure (1 member):
         dbl: Double-precision real

diff --git a/tests/data/plugins/sink.ctf.fs/succeed/trace-float.expect b/tests/data/plugins/sink.ctf.fs/succeed/trace-float.expect
index b9ff6876b9a3ed4b80397613aa0b6e5d6bfd063e..c80939ae63d383d99bcb4991b3419c82004dec3b 100644 (file)
--- a/tests/data/plugins/sink.ctf.fs/succeed/trace-float.expect
+++ b/tests/data/plugins/sink.ctf.fs/succeed/trace-float.expect
@@ -11,9 +11,8 @@ Trace class:
       Name: default
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 1
-      Offset (s): 0
-      Offset (cycles): 0
-      Origin is Unix epoch: No
+      Offset from origin (s): 0
+      Offset from origin (cycles): 0
     Event class `ev` (ID 0):
       Payload field class: Structure (1 member):
         flt: Single-precision real

diff --git a/tests/data/plugins/sink.text.details/succeed/default-compact-without-time.expect b/tests/data/plugins/sink.text.details/succeed/default-compact-without-time.expect
index 562afc9f454a0e93ae4bc32b6a1ba21e1873338f..96eefedfad0f70db7b17001a1f4a5b227ca269d5 100644 (file)
--- a/tests/data/plugins/sink.text.details/succeed/default-compact-without-time.expect
+++ b/tests/data/plugins/sink.text.details/succeed/default-compact-without-time.expect
@@ -8,13 +8,13 @@ Trace class:
     Supports discarded packets: No
     Default clock class:
       Name: monotonic
+      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,351,530,929
-      Offset (cycles): 945,824,323
-      Origin is Unix epoch: Yes
-      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
+      Offset from origin (s): 1,351,530,929
+      Offset from origin (cycles): 945,824,323
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event common context field class: Structure (2 members):

diff --git a/tests/data/plugins/sink.text.details/succeed/default-compact.expect b/tests/data/plugins/sink.text.details/succeed/default-compact.expect
index ddb4d12bc103c0adbbf5ac1b2dbb8f2d07fb763d..bf85e6eaa4ef8931b7aa7e45239b57993120e294 100644 (file)
--- a/tests/data/plugins/sink.text.details/succeed/default-compact.expect
+++ b/tests/data/plugins/sink.text.details/succeed/default-compact.expect
@@ -8,13 +8,13 @@ Trace class:
     Supports discarded packets: No
     Default clock class:
       Name: monotonic
+      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,351,530,929
-      Offset (cycles): 945,824,323
-      Origin is Unix epoch: Yes
-      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
+      Offset from origin (s): 1,351,530,929
+      Offset from origin (cycles): 945,824,323
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event common context field class: Structure (2 members):

diff --git a/tests/data/plugins/sink.text.details/succeed/default-without-data.expect b/tests/data/plugins/sink.text.details/succeed/default-without-data.expect
index 95efee2be8cc7cc9c1adb326839b486ccaeb0b88..a6c4c5e2d7abcffa785d570602f77b2e89123eb2 100644 (file)
--- a/tests/data/plugins/sink.text.details/succeed/default-without-data.expect
+++ b/tests/data/plugins/sink.text.details/succeed/default-without-data.expect
@@ -8,13 +8,13 @@ Trace class:
     Supports discarded packets: No
     Default clock class:
       Name: monotonic
+      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,351,530,929
-      Offset (cycles): 945,824,323
-      Origin is Unix epoch: Yes
-      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
+      Offset from origin (s): 1,351,530,929
+      Offset from origin (cycles): 945,824,323
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event common context field class: Structure (2 members):

diff --git a/tests/data/plugins/sink.text.details/succeed/default-without-names.expect b/tests/data/plugins/sink.text.details/succeed/default-without-names.expect
index 783e09db1d19a2ad0322a5fae599257295944f23..90092d3d804e432843be24c6e3463b31b76f8782 100644 (file)
--- a/tests/data/plugins/sink.text.details/succeed/default-without-names.expect
+++ b/tests/data/plugins/sink.text.details/succeed/default-without-names.expect
@@ -8,13 +8,13 @@ Trace class:
     Supports discarded packets: No
     Default clock class:
       Name: monotonic
+      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,351,530,929
-      Offset (cycles): 945,824,323
-      Origin is Unix epoch: Yes
-      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
+      Offset from origin (s): 1,351,530,929
+      Offset from origin (cycles): 945,824,323
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event common context field class: Structure (2 members):

diff --git a/tests/data/plugins/sink.text.details/succeed/default-without-time.expect b/tests/data/plugins/sink.text.details/succeed/default-without-time.expect
index 8a304439a1b6ea0cdd7a9f82368cb6b25e1bc165..2137820c6dda7ad53690fffa52203ef0354c8d82 100644 (file)
--- a/tests/data/plugins/sink.text.details/succeed/default-without-time.expect
+++ b/tests/data/plugins/sink.text.details/succeed/default-without-time.expect
@@ -8,13 +8,13 @@ Trace class:
     Supports discarded packets: No
     Default clock class:
       Name: monotonic
+      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,351,530,929
-      Offset (cycles): 945,824,323
-      Origin is Unix epoch: Yes
-      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
+      Offset from origin (s): 1,351,530,929
+      Offset from origin (cycles): 945,824,323
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event common context field class: Structure (2 members):

diff --git a/tests/data/plugins/sink.text.details/succeed/default-without-trace-name.expect b/tests/data/plugins/sink.text.details/succeed/default-without-trace-name.expect
index 783e09db1d19a2ad0322a5fae599257295944f23..90092d3d804e432843be24c6e3463b31b76f8782 100644 (file)
--- a/tests/data/plugins/sink.text.details/succeed/default-without-trace-name.expect
+++ b/tests/data/plugins/sink.text.details/succeed/default-without-trace-name.expect
@@ -8,13 +8,13 @@ Trace class:
     Supports discarded packets: No
     Default clock class:
       Name: monotonic
+      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,351,530,929
-      Offset (cycles): 945,824,323
-      Origin is Unix epoch: Yes
-      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
+      Offset from origin (s): 1,351,530,929
+      Offset from origin (cycles): 945,824,323
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event common context field class: Structure (2 members):

diff --git a/tests/data/plugins/sink.text.details/succeed/default-without-uuid.expect b/tests/data/plugins/sink.text.details/succeed/default-without-uuid.expect
index 6aa767788856b766c2fd2491eb22906097d8b1f1..e7793a76f599bf099dc93b86197aa0493e8c18c8 100644 (file)
--- a/tests/data/plugins/sink.text.details/succeed/default-without-uuid.expect
+++ b/tests/data/plugins/sink.text.details/succeed/default-without-uuid.expect
@@ -11,9 +11,9 @@ Trace class:
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,351,530,929
-      Offset (cycles): 945,824,323
-      Origin is Unix epoch: Yes
+      Offset from origin (s): 1,351,530,929
+      Offset from origin (cycles): 945,824,323
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event common context field class: Structure (2 members):

diff --git a/tests/data/plugins/sink.text.details/succeed/default.expect b/tests/data/plugins/sink.text.details/succeed/default.expect
index 82b58c7546b1e90c67ef90850ac204426cab70b4..5e09690fc83e976d244136e028e23ae5138e776b 100644 (file)
--- a/tests/data/plugins/sink.text.details/succeed/default.expect
+++ b/tests/data/plugins/sink.text.details/succeed/default.expect
@@ -8,13 +8,13 @@ Trace class:
     Supports discarded packets: No
     Default clock class:
       Name: monotonic
+      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,351,530,929
-      Offset (cycles): 945,824,323
-      Origin is Unix epoch: Yes
-      UUID: c19b5ac9-b8e6-4f78-be95-a605d04e34c6
+      Offset from origin (s): 1,351,530,929
+      Offset from origin (cycles): 945,824,323
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event common context field class: Structure (2 members):

diff --git a/tests/data/plugins/src.ctf.fs/succeed/trace-2packets-barectf-event-before-packet.expect b/tests/data/plugins/src.ctf.fs/succeed/trace-2packets-barectf-event-before-packet.expect
index 5cb95aae717a5280a6336d9d6fef9f5aff68ade8..81bcab0b7ce7ffa59165586ac20d908dfac763e1 100644 (file)
--- a/tests/data/plugins/src.ctf.fs/succeed/trace-2packets-barectf-event-before-packet.expect
+++ b/tests/data/plugins/src.ctf.fs/succeed/trace-2packets-barectf-event-before-packet.expect
@@ -9,13 +9,13 @@ Trace class:
     Discarded packets have default clock snapshots: Yes
     Default clock class:
       Name: monotonic
+      UUID: db965ea1-f862-45a3-ab65-602642fdad90
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,561,498,843
-      Offset (cycles): 433,067,926
-      Origin is Unix epoch: Yes
-      UUID: db965ea1-f862-45a3-ab65-602642fdad90
+      Offset from origin (s): 1,561,498,843
+      Offset from origin (cycles): 433,067,926
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event common context field class: Structure (1 member):
@@ -39,9 +39,9 @@ Trace class:
       Name: default
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,434,072,888
-      Offset (cycles): 0
-      Origin is Unix epoch: Yes
+      Offset from origin (s): 1,434,072,888
+      Offset from origin (cycles): 0
+      Origin: Unix epoch
     Event class `simple_uint32` (ID 0):
       Log level: Critical
       Payload field class: Structure (1 member):

diff --git a/tests/data/plugins/src.ctf.fs/succeed/trace-2packets.expect b/tests/data/plugins/src.ctf.fs/succeed/trace-2packets.expect
index 9b5bb6a6d1f990868da65276a112a35f7ee2d524..d9de706b5e1790fed475ec69d1b2c53c2fc89e42 100644 (file)
--- a/tests/data/plugins/src.ctf.fs/succeed/trace-2packets.expect
+++ b/tests/data/plugins/src.ctf.fs/succeed/trace-2packets.expect
@@ -9,13 +9,13 @@ Trace class:
     Discarded packets have default clock snapshots: Yes
     Default clock class:
       Name: monotonic
+      UUID: db965ea1-f862-45a3-ab65-602642fdad90
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,561,498,843
-      Offset (cycles): 433,067,926
-      Origin is Unix epoch: Yes
-      UUID: db965ea1-f862-45a3-ab65-602642fdad90
+      Offset from origin (s): 1,561,498,843
+      Offset from origin (cycles): 433,067,926
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event common context field class: Structure (1 member):

diff --git a/tests/data/plugins/src.ctf.fs/succeed/trace-barectf-event-before-packet.expect b/tests/data/plugins/src.ctf.fs/succeed/trace-barectf-event-before-packet.expect
index dbdc6579d847098d2e9824986e44f3fb36707420..cda3958346794f17c0817379941fe10980fd569b 100644 (file)
--- a/tests/data/plugins/src.ctf.fs/succeed/trace-barectf-event-before-packet.expect
+++ b/tests/data/plugins/src.ctf.fs/succeed/trace-barectf-event-before-packet.expect
@@ -10,9 +10,8 @@ Trace class:
       Name: default
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,434,072,888
-      Offset (cycles): 0
-      Origin is Unix epoch: No
+      Offset from origin (s): 1,434,072,888
+      Offset from origin (cycles): 0
     Event class `simple_uint32` (ID 0):
       Log level: Critical
       Payload field class: Structure (1 member):

diff --git a/tests/data/plugins/src.ctf.fs/succeed/trace-lttng-tracefile-rotation.expect b/tests/data/plugins/src.ctf.fs/succeed/trace-lttng-tracefile-rotation.expect
index 32f6fe5bda3244ddb1d460fbd316004a0160a7bb..83a5c944849e025f8d75cbaef91fb6a2d03073ad 100644 (file)
--- a/tests/data/plugins/src.ctf.fs/succeed/trace-lttng-tracefile-rotation.expect
+++ b/tests/data/plugins/src.ctf.fs/succeed/trace-lttng-tracefile-rotation.expect
@@ -9,13 +9,13 @@ Trace class:
     Discarded packets have default clock snapshots: Yes
     Default clock class:
       Name: monotonic
+      UUID: 25210548-98b9-4ab3-a9de-7d865e4ad32c
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,571,238,431
-      Offset (cycles): 155,326,264
-      Origin is Unix epoch: Yes
-      UUID: 25210548-98b9-4ab3-a9de-7d865e4ad32c
+      Offset from origin (s): 1,571,238,431
+      Offset from origin (cycles): 155,326,264
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event class `sched_kthread_stop` (ID 0):

diff --git a/tests/data/plugins/src.ctf.fs/succeed/trace-session-rotation.expect b/tests/data/plugins/src.ctf.fs/succeed/trace-session-rotation.expect
index 20a0f9db1b546e571711857928547c1935632b5a..0e61da8907f1bbe77ff21a938a9dd43e81585a06 100644 (file)
--- a/tests/data/plugins/src.ctf.fs/succeed/trace-session-rotation.expect
+++ b/tests/data/plugins/src.ctf.fs/succeed/trace-session-rotation.expect
@@ -9,13 +9,13 @@ Trace class:
     Discarded packets have default clock snapshots: Yes
     Default clock class:
       Name: monotonic
+      UUID: 78760d96-b4c7-47f0-bd66-b73a504fee96
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,566,682,056
-      Offset (cycles): 14,585,897
-      Origin is Unix epoch: Yes
-      UUID: 78760d96-b4c7-47f0-bd66-b73a504fee96
+      Offset from origin (s): 1,566,682,056
+      Offset from origin (cycles): 14,585,897
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event class `lttng_ust_statedump:start` (ID 0):
@@ -321,13 +321,13 @@ Trace class:
     Discarded packets have default clock snapshots: Yes
     Default clock class:
       Name: monotonic
+      UUID: 78760d96-b4c7-47f0-bd66-b73a504fee96
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,566,682,056
-      Offset (cycles): 14,585,896
-      Origin is Unix epoch: Yes
-      UUID: 78760d96-b4c7-47f0-bd66-b73a504fee96
+      Offset from origin (s): 1,566,682,056
+      Offset from origin (cycles): 14,585,896
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event class `lttng_ust_statedump:start` (ID 0):

diff --git a/tests/data/plugins/src.ctf.fs/succeed/trace-simple.expect b/tests/data/plugins/src.ctf.fs/succeed/trace-simple.expect
index e3af433bea86c67051d26250499c85e88df259c7..04a2fcb008f57199e26a59577bdc3294d2834866 100644 (file)
--- a/tests/data/plugins/src.ctf.fs/succeed/trace-simple.expect
+++ b/tests/data/plugins/src.ctf.fs/succeed/trace-simple.expect
@@ -10,9 +10,8 @@ Trace class:
       Name: default
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 1
-      Offset (s): 0
-      Offset (cycles): 0
-      Origin is Unix epoch: No
+      Offset from origin (s): 0
+      Offset from origin (cycles): 0
     Event class `ev` (ID 0):
       Payload field class: Structure (2 members):
         first: Signed integer (8-bit, Base 10)

diff --git a/tests/data/plugins/src.ctf.lttng-live/cli-base.expect b/tests/data/plugins/src.ctf.lttng-live/cli-base.expect
index 4a06297694a7dcc49ac54eb408a30958b0a4f45d..1e1153fbf32ff766444764088fb1212c7530c083 100644 (file)
--- a/tests/data/plugins/src.ctf.lttng-live/cli-base.expect
+++ b/tests/data/plugins/src.ctf.lttng-live/cli-base.expect
@@ -9,13 +9,13 @@ Trace class:
     Discarded packets have default clock snapshots: Yes
     Default clock class:
       Name: monotonic
+      UUID: 88cba016-36e2-48c2-aff8-3e4b9aefb05c
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,564,079,206
-      Offset (cycles): 484,157,339
-      Origin is Unix epoch: Yes
-      UUID: 88cba016-36e2-48c2-aff8-3e4b9aefb05c
+      Offset from origin (s): 1,564,079,206
+      Offset from origin (cycles): 484,157,339
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event class `sample_component:message` (ID 0):

diff --git a/tests/data/plugins/src.ctf.lttng-live/cli-multi-domains.expect b/tests/data/plugins/src.ctf.lttng-live/cli-multi-domains.expect
index 5c534621a86ab058263a00a0136911b5cf59db2f..8b15c958aab314fae547d96b4db28aea737d3cde 100644 (file)
--- a/tests/data/plugins/src.ctf.lttng-live/cli-multi-domains.expect
+++ b/tests/data/plugins/src.ctf.lttng-live/cli-multi-domains.expect
@@ -9,13 +9,13 @@ Trace class:
     Discarded packets have default clock snapshots: Yes
     Default clock class:
       Name: monotonic
+      UUID: 88cba016-36e2-48c2-aff8-3e4b9aefb05c
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,564,079,206
-      Offset (cycles): 484,157,338
-      Origin is Unix epoch: Yes
-      UUID: 88cba016-36e2-48c2-aff8-3e4b9aefb05c
+      Offset from origin (s): 1,564,079,206
+      Offset from origin (cycles): 484,157,338
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
   Stream class (ID 1):
@@ -28,13 +28,13 @@ Trace class:
     Discarded packets have default clock snapshots: Yes
     Default clock class:
       Name: monotonic
+      UUID: 88cba016-36e2-48c2-aff8-3e4b9aefb05c
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,564,079,206
-      Offset (cycles): 484,157,338
-      Origin is Unix epoch: Yes
-      UUID: 88cba016-36e2-48c2-aff8-3e4b9aefb05c
+      Offset from origin (s): 1,564,079,206
+      Offset from origin (cycles): 484,157,338
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
   Stream class (ID 2):
@@ -47,13 +47,13 @@ Trace class:
     Discarded packets have default clock snapshots: Yes
     Default clock class:
       Name: monotonic
+      UUID: 88cba016-36e2-48c2-aff8-3e4b9aefb05c
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,564,079,206
-      Offset (cycles): 484,157,338
-      Origin is Unix epoch: Yes
-      UUID: 88cba016-36e2-48c2-aff8-3e4b9aefb05c
+      Offset from origin (s): 1,564,079,206
+      Offset from origin (cycles): 484,157,338
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event class `sample_component:message` (ID 0):
@@ -140,13 +140,13 @@ Trace class:
     Discarded packets have default clock snapshots: Yes
     Default clock class:
       Name: monotonic
+      UUID: 88cba016-36e2-48c2-aff8-3e4b9aefb05c
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,564,079,206
-      Offset (cycles): 484,157,378
-      Origin is Unix epoch: Yes
-      UUID: 88cba016-36e2-48c2-aff8-3e4b9aefb05c
+      Offset from origin (s): 1,564,079,206
+      Offset from origin (cycles): 484,157,378
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event class `lttng_test_filter_event` (ID 0):

diff --git a/tests/data/plugins/src.ctf.lttng-live/inactivity-discarded-packet.expect b/tests/data/plugins/src.ctf.lttng-live/inactivity-discarded-packet.expect
index 278818d7ae3f41e8b7b9718e232b7d026e1f8772..a63cce5ee78db310fcc98a81a44f0dc304a49eaf 100644 (file)
--- a/tests/data/plugins/src.ctf.lttng-live/inactivity-discarded-packet.expect
+++ b/tests/data/plugins/src.ctf.lttng-live/inactivity-discarded-packet.expect
@@ -10,9 +10,9 @@ Trace class:
       Name: default
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 0
-      Offset (cycles): 0
-      Origin is Unix epoch: Yes
+      Offset from origin (s): 0
+      Offset from origin (cycles): 0
+      Origin: Unix epoch
     Event class `my-event` (ID 0):
 
 [Unknown]
@@ -41,9 +41,9 @@ Message iterator inactivity:
     Name: default
     Frequency (Hz): 1,000,000,000
     Precision (cycles): 0
-    Offset (s): 0
-    Offset (cycles): 0
-    Origin is Unix epoch: Yes
+    Offset from origin (s): 0
+    Offset from origin (cycles): 0
+    Origin: Unix epoch
 
 [80 cycles, 80 ns from origin]
 [121 cycles, 121 ns from origin]

diff --git a/tests/data/plugins/src.ctf.lttng-live/new-streams.expect b/tests/data/plugins/src.ctf.lttng-live/new-streams.expect
index b77c3267e5d5efc8864afe538e760d22179f5a1e..eb25bb11b571bee6ca5120a1731619b1b1836b8a 100644 (file)
--- a/tests/data/plugins/src.ctf.lttng-live/new-streams.expect
+++ b/tests/data/plugins/src.ctf.lttng-live/new-streams.expect
@@ -7,12 +7,11 @@ Trace class:
     Supports discarded packets: No
     Default clock class:
       Name: cycle_counter_test
+      UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 0
-      Offset (cycles): 0
-      Origin is Unix epoch: No
-      UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
+      Offset from origin (s): 0
+      Offset from origin (cycles): 0
     Event class `first_trace_event` (ID 0):
       Payload field class: Structure (1 member):
         value: Unsigned integer (8-bit, Base 10)
@@ -56,23 +55,21 @@ Packet end
 Message iterator inactivity:
   Clock class:
     Name: cycle_counter_test
+    UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
     Frequency (Hz): 1,000,000,000
     Precision (cycles): 0
-    Offset (s): 0
-    Offset (cycles): 0
-    Origin is Unix epoch: No
-    UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
+    Offset from origin (s): 0
+    Offset from origin (cycles): 0
 
 [50 cycles, 50 ns from origin]
 Message iterator inactivity:
   Clock class:
     Name: cycle_counter_test
+    UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
     Frequency (Hz): 1,000,000,000
     Precision (cycles): 0
-    Offset (s): 0
-    Offset (cycles): 0
-    Origin is Unix epoch: No
-    UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
+    Offset from origin (s): 0
+    Offset from origin (cycles): 0
 
 Trace class:
   Stream class (ID 0):
@@ -83,12 +80,11 @@ Trace class:
     Supports discarded packets: No
     Default clock class:
       Name: cycle_counter_test
+      UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 0
-      Offset (cycles): 0
-      Origin is Unix epoch: No
-      UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
+      Offset from origin (s): 0
+      Offset from origin (cycles): 0
     Event class `second_trace_event` (ID 0):
       Payload field class: Structure (1 member):
         value: Unsigned integer (8-bit, Base 10)
@@ -104,23 +100,21 @@ Stream beginning:
 Message iterator inactivity:
   Clock class:
     Name: cycle_counter_test
+    UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
     Frequency (Hz): 1,000,000,000
     Precision (cycles): 0
-    Offset (s): 0
-    Offset (cycles): 0
-    Origin is Unix epoch: No
-    UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
+    Offset from origin (s): 0
+    Offset from origin (cycles): 0
 
 [100 cycles, 100 ns from origin]
 Message iterator inactivity:
   Clock class:
     Name: cycle_counter_test
+    UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
     Frequency (Hz): 1,000,000,000
     Precision (cycles): 0
-    Offset (s): 0
-    Offset (cycles): 0
-    Origin is Unix epoch: No
-    UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
+    Offset from origin (s): 0
+    Offset from origin (cycles): 0
 
 [110 cycles, 110 ns from origin]
 {Trace 1, Stream class ID 0, Stream ID 3}
@@ -150,12 +144,11 @@ Event `second_trace_event` (Class ID 0):
 Message iterator inactivity:
   Clock class:
     Name: cycle_counter_test
+    UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
     Frequency (Hz): 1,000,000,000
     Precision (cycles): 0
-    Offset (s): 0
-    Offset (cycles): 0
-    Origin is Unix epoch: No
-    UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
+    Offset from origin (s): 0
+    Offset from origin (cycles): 0
 
 [121 cycles, 121 ns from origin]
 {Trace 1, Stream class ID 0, Stream ID 3}
@@ -169,12 +162,11 @@ Stream end
 Message iterator inactivity:
   Clock class:
     Name: cycle_counter_test
+    UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
     Frequency (Hz): 1,000,000,000
     Precision (cycles): 0
-    Offset (s): 0
-    Offset (cycles): 0
-    Origin is Unix epoch: No
-    UUID: 5b59e7db-5e49-418a-9adf-e1adfdf571c4
+    Offset from origin (s): 0
+    Offset from origin (cycles): 0
 
 [Unknown]
 {Trace 0, Stream class ID 0, Stream ID 1}

diff --git a/tests/data/plugins/src.ctf.lttng-live/split-metadata.expect b/tests/data/plugins/src.ctf.lttng-live/split-metadata.expect
index 17b6ccb4e9dcf4039dbaf38d94cdbfab51fccf9f..8e8b9ce44ffb75a34cdc794da2867d8b06df41e3 100644 (file)
--- a/tests/data/plugins/src.ctf.lttng-live/split-metadata.expect
+++ b/tests/data/plugins/src.ctf.lttng-live/split-metadata.expect
@@ -9,13 +9,13 @@ Trace class:
     Discarded packets have default clock snapshots: Yes
     Default clock class:
       Name: monotonic
+      UUID: 81a04b89-9028-4d3e-a28d-5fbd53a8eb9d
       Description: Monotonic Clock
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 1,594,406,328
-      Offset (cycles): 768,346,378
-      Origin is Unix epoch: Yes
-      UUID: 81a04b89-9028-4d3e-a28d-5fbd53a8eb9d
+      Offset from origin (s): 1,594,406,328
+      Offset from origin (cycles): 768,346,378
+      Origin: Unix epoch
     Packet context field class: Structure (1 member):
       cpu_id: Unsigned integer (32-bit, Base 10)
     Event class `my_app:signe_de_pia$$e` (ID 0):

diff --git a/tests/data/plugins/src.ctf.lttng-live/stored-values.expect b/tests/data/plugins/src.ctf.lttng-live/stored-values.expect
index 6b5004d53ec8cb1191dbed7b50cfbd5f663667ae..8faea6800217293aa7262d5c7151ab4cb6af5783 100644 (file)
--- a/tests/data/plugins/src.ctf.lttng-live/stored-values.expect
+++ b/tests/data/plugins/src.ctf.lttng-live/stored-values.expect
@@ -9,9 +9,8 @@ Trace class:
       Name: default
       Frequency (Hz): 1,000,000,000
       Precision (cycles): 0
-      Offset (s): 0
-      Offset (cycles): 0
-      Origin is Unix epoch: No
+      Offset from origin (s): 0
+      Offset from origin (cycles): 0
     Event class `event1` (ID 1):
       Payload field class: Structure (2 members):
         len: Unsigned integer (8-bit, Base 10)

diff --git a/tests/plugins/flt.lttng-utils.debug-info/test-succeed.sh b/tests/plugins/flt.lttng-utils.debug-info/test-succeed.sh
index 053279af3f7e35aa23014c50dfbd243ced4ac7f3..f6e10b1dd70ef705ad7e090446a77594224c8736 100755 (executable)
--- a/tests/plugins/flt.lttng-utils.debug-info/test-succeed.sh
+++ b/tests/plugins/flt.lttng-utils.debug-info/test-succeed.sh
@@ -53,7 +53,7 @@ test_compare_to_ctf_fs() {
        local debug_info_cli_args=("-c" "flt.lttng-utils.debug-info")
        local details_cli_args=(
                "-c" "sink.text.details"
-               "--params" "with-trace-name=false,with-stream-name=false,with-uuid=false"
+               "--params" "with-trace-name=false,with-stream-name=false,with-uuid=false,with-uid=false"
        )
        local actual_stdout
        local actual_stderr

diff --git a/tests/plugins/sink.ctf.fs/succeed/test-succeed.sh b/tests/plugins/sink.ctf.fs/succeed/test-succeed.sh
index 16e454d096ad9ab6bf561c7c30eb493b044a41d5..67de90e21c8fa8c18920ac54f67a159adc33017c 100755 (executable)
--- a/tests/plugins/sink.ctf.fs/succeed/test-succeed.sh
+++ b/tests/plugins/sink.ctf.fs/succeed/test-succeed.sh
@@ -43,7 +43,7 @@ test_ctf_single() {
        if [ $ret -eq 0 ]; then
                bt_diff_details_ctf_single "$expect_dir/trace-$name.expect" \
                        "$temp_out_trace_dir" \
-                       '-p' 'with-uuid=no,with-trace-name=no,with-stream-name=no'
+                       '-p' 'with-uuid=no,with-uid=no,with-trace-name=no,with-stream-name=no'
                ok $? "$converted_test_name"
        else
                fail "$converted_test_name"

diff --git a/tests/plugins/src.ctf.fs/succeed/test-succeed.sh b/tests/plugins/src.ctf.fs/succeed/test-succeed.sh
index 124266d8047c8ffe70eed7b295ac5818e4343b43..1ac4411fedd3b07de91b2a585e6ba6876255c6c7 100755 (executable)
--- a/tests/plugins/src.ctf.fs/succeed/test-succeed.sh
+++ b/tests/plugins/src.ctf.fs/succeed/test-succeed.sh
@@ -41,7 +41,7 @@ test_ctf_gen_single() {
        diag "Generating trace '$name'"
        bt_diff_details_ctf_gen_single "$this_dir_build/gen-trace-$name" \
                "$expect_dir/trace-$name.expect" \
-               "${test_ctf_common_details_args[@]}" "-p" "with-uuid=no"
+               "${test_ctf_common_details_args[@]}" "-p" "with-uuid=no,with-uid=no"
        ok $? "Generated trace '$name' gives the expected output"
 }