Add support for clock mapping on integer field type

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

diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c
index ff0b46ff2ebceb4af7f08b27d80966a45fbac752..9b772a5511409ac2e3ab0177ef2df9b4a5088c85 100644 (file)
--- a/formats/ctf/ir/event-types.c
+++ b/formats/ctf/ir/event-types.c
@@ -29,6 +29,7 @@
 #include <babeltrace/ctf-writer/event-types.h>
 #include <babeltrace/ctf-ir/event-types-internal.h>
 #include <babeltrace/ctf-ir/utils.h>
+#include <babeltrace/ctf-ir/clock.h>
 #include <babeltrace/ctf-writer/writer-internal.h>
 #include <babeltrace/compiler.h>
 #include <babeltrace/endian.h>
@@ -503,6 +504,51 @@ end:
        return ret;
 }
 
+struct bt_ctf_clock *bt_ctf_field_type_integer_get_mapped_clock(
+               struct bt_ctf_field_type *type)
+{
+       struct bt_ctf_field_type_integer *integer;
+       struct bt_ctf_clock *clock = NULL;
+
+       if (!type) {
+               goto end;
+       }
+
+       integer = container_of(type, struct bt_ctf_field_type_integer, parent);
+       clock = integer->mapped_clock;
+       if (clock) {
+               bt_ctf_clock_get(clock);
+       }
+end:
+       return clock;
+}
+
+int bt_ctf_field_type_integer_set_mapped_clock(
+               struct bt_ctf_field_type *type,
+               struct bt_ctf_clock *clock)
+{
+       struct bt_ctf_field_type_integer *integer;
+       int ret = 0;
+
+       if (!type || type->frozen) {
+               ret = -1;
+               goto end;
+       }
+
+       integer = container_of(type, struct bt_ctf_field_type_integer, parent);
+       if (integer->mapped_clock) {
+               bt_ctf_clock_put(integer->mapped_clock);
+       }
+
+       if (clock) {
+               bt_ctf_clock_get(clock);
+       }
+
+       integer->mapped_clock = clock;
+end:
+       return ret;
+}
+
 struct bt_ctf_field_type *bt_ctf_field_type_enumeration_create(
                struct bt_ctf_field_type *integer_container_type)
 {
@@ -1826,6 +1872,7 @@ void bt_ctf_field_type_integer_destroy(struct bt_ctf_ref *ref)
        integer = container_of(
                container_of(ref, struct bt_ctf_field_type, ref_count),
                struct bt_ctf_field_type_integer, parent);
+       bt_ctf_clock_put(integer->mapped_clock);
        g_free(integer);
 }
 
@@ -2064,15 +2111,31 @@ int bt_ctf_field_type_integer_serialize(struct bt_ctf_field_type *type,
 {
        struct bt_ctf_field_type_integer *integer = container_of(type,
                struct bt_ctf_field_type_integer, parent);
+       int ret = 0;
 
        g_string_append_printf(context->string,
-               "integer { size = %zu; align = %zu; signed = %s; encoding = %s; base = %s; byte_order = %s; }",
+               "integer { size = %zu; align = %zu; signed = %s; encoding = %s; base = %s; byte_order = %s",
                integer->declaration.len, type->declaration->alignment,
                (integer->declaration.signedness ? "true" : "false"),
                get_encoding_string(integer->declaration.encoding),
                get_integer_base_string(integer->declaration.base),
                get_byte_order_string(integer->declaration.byte_order));
-       return 0;
+       if (integer->mapped_clock) {
+               const char *clock_name = bt_ctf_clock_get_name(
+                       integer->mapped_clock);
+
+               if (!clock_name) {
+                       ret = -1;
+                       goto end;
+               }
+
+               g_string_append_printf(context->string,
+                       ", map = clock.%s.value", clock_name);
+       }
+
+       g_string_append(context->string, "; }");
+end:
+       return ret;
 }
 
 static

diff --git a/include/babeltrace/ctf-ir/event-types-internal.h b/include/babeltrace/ctf-ir/event-types-internal.h
index 198497dff68da45ce2bde43ade4a5d400554e8de..217a89488982ac12693a7225a894ea765da63006 100644 (file)
--- a/include/babeltrace/ctf-ir/event-types-internal.h
+++ b/include/babeltrace/ctf-ir/event-types-internal.h
@@ -57,6 +57,7 @@ struct bt_ctf_field_type {
 struct bt_ctf_field_type_integer {
        struct bt_ctf_field_type parent;
        struct declaration_integer declaration;
+       struct bt_ctf_clock *mapped_clock;
 };
 
 struct enumeration_mapping {

diff --git a/include/babeltrace/ctf-ir/event-types.h b/include/babeltrace/ctf-ir/event-types.h
index 258c7473d66328a599d9ba5bf075512606f2f10c..774a88ed651d402c3fb20b82a3d6694463ae6518 100644 (file)
--- a/include/babeltrace/ctf-ir/event-types.h
+++ b/include/babeltrace/ctf-ir/event-types.h
@@ -164,6 +164,28 @@ extern int bt_ctf_field_type_integer_set_encoding(
                struct bt_ctf_field_type *integer,
                enum ctf_string_encoding encoding);
 
+/**
+ * bt_ctf_field_type_integer_get_mapped_clock: get an integer type's mapped clock.
+ *
+ * @param integer Integer type.
+ *
+ * Returns the integer's mapped clock (if any), NULL on error.
+ */
+extern struct bt_ctf_clock *bt_ctf_field_type_integer_get_mapped_clock(
+               struct bt_ctf_field_type *integer);
+
+/**
+ * bt_ctf_field_type_integer_set_mapped_clock: set an integer type's mapped clock.
+ *
+ * @param integer Integer type.
+ * @param clock Clock to map.
+ *
+ * Returns 0 on success, a negative value on error.
+ */
+extern int bt_ctf_field_type_integer_set_mapped_clock(
+               struct bt_ctf_field_type *integer,
+               struct bt_ctf_clock *clock);
+
 /*
  * bt_ctf_field_type_enumeration_create: create an enumeration field type.
  *