Add support for clock mapping on integer field type
[babeltrace.git] / formats / ctf / ir / event-types.c
index 0c8eddc000fb9d1db9debefd1065334a28ccb366..9b772a5511409ac2e3ab0177ef2df9b4a5088c85 100644 (file)
@@ -1,9 +1,9 @@
 /*
  * event-types.c
  *
- * Babeltrace CTF Writer
+ * Babeltrace CTF IR - Event Types
  *
- * Copyright 2013 EfficiOS Inc.
+ * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -28,6 +28,8 @@
 
 #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>
 #include <stdlib.h>
 
 struct range_overlap_query {
-       int64_t range_start, range_end;
+       union {
+               uint64_t _unsigned;
+               int64_t _signed;
+       } range_start;
+
+       union {
+               uint64_t _unsigned;
+               int64_t _signed;
+       } range_end;
        int overlaps;
        GQuark mapping_name;
 };
 
+static
+void bt_ctf_field_type_destroy(struct bt_ctf_ref *);
 static
 void bt_ctf_field_type_integer_destroy(struct bt_ctf_ref *);
 static
@@ -139,22 +151,43 @@ type_serialize_func const type_serialize_funcs[] = {
 
 static
 void bt_ctf_field_type_integer_set_byte_order(struct bt_ctf_field_type *,
-               int byte_order);
+               int byte_order, int set_native);
+static
+void bt_ctf_field_type_enumeration_set_byte_order(struct bt_ctf_field_type *,
+               int byte_order, int set_native);
 static
 void bt_ctf_field_type_floating_point_set_byte_order(
-               struct bt_ctf_field_type *, int byte_order);
+               struct bt_ctf_field_type *, int byte_order, int set_native);
+static
+void bt_ctf_field_type_structure_set_byte_order(struct bt_ctf_field_type *,
+               int byte_order, int set_native);
+static
+void bt_ctf_field_type_variant_set_byte_order(struct bt_ctf_field_type *,
+               int byte_order, int set_native);
+static
+void bt_ctf_field_type_array_set_byte_order(struct bt_ctf_field_type *,
+               int byte_order, int set_native);
+static
+void bt_ctf_field_type_sequence_set_byte_order(struct bt_ctf_field_type *,
+               int byte_order, int set_native);
 
+/* The set_native flag only set the byte order if it is set to native */
 static
 void (* const set_byte_order_funcs[])(struct bt_ctf_field_type *,
-       int) = {
-       [CTF_TYPE_INTEGER] =
-               bt_ctf_field_type_integer_set_byte_order,
+               int byte_order, int set_native) = {
+       [CTF_TYPE_INTEGER] = bt_ctf_field_type_integer_set_byte_order,
+       [CTF_TYPE_ENUM] =
+               bt_ctf_field_type_enumeration_set_byte_order,
        [CTF_TYPE_FLOAT] =
                bt_ctf_field_type_floating_point_set_byte_order,
-       [CTF_TYPE_ENUM ... CTF_TYPE_SEQUENCE] = NULL,
+       [CTF_TYPE_STRUCT] =
+               bt_ctf_field_type_structure_set_byte_order,
+       [CTF_TYPE_VARIANT] = bt_ctf_field_type_variant_set_byte_order,
+       [CTF_TYPE_ARRAY] = bt_ctf_field_type_array_set_byte_order,
+       [CTF_TYPE_SEQUENCE] = bt_ctf_field_type_sequence_set_byte_order,
+       [CTF_TYPE_STRING] = NULL,
 };
 
-
 static
 void destroy_enumeration_mapping(struct enumeration_mapping *mapping)
 {
@@ -177,8 +210,26 @@ void check_ranges_overlap(gpointer element, gpointer query)
        struct enumeration_mapping *mapping = element;
        struct range_overlap_query *overlap_query = query;
 
-       if (mapping->range_start <= overlap_query->range_end
-               && overlap_query->range_start <= mapping->range_end) {
+       if (mapping->range_start._signed <= overlap_query->range_end._signed
+               && overlap_query->range_start._signed <=
+               mapping->range_end._signed) {
+               overlap_query->overlaps = 1;
+               overlap_query->mapping_name = mapping->string;
+       }
+
+       overlap_query->overlaps |=
+               mapping->string == overlap_query->mapping_name;
+}
+
+static
+void check_ranges_overlap_unsigned(gpointer element, gpointer query)
+{
+       struct enumeration_mapping *mapping = element;
+       struct range_overlap_query *overlap_query = query;
+
+       if (mapping->range_start._unsigned <= overlap_query->range_end._unsigned
+               && overlap_query->range_start._unsigned <=
+               mapping->range_end._unsigned) {
                overlap_query->overlaps = 1;
                overlap_query->mapping_name = mapping->string;
        }
@@ -187,6 +238,20 @@ void check_ranges_overlap(gpointer element, gpointer query)
                mapping->string == overlap_query->mapping_name;
 }
 
+static
+gint compare_enumeration_mappings_signed(struct enumeration_mapping **a,
+               struct enumeration_mapping **b)
+{
+       return ((*a)->range_start._signed < (*b)->range_start._signed) ? -1 : 1;
+}
+
+static
+gint compare_enumeration_mappings_unsigned(struct enumeration_mapping **a,
+               struct enumeration_mapping **b)
+{
+       return ((*a)->range_start._unsigned < (*b)->range_start._unsigned) ? -1 : 1;
+}
+
 static
 void bt_ctf_field_type_init(struct bt_ctf_field_type *type)
 {
@@ -239,6 +304,29 @@ end:
        return ret;
 }
 
+static
+void bt_ctf_field_type_destroy(struct bt_ctf_ref *ref)
+{
+       struct bt_ctf_field_type *type;
+       enum ctf_type_id type_id;
+
+       if (!ref) {
+               return;
+       }
+
+       type = container_of(ref, struct bt_ctf_field_type, ref_count);
+       type_id = type->declaration->id;
+       if (type_id <= CTF_TYPE_UNKNOWN ||
+               type_id >= NR_CTF_TYPES) {
+               return;
+       }
+
+       if (type->alias_name) {
+               g_string_free(type->alias_name, TRUE);
+       }
+       type_destroy_funcs[type_id](ref);
+}
+
 BT_HIDDEN
 int bt_ctf_field_type_validate(struct bt_ctf_field_type *type)
 {
@@ -249,12 +337,19 @@ int bt_ctf_field_type_validate(struct bt_ctf_field_type *type)
                goto end;
        }
 
-       if (type->declaration->id == CTF_TYPE_ENUM) {
+       switch (type->declaration->id) {
+       case CTF_TYPE_ENUM:
+       {
                struct bt_ctf_field_type_enumeration *enumeration =
                        container_of(type, struct bt_ctf_field_type_enumeration,
                        parent);
 
+               /* Ensure enum has entries */
                ret = enumeration->entries->len ? 0 : -1;
+               break;
+       }
+       default:
+               break;
        }
 end:
        return ret;
@@ -265,7 +360,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_integer_create(unsigned int size)
        struct bt_ctf_field_type_integer *integer =
                g_new0(struct bt_ctf_field_type_integer, 1);
 
-       if (!integer || size > 64) {
+       if (!integer || size == 0 || size > 64) {
                return NULL;
        }
 
@@ -278,6 +373,38 @@ struct bt_ctf_field_type *bt_ctf_field_type_integer_create(unsigned int size)
        return &integer->parent;
 }
 
+int bt_ctf_field_type_integer_get_size(struct bt_ctf_field_type *type)
+{
+       int ret = 0;
+       struct bt_ctf_field_type_integer *integer;
+
+       if (!type || type->declaration->id != CTF_TYPE_INTEGER) {
+               ret = -1;
+               goto end;
+       }
+
+       integer = container_of(type, struct bt_ctf_field_type_integer, parent);
+       ret = (int) integer->declaration.len;
+end:
+       return ret;
+}
+
+int bt_ctf_field_type_integer_get_signed(struct bt_ctf_field_type *type)
+{
+       int ret = 0;
+       struct bt_ctf_field_type_integer *integer;
+
+       if (!type || type->declaration->id != CTF_TYPE_INTEGER) {
+               ret = -1;
+               goto end;
+       }
+
+       integer = container_of(type, struct bt_ctf_field_type_integer, parent);
+       ret = integer->declaration.signedness;
+end:
+       return ret;
+}
+
 int bt_ctf_field_type_integer_set_signed(struct bt_ctf_field_type *type,
                int is_signed)
 {
@@ -291,12 +418,23 @@ int bt_ctf_field_type_integer_set_signed(struct bt_ctf_field_type *type,
        }
 
        integer = container_of(type, struct bt_ctf_field_type_integer, parent);
-       if (is_signed && integer->declaration.len <= 1) {
-               ret = -1;
+       integer->declaration.signedness = !!is_signed;
+end:
+       return ret;
+}
+
+enum bt_ctf_integer_base bt_ctf_field_type_integer_get_base(
+               struct bt_ctf_field_type *type)
+{
+       enum bt_ctf_integer_base ret = BT_CTF_INTEGER_BASE_UNKNOWN;
+       struct bt_ctf_field_type_integer *integer;
+
+       if (!type || type->declaration->id != CTF_TYPE_INTEGER) {
                goto end;
        }
 
-       integer->declaration.signedness = !!is_signed;
+       integer = container_of(type, struct bt_ctf_field_type_integer, parent);
+       ret = integer->declaration.base;
 end:
        return ret;
 }
@@ -330,6 +468,22 @@ end:
        return ret;
 }
 
+enum ctf_string_encoding bt_ctf_field_type_integer_get_encoding(
+               struct bt_ctf_field_type *type)
+{
+       enum ctf_string_encoding ret = CTF_STRING_UNKNOWN;
+       struct bt_ctf_field_type_integer *integer;
+
+       if (!type || type->declaration->id != CTF_TYPE_INTEGER) {
+               goto end;
+       }
+
+       integer = container_of(type, struct bt_ctf_field_type_integer, parent);
+       ret = integer->declaration.encoding;
+end:
+       return ret;
+}
+
 int bt_ctf_field_type_integer_set_encoding(struct bt_ctf_field_type *type,
                enum ctf_string_encoding encoding)
 {
@@ -350,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)
 {
@@ -359,6 +558,10 @@ struct bt_ctf_field_type *bt_ctf_field_type_enumeration_create(
                goto error;
        }
 
+       if (integer_container_type->declaration->id != CTF_TYPE_INTEGER) {
+               goto error;
+       }
+
        enumeration = g_new0(struct bt_ctf_field_type_enumeration, 1);
        if (!enumeration) {
                goto error;
@@ -377,6 +580,28 @@ error:
        return NULL;
 }
 
+struct bt_ctf_field_type *bt_ctf_field_type_enumeration_get_container_type(
+               struct bt_ctf_field_type *type)
+{
+       struct bt_ctf_field_type *container_type = NULL;
+       struct bt_ctf_field_type_enumeration *enumeration_type;
+
+       if (!type) {
+               goto end;
+       }
+
+       if (type->declaration->id != CTF_TYPE_ENUM) {
+               goto end;
+       }
+
+       enumeration_type = container_of(type,
+               struct bt_ctf_field_type_enumeration, parent);
+       container_type = enumeration_type->container;
+       bt_ctf_field_type_get(container_type);
+end:
+       return container_type;
+}
+
 int bt_ctf_field_type_enumeration_add_mapping(
                struct bt_ctf_field_type *type, const char *string,
                int64_t range_start, int64_t range_end)
@@ -407,8 +632,9 @@ int bt_ctf_field_type_enumeration_add_mapping(
        }
 
        mapping_name = g_quark_from_string(escaped_string);
-       query = (struct range_overlap_query) { .range_start = range_start,
-               .range_end = range_end,
+       query = (struct range_overlap_query) {
+               .range_start._signed = range_start,
+               .range_end._signed = range_end,
                .mapping_name = mapping_name,
                .overlaps = 0 };
        enumeration = container_of(type, struct bt_ctf_field_type_enumeration,
@@ -427,113 +653,443 @@ int bt_ctf_field_type_enumeration_add_mapping(
                goto error_free;
        }
 
-       *mapping = (struct enumeration_mapping) {.range_start = range_start,
-               .range_end = range_end, .string = mapping_name};
+       *mapping = (struct enumeration_mapping) {
+               .range_start._signed = range_start,
+               .range_end._signed = range_end, .string = mapping_name};
        g_ptr_array_add(enumeration->entries, mapping);
+       g_ptr_array_sort(enumeration->entries,
+               (GCompareFunc)compare_enumeration_mappings_signed);
 error_free:
        free(escaped_string);
 end:
        return ret;
 }
 
-struct bt_ctf_field_type *bt_ctf_field_type_floating_point_create(void)
+int bt_ctf_field_type_enumeration_add_mapping_unsigned(
+               struct bt_ctf_field_type *type, const char *string,
+               uint64_t range_start, uint64_t range_end)
 {
-       struct bt_ctf_field_type_floating_point *floating_point =
-               g_new0(struct bt_ctf_field_type_floating_point, 1);
+       int ret = 0;
+       GQuark mapping_name;
+       struct enumeration_mapping *mapping;
+       struct bt_ctf_field_type_enumeration *enumeration;
+       struct range_overlap_query query;
+       char *escaped_string;
 
-       if (!floating_point) {
+       if (!type || (type->declaration->id != CTF_TYPE_ENUM) ||
+               type->frozen ||
+               (range_end < range_start)) {
+               ret = -1;
                goto end;
        }
 
-       floating_point->declaration.sign = &floating_point->sign;
-       floating_point->declaration.mantissa = &floating_point->mantissa;
-       floating_point->declaration.exp = &floating_point->exp;
-       floating_point->sign.len = 1;
-       floating_point->parent.declaration = &floating_point->declaration.p;
-       floating_point->parent.declaration->id = CTF_TYPE_FLOAT;
-       floating_point->declaration.exp->len =
-               sizeof(float) * CHAR_BIT - FLT_MANT_DIG;
-       floating_point->declaration.mantissa->len = FLT_MANT_DIG - 1;
-       floating_point->sign.p.alignment = 1;
-       floating_point->mantissa.p.alignment = 1;
-       floating_point->exp.p.alignment = 1;
+       if (!string || strlen(string) == 0) {
+               ret = -1;
+               goto end;
+       }
 
-       bt_ctf_field_type_init(&floating_point->parent);
-end:
-       return floating_point ? &floating_point->parent : NULL;
-}
+       escaped_string = g_strescape(string, NULL);
+       if (!escaped_string) {
+               ret = -1;
+               goto end;
+       }
 
-int bt_ctf_field_type_floating_point_set_exponent_digits(
-               struct bt_ctf_field_type *type,
-               unsigned int exponent_digits)
-{
-       int ret = 0;
-       struct bt_ctf_field_type_floating_point *floating_point;
+       mapping_name = g_quark_from_string(escaped_string);
+       query = (struct range_overlap_query) {
+               .range_start._unsigned = range_start,
+               .range_end._unsigned = range_end,
+               .mapping_name = mapping_name,
+               .overlaps = 0 };
+       enumeration = container_of(type, struct bt_ctf_field_type_enumeration,
+               parent);
 
-       if (!type || type->frozen ||
-               (type->declaration->id != CTF_TYPE_FLOAT)) {
+       /* Check that the range does not overlap with one already present */
+       g_ptr_array_foreach(enumeration->entries, check_ranges_overlap_unsigned,
+               &query);
+       if (query.overlaps) {
                ret = -1;
-               goto end;
+               goto error_free;
        }
 
-       floating_point = container_of(type,
-               struct bt_ctf_field_type_floating_point, parent);
-       if ((exponent_digits != sizeof(float) * CHAR_BIT - FLT_MANT_DIG) &&
-               (exponent_digits != sizeof(double) * CHAR_BIT - DBL_MANT_DIG) &&
-               (exponent_digits !=
-                       sizeof(long double) * CHAR_BIT - LDBL_MANT_DIG)) {
+       mapping = g_new(struct enumeration_mapping, 1);
+       if (!mapping) {
                ret = -1;
-               goto end;
+               goto error_free;
        }
 
-       floating_point->declaration.exp->len = exponent_digits;
+       *mapping = (struct enumeration_mapping) {
+               .range_start._unsigned = range_start,
+               .range_end._unsigned = range_end, .string = mapping_name};
+       g_ptr_array_add(enumeration->entries, mapping);
+       g_ptr_array_sort(enumeration->entries,
+               (GCompareFunc)compare_enumeration_mappings_unsigned);
+error_free:
+       free(escaped_string);
 end:
        return ret;
 }
 
-int bt_ctf_field_type_floating_point_set_mantissa_digits(
-               struct bt_ctf_field_type *type,
-               unsigned int mantissa_digits)
+const char *bt_ctf_field_type_enumeration_get_mapping_name_unsigned(
+               struct bt_ctf_field_type_enumeration *enumeration_type,
+               uint64_t value)
 {
-       int ret = 0;
-       struct bt_ctf_field_type_floating_point *floating_point;
+       const char *name = NULL;
+       struct range_overlap_query query =
+               (struct range_overlap_query) {
+               .range_start._unsigned = value,
+               .range_end._unsigned = value,
+               .overlaps = 0 };
 
-       if (!type || type->frozen ||
-               (type->declaration->id != CTF_TYPE_FLOAT)) {
-               ret = -1;
+       g_ptr_array_foreach(enumeration_type->entries,
+               check_ranges_overlap_unsigned,
+               &query);
+       if (!query.overlaps) {
                goto end;
        }
 
-       floating_point = container_of(type,
-               struct bt_ctf_field_type_floating_point, parent);
+       name = g_quark_to_string(query.mapping_name);
+end:
+       return name;
+}
 
-       if ((mantissa_digits != FLT_MANT_DIG) &&
-               (mantissa_digits != DBL_MANT_DIG) &&
-               (mantissa_digits != LDBL_MANT_DIG)) {
-               ret = -1;
+const char *bt_ctf_field_type_enumeration_get_mapping_name_signed(
+               struct bt_ctf_field_type_enumeration *enumeration_type,
+               int64_t value)
+{
+       const char *name = NULL;
+       struct range_overlap_query query =
+               (struct range_overlap_query) {
+               .range_start._signed = value,
+               .range_end._signed = value,
+               .overlaps = 0 };
+
+       g_ptr_array_foreach(enumeration_type->entries, check_ranges_overlap,
+               &query);
+       if (!query.overlaps) {
                goto end;
        }
 
-       floating_point->declaration.mantissa->len = mantissa_digits - 1;
+       name = g_quark_to_string(query.mapping_name);
 end:
-       return ret;
+       return name;
 }
 
-struct bt_ctf_field_type *bt_ctf_field_type_structure_create(void)
+int bt_ctf_field_type_enumeration_get_mapping_count(
+               struct bt_ctf_field_type *type)
 {
-       struct bt_ctf_field_type_structure *structure =
-               g_new0(struct bt_ctf_field_type_structure, 1);
+       int ret = 0;
+       struct bt_ctf_field_type_enumeration *enumeration;
 
-       if (!structure) {
-               goto error;
-       }
+       if (!type || (type->declaration->id != CTF_TYPE_ENUM)) {
+               ret = -1;
+               goto end;
+       }
+
+       enumeration = container_of(type, struct bt_ctf_field_type_enumeration,
+               parent);
+       ret = (int) enumeration->entries->len;
+end:
+       return ret;
+}
+
+static inline
+struct enumeration_mapping *get_enumeration_mapping(
+       struct bt_ctf_field_type *type, int index)
+{
+       struct enumeration_mapping *mapping = NULL;
+       struct bt_ctf_field_type_enumeration *enumeration;
+
+       enumeration = container_of(type, struct bt_ctf_field_type_enumeration,
+               parent);
+       if (index >= enumeration->entries->len) {
+               goto end;
+       }
+
+       mapping = g_ptr_array_index(enumeration->entries, index);
+end:
+       return mapping;
+}
+
+int bt_ctf_field_type_enumeration_get_mapping(
+               struct bt_ctf_field_type *type, int index,
+               const char **string, int64_t *range_start, int64_t *range_end)
+{
+       struct enumeration_mapping *mapping;
+       int ret = 0;
+
+       if (!type || index < 0 || !string || !range_start || !range_end ||
+               (type->declaration->id != CTF_TYPE_ENUM)) {
+               ret = -1;
+               goto end;
+       }
+
+       mapping = get_enumeration_mapping(type, index);
+       if (!mapping) {
+               ret = -1;
+               goto end;
+       }
+
+       *string = g_quark_to_string(mapping->string);
+       *range_start = mapping->range_start._signed;
+       *range_end = mapping->range_end._signed;
+end:
+       return ret;
+}
+
+int bt_ctf_field_type_enumeration_get_mapping_unsigned(
+               struct bt_ctf_field_type *type, int index,
+               const char **string, uint64_t *range_start, uint64_t *range_end)
+{
+       struct enumeration_mapping *mapping;
+       int ret = 0;
+
+       if (!type || index < 0 || !string || !range_start || !range_end ||
+               (type->declaration->id != CTF_TYPE_ENUM)) {
+               ret = -1;
+               goto end;
+       }
+
+       mapping = get_enumeration_mapping(type, index);
+       if (!mapping) {
+               ret = -1;
+               goto end;
+       }
+
+       *string = g_quark_to_string(mapping->string);
+       *range_start = mapping->range_start._unsigned;
+       *range_end = mapping->range_end._unsigned;
+end:
+       return ret;
+}
+
+int bt_ctf_field_type_enumeration_get_mapping_index_by_name(
+               struct bt_ctf_field_type *type, const char *name)
+{
+       GQuark name_quark;
+       struct bt_ctf_field_type_enumeration *enumeration;
+       int i, ret = 0;
+
+       if (!type || !name ||
+               (type->declaration->id != CTF_TYPE_ENUM)) {
+               ret = -1;
+               goto end;
+       }
+
+       name_quark = g_quark_try_string(name);
+       if (!name_quark) {
+               ret = -1;
+               goto end;
+       }
+
+       enumeration = container_of(type,
+               struct bt_ctf_field_type_enumeration, parent);
+       for (i = 0; i < enumeration->entries->len; i++) {
+               struct enumeration_mapping *mapping =
+                       get_enumeration_mapping(type, i);
+
+               if (mapping->string == name_quark) {
+                       ret = i;
+                       goto end;
+               }
+       }
+
+       ret = -1;
+end:
+       return ret;
+}
+
+int bt_ctf_field_type_enumeration_get_mapping_index_by_value(
+               struct bt_ctf_field_type *type, int64_t value)
+{
+       struct bt_ctf_field_type_enumeration *enumeration;
+       int i, ret = 0;
+
+       if (!type || (type->declaration->id != CTF_TYPE_ENUM)) {
+               ret = -1;
+               goto end;
+       }
+
+       enumeration = container_of(type,
+               struct bt_ctf_field_type_enumeration, parent);
+       for (i = 0; i < enumeration->entries->len; i++) {
+               struct enumeration_mapping *mapping =
+                       get_enumeration_mapping(type, i);
+
+               if (value >= mapping->range_start._signed &&
+                       value <= mapping->range_end._signed) {
+                       ret = i;
+                       goto end;
+               }
+       }
+
+       ret = -1;
+end:
+       return ret;
+}
+
+int bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value(
+               struct bt_ctf_field_type *type, uint64_t value)
+{
+       struct bt_ctf_field_type_enumeration *enumeration;
+       int i, ret = 0;
+
+       if (!type || (type->declaration->id != CTF_TYPE_ENUM)) {
+               ret = -1;
+               goto end;
+       }
+
+       enumeration = container_of(type,
+               struct bt_ctf_field_type_enumeration, parent);
+       for (i = 0; i < enumeration->entries->len; i++) {
+               struct enumeration_mapping *mapping =
+                       get_enumeration_mapping(type, i);
+
+               if (value >= mapping->range_start._unsigned &&
+                       value <= mapping->range_end._unsigned) {
+                       ret = i;
+                       goto end;
+               }
+       }
+
+       ret = -1;
+end:
+       return ret;
+}
+
+struct bt_ctf_field_type *bt_ctf_field_type_floating_point_create(void)
+{
+       struct bt_ctf_field_type_floating_point *floating_point =
+               g_new0(struct bt_ctf_field_type_floating_point, 1);
+
+       if (!floating_point) {
+               goto end;
+       }
+
+       floating_point->declaration.sign = &floating_point->sign;
+       floating_point->declaration.mantissa = &floating_point->mantissa;
+       floating_point->declaration.exp = &floating_point->exp;
+       floating_point->sign.len = 1;
+       floating_point->parent.declaration = &floating_point->declaration.p;
+       floating_point->parent.declaration->id = CTF_TYPE_FLOAT;
+       floating_point->declaration.exp->len =
+               sizeof(float) * CHAR_BIT - FLT_MANT_DIG;
+       floating_point->declaration.mantissa->len = FLT_MANT_DIG - 1;
+       floating_point->sign.p.alignment = 1;
+       floating_point->mantissa.p.alignment = 1;
+       floating_point->exp.p.alignment = 1;
+
+       bt_ctf_field_type_init(&floating_point->parent);
+end:
+       return floating_point ? &floating_point->parent : NULL;
+}
+
+int bt_ctf_field_type_floating_point_get_exponent_digits(
+               struct bt_ctf_field_type *type)
+{
+       int ret = 0;
+       struct bt_ctf_field_type_floating_point *floating_point;
+
+       if (!type || (type->declaration->id != CTF_TYPE_FLOAT)) {
+               ret = -1;
+               goto end;
+       }
+
+       floating_point = container_of(type,
+               struct bt_ctf_field_type_floating_point, parent);
+       ret = (int) floating_point->declaration.exp->len;
+end:
+       return ret;
+}
+
+int bt_ctf_field_type_floating_point_set_exponent_digits(
+               struct bt_ctf_field_type *type,
+               unsigned int exponent_digits)
+{
+       int ret = 0;
+       struct bt_ctf_field_type_floating_point *floating_point;
+
+       if (!type || type->frozen ||
+               (type->declaration->id != CTF_TYPE_FLOAT)) {
+               ret = -1;
+               goto end;
+       }
+
+       floating_point = container_of(type,
+               struct bt_ctf_field_type_floating_point, parent);
+       if ((exponent_digits != sizeof(float) * CHAR_BIT - FLT_MANT_DIG) &&
+               (exponent_digits != sizeof(double) * CHAR_BIT - DBL_MANT_DIG) &&
+               (exponent_digits !=
+                       sizeof(long double) * CHAR_BIT - LDBL_MANT_DIG)) {
+               ret = -1;
+               goto end;
+       }
+
+       floating_point->declaration.exp->len = exponent_digits;
+end:
+       return ret;
+}
+
+int bt_ctf_field_type_floating_point_get_mantissa_digits(
+               struct bt_ctf_field_type *type)
+{
+       int ret = 0;
+       struct bt_ctf_field_type_floating_point *floating_point;
+
+       if (!type || (type->declaration->id != CTF_TYPE_FLOAT)) {
+               ret = -1;
+               goto end;
+       }
+
+       floating_point = container_of(type,
+               struct bt_ctf_field_type_floating_point, parent);
+       ret = (int) floating_point->mantissa.len + 1;
+end:
+       return ret;
+}
+
+int bt_ctf_field_type_floating_point_set_mantissa_digits(
+               struct bt_ctf_field_type *type,
+               unsigned int mantissa_digits)
+{
+       int ret = 0;
+       struct bt_ctf_field_type_floating_point *floating_point;
+
+       if (!type || type->frozen ||
+               (type->declaration->id != CTF_TYPE_FLOAT)) {
+               ret = -1;
+               goto end;
+       }
+
+       floating_point = container_of(type,
+               struct bt_ctf_field_type_floating_point, parent);
+
+       if ((mantissa_digits != FLT_MANT_DIG) &&
+               (mantissa_digits != DBL_MANT_DIG) &&
+               (mantissa_digits != LDBL_MANT_DIG)) {
+               ret = -1;
+               goto end;
+       }
+
+       floating_point->declaration.mantissa->len = mantissa_digits - 1;
+end:
+       return ret;
+}
+
+struct bt_ctf_field_type *bt_ctf_field_type_structure_create(void)
+{
+       struct bt_ctf_field_type_structure *structure =
+               g_new0(struct bt_ctf_field_type_structure, 1);
+
+       if (!structure) {
+               goto error;
+       }
 
        structure->parent.declaration = &structure->declaration.p;
        structure->parent.declaration->id = CTF_TYPE_STRUCT;
-       bt_ctf_field_type_init(&structure->parent);
        structure->fields = g_ptr_array_new_with_free_func(
                (GDestroyNotify)destroy_structure_field);
        structure->field_name_to_index = g_hash_table_new(NULL, NULL);
+       bt_ctf_field_type_init(&structure->parent);
        return &structure->parent;
 error:
        return NULL;
@@ -547,9 +1103,10 @@ int bt_ctf_field_type_structure_add_field(struct bt_ctf_field_type *type,
        struct bt_ctf_field_type_structure *structure;
 
        if (!type || !field_type || type->frozen ||
-               validate_identifier(field_name) ||
+               bt_ctf_validate_identifier(field_name) ||
                (type->declaration->id != CTF_TYPE_STRUCT) ||
                bt_ctf_field_type_validate(field_type)) {
+               ret = -1;
                goto end;
        }
 
@@ -569,12 +1126,92 @@ end:
        return ret;
 }
 
+int bt_ctf_field_type_structure_get_field_count(
+               struct bt_ctf_field_type *type)
+{
+       int ret = 0;
+       struct bt_ctf_field_type_structure *structure;
+
+       if (!type || (type->declaration->id != CTF_TYPE_STRUCT)) {
+               ret = -1;
+               goto end;
+       }
+
+       structure = container_of(type, struct bt_ctf_field_type_structure,
+               parent);
+       ret = (int) structure->fields->len;
+end:
+       return ret;
+}
+
+int bt_ctf_field_type_structure_get_field(struct bt_ctf_field_type *type,
+               const char **field_name, struct bt_ctf_field_type **field_type,
+               int index)
+{
+       struct bt_ctf_field_type_structure *structure;
+       struct structure_field *field;
+       int ret = 0;
+
+       if (!type || index < 0 || !field_name || !field_type ||
+               (type->declaration->id != CTF_TYPE_STRUCT)) {
+               ret = -1;
+               goto end;
+       }
+
+       structure = container_of(type, struct bt_ctf_field_type_structure,
+               parent);
+       if (index >= structure->fields->len) {
+               ret = -1;
+               goto end;
+       }
+
+       field = g_ptr_array_index(structure->fields, index);
+       *field_type = field->type;
+       bt_ctf_field_type_get(field->type);
+       *field_name = g_quark_to_string(field->name);
+end:
+       return ret;
+}
+
+struct bt_ctf_field_type *bt_ctf_field_type_structure_get_field_type_by_name(
+               struct bt_ctf_field_type *type,
+               const char *name)
+{
+       size_t index;
+       GQuark name_quark;
+       struct structure_field *field;
+       struct bt_ctf_field_type_structure *structure;
+       struct bt_ctf_field_type *field_type = NULL;
+
+       if (!type || !name) {
+               goto end;
+       }
+
+       name_quark = g_quark_try_string(name);
+       if (!name_quark) {
+               goto end;
+       }
+
+       structure = container_of(type, struct bt_ctf_field_type_structure,
+               parent);
+       if (!g_hash_table_lookup_extended(structure->field_name_to_index,
+               GUINT_TO_POINTER(name_quark), NULL, (gpointer *)&index)) {
+               goto end;
+       }
+
+       field = structure->fields->pdata[index];
+       field_type = field->type;
+       bt_ctf_field_type_get(field_type);
+end:
+       return field_type;
+}
+
 struct bt_ctf_field_type *bt_ctf_field_type_variant_create(
        struct bt_ctf_field_type *enum_tag, const char *tag_name)
 {
        struct bt_ctf_field_type_variant *variant = NULL;
 
-       if (!enum_tag || validate_identifier(tag_name) ||
+       if (!enum_tag || bt_ctf_validate_identifier(tag_name) ||
                (enum_tag->declaration->id != CTF_TYPE_ENUM)) {
                goto error;
        }
@@ -587,18 +1224,51 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_create(
        variant->parent.declaration = &variant->declaration.p;
        variant->parent.declaration->id = CTF_TYPE_VARIANT;
        variant->tag_name = g_string_new(tag_name);
-       bt_ctf_field_type_init(&variant->parent);
        variant->field_name_to_index = g_hash_table_new(NULL, NULL);
        variant->fields = g_ptr_array_new_with_free_func(
                (GDestroyNotify)destroy_structure_field);
        bt_ctf_field_type_get(enum_tag);
        variant->tag = container_of(enum_tag,
                struct bt_ctf_field_type_enumeration, parent);
+       bt_ctf_field_type_init(&variant->parent);
        return &variant->parent;
 error:
        return NULL;
 }
 
+struct bt_ctf_field_type *bt_ctf_field_type_variant_get_tag_type(
+               struct bt_ctf_field_type *type)
+{
+       struct bt_ctf_field_type_variant *variant;
+       struct bt_ctf_field_type *tag_type = NULL;
+
+       if (!type || (type->declaration->id != CTF_TYPE_VARIANT)) {
+               goto end;
+       }
+
+       variant = container_of(type, struct bt_ctf_field_type_variant, parent);
+       tag_type = &variant->tag->parent;
+       bt_ctf_field_type_get(tag_type);
+end:
+       return tag_type;
+}
+
+const char *bt_ctf_field_type_variant_get_tag_name(
+               struct bt_ctf_field_type *type)
+{
+       struct bt_ctf_field_type_variant *variant;
+       const char *tag_name = NULL;
+
+       if (!type || (type->declaration->id != CTF_TYPE_VARIANT)) {
+               goto end;
+       }
+
+       variant = container_of(type, struct bt_ctf_field_type_variant, parent);
+       tag_name = variant->tag_name->str;
+end:
+       return tag_name;
+}
+
 int bt_ctf_field_type_variant_add_field(struct bt_ctf_field_type *type,
                struct bt_ctf_field_type *field_type,
                const char *field_name)
@@ -609,31 +1279,133 @@ int bt_ctf_field_type_variant_add_field(struct bt_ctf_field_type *type,
        struct bt_ctf_field_type_variant *variant;
        GQuark field_name_quark = g_quark_from_string(field_name);
 
-       if (!type || !field_type || type->frozen ||
-               validate_identifier(field_name) ||
-               (type->declaration->id != CTF_TYPE_VARIANT) ||
-               bt_ctf_field_type_validate(field_type)) {
+       if (!type || !field_type || type->frozen ||
+               bt_ctf_validate_identifier(field_name) ||
+               (type->declaration->id != CTF_TYPE_VARIANT) ||
+               bt_ctf_field_type_validate(field_type)) {
+               ret = -1;
+               goto end;
+       }
+
+       variant = container_of(type, struct bt_ctf_field_type_variant, parent);
+       /* Make sure this name is present in the enum tag */
+       for (i = 0; i < variant->tag->entries->len; i++) {
+               struct enumeration_mapping *mapping =
+                       g_ptr_array_index(variant->tag->entries, i);
+
+               if (mapping->string == field_name_quark) {
+                       name_found = 1;
+                       break;
+               }
+       }
+
+       if (!name_found || add_structure_field(variant->fields,
+               variant->field_name_to_index, field_type, field_name)) {
+               ret = -1;
+               goto end;
+       }
+end:
+       return ret;
+}
+
+struct bt_ctf_field_type *bt_ctf_field_type_variant_get_field_type_by_name(
+               struct bt_ctf_field_type *type,
+               const char *field_name)
+{
+       size_t index;
+       GQuark name_quark;
+       struct structure_field *field;
+       struct bt_ctf_field_type_variant *variant;
+       struct bt_ctf_field_type *field_type = NULL;
+
+       if (!type || !field_name) {
+               goto end;
+       }
+
+       name_quark = g_quark_try_string(field_name);
+       if (!name_quark) {
+               goto end;
+       }
+
+       variant = container_of(type, struct bt_ctf_field_type_variant, parent);
+       if (!g_hash_table_lookup_extended(variant->field_name_to_index,
+               GUINT_TO_POINTER(name_quark), NULL, (gpointer *)&index)) {
+               goto end;
+       }
+
+       field = g_ptr_array_index(variant->fields, index);
+       field_type = field->type;
+       bt_ctf_field_type_get(field_type);
+end:
+       return field_type;
+}
+
+struct bt_ctf_field_type *bt_ctf_field_type_variant_get_field_type_from_tag(
+               struct bt_ctf_field_type *type,
+               struct bt_ctf_field *tag)
+{
+       const char *enum_value;
+       struct bt_ctf_field_type *field_type = NULL;
+
+       if (!type || !tag || type->declaration->id != CTF_TYPE_VARIANT) {
+               goto end;
+       }
+
+       enum_value = bt_ctf_field_enumeration_get_mapping_name(tag);
+       if (!enum_value) {
+               goto end;
+       }
+
+       /* Already increments field_type's reference count */
+       field_type = bt_ctf_field_type_variant_get_field_type_by_name(
+               type, enum_value);
+end:
+       return field_type;
+}
+
+int bt_ctf_field_type_variant_get_field_count(struct bt_ctf_field_type *type)
+{
+       int ret = 0;
+       struct bt_ctf_field_type_variant *variant;
+
+       if (!type || (type->declaration->id != CTF_TYPE_VARIANT)) {
+               ret = -1;
+               goto end;
+       }
+
+       variant = container_of(type, struct bt_ctf_field_type_variant,
+               parent);
+       ret = (int) variant->fields->len;
+end:
+       return ret;
+
+}
+
+int bt_ctf_field_type_variant_get_field(struct bt_ctf_field_type *type,
+               const char **field_name, struct bt_ctf_field_type **field_type,
+               int index)
+{
+       struct bt_ctf_field_type_variant *variant;
+       struct structure_field *field;
+       int ret = 0;
+
+       if (!type || index < 0 || !field_name || !field_type ||
+               (type->declaration->id != CTF_TYPE_VARIANT)) {
                ret = -1;
                goto end;
        }
 
-       variant = container_of(type, struct bt_ctf_field_type_variant, parent);
-       /* Make sure this name is present in the enum tag */
-       for (i = 0; i < variant->tag->entries->len; i++) {
-               struct enumeration_mapping *mapping =
-                       g_ptr_array_index(variant->tag->entries, i);
-
-               if (mapping->string == field_name_quark) {
-                       name_found = 1;
-                       break;
-               }
-       }
-
-       if (!name_found || add_structure_field(variant->fields,
-               variant->field_name_to_index, field_type, field_name)) {
+       variant = container_of(type, struct bt_ctf_field_type_variant,
+               parent);
+       if (index >= variant->fields->len) {
                ret = -1;
                goto end;
        }
+
+       field = g_ptr_array_index(variant->fields, index);
+       *field_type = field->type;
+       bt_ctf_field_type_get(field->type);
+       *field_name = g_quark_to_string(field->name);
 end:
        return ret;
 }
@@ -656,10 +1428,11 @@ struct bt_ctf_field_type *bt_ctf_field_type_array_create(
 
        array->parent.declaration = &array->declaration.p;
        array->parent.declaration->id = CTF_TYPE_ARRAY;
-       bt_ctf_field_type_init(&array->parent);
+
        bt_ctf_field_type_get(element_type);
        array->element_type = element_type;
        array->length = length;
+       bt_ctf_field_type_init(&array->parent);
        array->parent.declaration->alignment =
                element_type->declaration->alignment;
        return &array->parent;
@@ -667,13 +1440,46 @@ error:
        return NULL;
 }
 
+struct bt_ctf_field_type *bt_ctf_field_type_array_get_element_type(
+               struct bt_ctf_field_type *type)
+{
+       struct bt_ctf_field_type *ret = NULL;
+       struct bt_ctf_field_type_array *array;
+
+       if (!type || (type->declaration->id != CTF_TYPE_ARRAY)) {
+               goto end;
+       }
+
+       array = container_of(type, struct bt_ctf_field_type_array, parent);
+       ret = array->element_type;
+       bt_ctf_field_type_get(ret);
+end:
+       return ret;
+}
+
+int64_t bt_ctf_field_type_array_get_length(struct bt_ctf_field_type *type)
+{
+       int64_t ret;
+       struct bt_ctf_field_type_array *array;
+
+       if (!type || (type->declaration->id != CTF_TYPE_ARRAY)) {
+               ret = -1;
+               goto end;
+       }
+
+       array = container_of(type, struct bt_ctf_field_type_array, parent);
+       ret = (int64_t) array->length;
+end:
+       return ret;
+}
+
 struct bt_ctf_field_type *bt_ctf_field_type_sequence_create(
                struct bt_ctf_field_type *element_type,
                const char *length_field_name)
 {
        struct bt_ctf_field_type_sequence *sequence = NULL;
 
-       if (!element_type || validate_identifier(length_field_name) ||
+       if (!element_type || bt_ctf_validate_identifier(length_field_name) ||
                bt_ctf_field_type_validate(element_type)) {
                goto error;
        }
@@ -685,10 +1491,10 @@ struct bt_ctf_field_type *bt_ctf_field_type_sequence_create(
 
        sequence->parent.declaration = &sequence->declaration.p;
        sequence->parent.declaration->id = CTF_TYPE_SEQUENCE;
-       bt_ctf_field_type_init(&sequence->parent);
        bt_ctf_field_type_get(element_type);
        sequence->element_type = element_type;
        sequence->length_field_name = g_string_new(length_field_name);
+       bt_ctf_field_type_init(&sequence->parent);
        sequence->parent.declaration->alignment =
                element_type->declaration->alignment;
        return &sequence->parent;
@@ -696,6 +1502,41 @@ error:
        return NULL;
 }
 
+struct bt_ctf_field_type *bt_ctf_field_type_sequence_get_element_type(
+               struct bt_ctf_field_type *type)
+{
+       struct bt_ctf_field_type *ret = NULL;
+       struct bt_ctf_field_type_sequence *sequence;
+
+       if (!type || (type->declaration->id != CTF_TYPE_SEQUENCE)) {
+               goto end;
+       }
+
+       sequence = container_of(type, struct bt_ctf_field_type_sequence,
+               parent);
+       ret = sequence->element_type;
+       bt_ctf_field_type_get(ret);
+end:
+       return ret;
+}
+
+const char *bt_ctf_field_type_sequence_get_length_field_name(
+               struct bt_ctf_field_type *type)
+{
+       const char *ret = NULL;
+       struct bt_ctf_field_type_sequence *sequence;
+
+       if (!type || (type->declaration->id != CTF_TYPE_SEQUENCE)) {
+               goto end;
+       }
+
+       sequence = container_of(type, struct bt_ctf_field_type_sequence,
+               parent);
+       ret = sequence->length_field_name->str;
+end:
+       return ret;
+}
+
 struct bt_ctf_field_type *bt_ctf_field_type_string_create(void)
 {
        struct bt_ctf_field_type_string *string =
@@ -713,8 +1554,24 @@ struct bt_ctf_field_type *bt_ctf_field_type_string_create(void)
        return &string->parent;
 }
 
-int bt_ctf_field_type_string_set_encoding(
-               struct bt_ctf_field_type *type,
+enum ctf_string_encoding bt_ctf_field_type_string_get_encoding(
+               struct bt_ctf_field_type *type)
+{
+       struct bt_ctf_field_type_string *string;
+       enum ctf_string_encoding ret = CTF_STRING_UNKNOWN;
+
+       if (!type || (type->declaration->id != CTF_TYPE_STRING)) {
+               goto end;
+       }
+
+       string = container_of(type, struct bt_ctf_field_type_string,
+               parent);
+       ret = string->declaration.encoding;
+end:
+       return ret;
+}
+
+int bt_ctf_field_type_string_set_encoding(struct bt_ctf_field_type *type,
                enum ctf_string_encoding encoding)
 {
        int ret = 0;
@@ -733,6 +1590,20 @@ end:
        return ret;
 }
 
+int bt_ctf_field_type_get_alignment(struct bt_ctf_field_type *type)
+{
+       int ret;
+
+       if (!type) {
+               ret = -1;
+               goto end;
+       }
+
+       ret = (int) type->declaration->alignment;
+end:
+       return ret;
+}
+
 int bt_ctf_field_type_set_alignment(struct bt_ctf_field_type *type,
                unsigned int alignment)
 {
@@ -756,6 +1627,54 @@ end:
        return ret;
 }
 
+enum bt_ctf_byte_order bt_ctf_field_type_get_byte_order(
+               struct bt_ctf_field_type *type)
+{
+       enum bt_ctf_byte_order ret = BT_CTF_BYTE_ORDER_UNKNOWN;
+       int internal_byte_order = -1;
+
+       if (!type) {
+               goto end;
+       }
+
+       switch (type->declaration->id) {
+       case CTF_TYPE_INTEGER:
+       {
+               struct bt_ctf_field_type_integer *integer = container_of(
+                       type, struct bt_ctf_field_type_integer, parent);
+               internal_byte_order = integer->declaration.byte_order;
+               break;
+       }
+       case CTF_TYPE_FLOAT:
+       {
+               struct bt_ctf_field_type_floating_point *floating_point =
+                       container_of(type,
+                               struct bt_ctf_field_type_floating_point,
+                               parent);
+               internal_byte_order = floating_point->declaration.byte_order;
+               break;
+       }
+       default:
+               goto end;
+       }
+
+       switch (internal_byte_order) {
+       case LITTLE_ENDIAN:
+               ret = BT_CTF_BYTE_ORDER_LITTLE_ENDIAN;
+               break;
+       case BIG_ENDIAN:
+               ret = BT_CTF_BYTE_ORDER_BIG_ENDIAN;
+               break;
+       case 0:
+               ret = BT_CTF_BYTE_ORDER_NATIVE;
+               break;
+       default:
+               ret = BT_CTF_BYTE_ORDER_UNKNOWN;
+       }
+end:
+       return ret;
+}
+
 int bt_ctf_field_type_set_byte_order(struct bt_ctf_field_type *type,
                enum bt_ctf_byte_order byte_order)
 {
@@ -771,8 +1690,8 @@ int bt_ctf_field_type_set_byte_order(struct bt_ctf_field_type *type,
        type_id = type->declaration->id;
        switch (byte_order) {
        case BT_CTF_BYTE_ORDER_NATIVE:
-               internal_byte_order = (G_BYTE_ORDER == G_LITTLE_ENDIAN ?
-                       LITTLE_ENDIAN : BIG_ENDIAN);
+               /* Leave unset. Will be initialized by parent. */
+               internal_byte_order = 0;
                break;
        case BT_CTF_BYTE_ORDER_LITTLE_ENDIAN:
                internal_byte_order = LITTLE_ENDIAN;
@@ -787,109 +1706,112 @@ int bt_ctf_field_type_set_byte_order(struct bt_ctf_field_type *type,
        }
 
        if (set_byte_order_funcs[type_id]) {
-               set_byte_order_funcs[type_id](type, internal_byte_order);
+               set_byte_order_funcs[type_id](type, internal_byte_order, 0);
        }
 end:
        return ret;
 }
 
-void bt_ctf_field_type_get(struct bt_ctf_field_type *type)
+enum ctf_type_id bt_ctf_field_type_get_type_id(
+               struct bt_ctf_field_type *type)
 {
        if (!type) {
-               return;
+               return CTF_TYPE_UNKNOWN;
        }
 
-       bt_ctf_ref_get(&type->ref_count);
+       return type->declaration->id;
 }
 
-void bt_ctf_field_type_put(struct bt_ctf_field_type *type)
+const char *bt_ctf_field_type_get_alias_name(
+               struct bt_ctf_field_type *type)
 {
-       enum ctf_type_id type_id;
+       const char *name = NULL;
+
+       if (!type || !type->alias_name) {
+               goto end;
+       }
+
+       name = type->alias_name->str;
+end:
+       return name;
+}
 
+void bt_ctf_field_type_get(struct bt_ctf_field_type *type)
+{
        if (!type) {
                return;
        }
 
-       type_id = type->declaration->id;
-       assert(type_id > CTF_TYPE_UNKNOWN && type_id < NR_CTF_TYPES);
-       bt_ctf_ref_put(&type->ref_count, type_destroy_funcs[type_id]);
+       bt_ctf_ref_get(&type->ref_count);
 }
 
-BT_HIDDEN
-void bt_ctf_field_type_freeze(struct bt_ctf_field_type *type)
+void bt_ctf_field_type_put(struct bt_ctf_field_type *type)
 {
        if (!type) {
                return;
        }
 
-       type->freeze(type);
+       bt_ctf_ref_put(&type->ref_count, bt_ctf_field_type_destroy);
 }
 
 BT_HIDDEN
-enum ctf_type_id bt_ctf_field_type_get_type_id(
-               struct bt_ctf_field_type *type)
+void bt_ctf_field_type_freeze(struct bt_ctf_field_type *type)
 {
        if (!type) {
-               return CTF_TYPE_UNKNOWN;
+               return;
        }
 
-       return type->declaration->id;
+       type->freeze(type);
 }
 
 BT_HIDDEN
-struct bt_ctf_field_type *bt_ctf_field_type_structure_get_type(
-               struct bt_ctf_field_type_structure *structure,
-               const char *name)
+struct bt_ctf_field_type *bt_ctf_field_type_variant_get_field_type_signed(
+               struct bt_ctf_field_type_variant *variant,
+               int64_t tag_value)
 {
        struct bt_ctf_field_type *type = NULL;
-       struct structure_field *field;
-       GQuark name_quark = g_quark_try_string(name);
-       size_t index;
+       GQuark field_name_quark;
+       gpointer index;
+       struct structure_field *field_entry;
+       struct range_overlap_query query = {
+               .range_start._signed = tag_value,
+               .range_end._signed = tag_value,
+               .mapping_name = 0, .overlaps = 0};
 
-       if (!name_quark) {
+       g_ptr_array_foreach(variant->tag->entries, check_ranges_overlap,
+               &query);
+       if (!query.overlaps) {
                goto end;
        }
 
-       if (!g_hash_table_lookup_extended(structure->field_name_to_index,
-               GUINT_TO_POINTER(name_quark), NULL, (gpointer *)&index)) {
+       field_name_quark = query.mapping_name;
+       if (!g_hash_table_lookup_extended(variant->field_name_to_index,
+               GUINT_TO_POINTER(field_name_quark), NULL, &index)) {
                goto end;
        }
 
-       field = structure->fields->pdata[index];
-       type = field->type;
+       field_entry = g_ptr_array_index(variant->fields, (size_t) index);
+       type = field_entry->type;
 end:
        return type;
 }
 
 BT_HIDDEN
-struct bt_ctf_field_type *bt_ctf_field_type_array_get_element_type(
-               struct bt_ctf_field_type_array *array)
-{
-       assert(array);
-       return array->element_type;
-}
-
-BT_HIDDEN
-struct bt_ctf_field_type *bt_ctf_field_type_sequence_get_element_type(
-               struct bt_ctf_field_type_sequence *sequence)
-{
-       assert(sequence);
-       return sequence->element_type;
-}
-
-BT_HIDDEN
-struct bt_ctf_field_type *bt_ctf_field_type_variant_get_field_type(
+struct bt_ctf_field_type *bt_ctf_field_type_variant_get_field_type_unsigned(
                struct bt_ctf_field_type_variant *variant,
-               int64_t tag_value)
+               uint64_t tag_value)
 {
        struct bt_ctf_field_type *type = NULL;
        GQuark field_name_quark;
        gpointer index;
        struct structure_field *field_entry;
-       struct range_overlap_query query = {.range_start = tag_value,
-               .range_end = tag_value, .mapping_name = 0, .overlaps = 0};
+       struct range_overlap_query query = {
+               .range_start._unsigned = tag_value,
+               .range_end._unsigned = tag_value,
+               .mapping_name = 0, .overlaps = 0};
 
-       g_ptr_array_foreach(variant->tag->entries, check_ranges_overlap,
+       g_ptr_array_foreach(variant->tag->entries,
+               check_ranges_overlap_unsigned,
                &query);
        if (!query.overlaps) {
                goto end;
@@ -923,6 +1845,21 @@ end:
        return ret;
 }
 
+BT_HIDDEN
+void bt_ctf_field_type_set_native_byte_order(struct bt_ctf_field_type *type,
+               int byte_order)
+{
+       if (!type) {
+               return;
+       }
+
+       assert(byte_order == LITTLE_ENDIAN || byte_order == BIG_ENDIAN);
+       if (set_byte_order_funcs[type->declaration->id]) {
+               set_byte_order_funcs[type->declaration->id](type,
+                       byte_order, 1);
+       }
+}
+
 static
 void bt_ctf_field_type_integer_destroy(struct bt_ctf_ref *ref)
 {
@@ -935,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);
 }
 
@@ -1173,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
@@ -1192,16 +2146,30 @@ int bt_ctf_field_type_enumeration_serialize(struct bt_ctf_field_type *type,
        int ret;
        struct bt_ctf_field_type_enumeration *enumeration = container_of(type,
                struct bt_ctf_field_type_enumeration, parent);
+       struct bt_ctf_field_type *container_type;
+       int container_signed;
 
        ret = bt_ctf_field_type_validate(type);
        if (ret) {
                goto end;
        }
 
+       container_type = bt_ctf_field_type_enumeration_get_container_type(type);
+       if (!container_type) {
+               ret = -1;
+               goto end;
+       }
+
+       container_signed = bt_ctf_field_type_integer_get_signed(container_type);
+       if (container_signed < 0) {
+               ret = container_signed;
+               goto error_put_container_type;
+       }
+
        g_string_append(context->string, "enum : ");
        ret = bt_ctf_field_type_serialize(enumeration->container, context);
        if (ret) {
-               goto end;
+               goto error_put_container_type;
        }
 
        g_string_append(context->string, " { ");
@@ -1209,16 +2177,34 @@ int bt_ctf_field_type_enumeration_serialize(struct bt_ctf_field_type *type,
                struct enumeration_mapping *mapping =
                        enumeration->entries->pdata[entry];
 
-               if (mapping->range_start == mapping->range_end) {
-                       g_string_append_printf(context->string,
-                               "\"%s\" = %" PRId64,
-                               g_quark_to_string(mapping->string),
-                               mapping->range_start);
+               if (container_signed) {
+                       if (mapping->range_start._signed ==
+                               mapping->range_end._signed) {
+                               g_string_append_printf(context->string,
+                                       "\"%s\" = %" PRId64,
+                                       g_quark_to_string(mapping->string),
+                                       mapping->range_start._signed);
+                       } else {
+                               g_string_append_printf(context->string,
+                                       "\"%s\" = %" PRId64 " ... %" PRId64,
+                                       g_quark_to_string(mapping->string),
+                                       mapping->range_start._signed,
+                                       mapping->range_end._signed);
+                       }
                } else {
-                       g_string_append_printf(context->string,
-                               "\"%s\" = %" PRId64 " ... %" PRId64,
-                               g_quark_to_string(mapping->string),
-                               mapping->range_start, mapping->range_end);
+                       if (mapping->range_start._unsigned ==
+                               mapping->range_end._unsigned) {
+                               g_string_append_printf(context->string,
+                                       "\"%s\" = %" PRIu64,
+                                       g_quark_to_string(mapping->string),
+                                       mapping->range_start._unsigned);
+                       } else {
+                               g_string_append_printf(context->string,
+                                       "\"%s\" = %" PRIu64 " ... %" PRIu64,
+                                       g_quark_to_string(mapping->string),
+                                       mapping->range_start._unsigned,
+                                       mapping->range_end._unsigned);
+                       }
                }
 
                g_string_append(context->string,
@@ -1231,6 +2217,8 @@ int bt_ctf_field_type_enumeration_serialize(struct bt_ctf_field_type *type,
                        context->field_name->str);
                g_string_assign(context->field_name, "");
        }
+error_put_container_type:
+       bt_ctf_field_type_put(container_type);
 end:
        return ret;
 }
@@ -1422,24 +2410,130 @@ int bt_ctf_field_type_string_serialize(struct bt_ctf_field_type *type,
 
 static
 void bt_ctf_field_type_integer_set_byte_order(struct bt_ctf_field_type *type,
-               int byte_order)
+               int byte_order, int set_native)
 {
        struct bt_ctf_field_type_integer *integer_type = container_of(type,
                struct bt_ctf_field_type_integer, parent);
 
-       integer_type->declaration.byte_order = byte_order;
+       if (set_native) {
+               integer_type->declaration.byte_order =
+                       integer_type->declaration.byte_order == 0 ?
+                       byte_order : integer_type->declaration.byte_order;
+       } else {
+               integer_type->declaration.byte_order = byte_order;
+       }
+}
+
+static
+void bt_ctf_field_type_enumeration_set_byte_order(
+               struct bt_ctf_field_type *type, int byte_order, int set_native)
+{
+       struct bt_ctf_field_type_enumeration *enum_type = container_of(type,
+               struct bt_ctf_field_type_enumeration, parent);
+
+       /* Safe to assume that container is an integer */
+       bt_ctf_field_type_integer_set_byte_order(enum_type->container,
+               byte_order, set_native);
 }
 
 static
 void bt_ctf_field_type_floating_point_set_byte_order(
-               struct bt_ctf_field_type *type, int byte_order)
+               struct bt_ctf_field_type *type, int byte_order, int set_native)
 {
        struct bt_ctf_field_type_floating_point *floating_point_type =
                container_of(type, struct bt_ctf_field_type_floating_point,
                parent);
 
-       floating_point_type->declaration.byte_order = byte_order;
-       floating_point_type->sign.byte_order = byte_order;
-       floating_point_type->mantissa.byte_order = byte_order;
-       floating_point_type->exp.byte_order = byte_order;
+       if (set_native) {
+               floating_point_type->declaration.byte_order =
+                       floating_point_type->declaration.byte_order == 0 ?
+                       byte_order :
+                       floating_point_type->declaration.byte_order;
+               floating_point_type->sign.byte_order =
+                       floating_point_type->sign.byte_order == 0 ?
+                       byte_order : floating_point_type->sign.byte_order;
+               floating_point_type->mantissa.byte_order =
+                       floating_point_type->mantissa.byte_order == 0 ?
+                       byte_order : floating_point_type->mantissa.byte_order;
+               floating_point_type->exp.byte_order =
+                       floating_point_type->exp.byte_order == 0 ?
+                       byte_order : floating_point_type->exp.byte_order;
+       } else {
+               floating_point_type->declaration.byte_order = byte_order;
+               floating_point_type->sign.byte_order = byte_order;
+               floating_point_type->mantissa.byte_order = byte_order;
+               floating_point_type->exp.byte_order = byte_order;
+       }
+}
+
+static
+void bt_ctf_field_type_structure_set_byte_order(struct bt_ctf_field_type *type,
+               int byte_order, int set_native)
+{
+       int i;
+       struct bt_ctf_field_type_structure *structure_type =
+               container_of(type, struct bt_ctf_field_type_structure,
+               parent);
+
+       for (i = 0; i < structure_type->fields->len; i++) {
+               struct structure_field *field = g_ptr_array_index(
+                       structure_type->fields, i);
+               struct bt_ctf_field_type *field_type = field->type;
+
+               if (set_byte_order_funcs[field_type->declaration->id]) {
+                       set_byte_order_funcs[field_type->declaration->id](
+                               field_type, byte_order, set_native);
+               }
+       }
+}
+
+static
+void bt_ctf_field_type_variant_set_byte_order(struct bt_ctf_field_type *type,
+               int byte_order, int set_native)
+{
+       int i;
+       struct bt_ctf_field_type_variant *variant_type =
+               container_of(type, struct bt_ctf_field_type_variant,
+               parent);
+
+       for (i = 0; i < variant_type->fields->len; i++) {
+               struct structure_field *field = g_ptr_array_index(
+                       variant_type->fields, i);
+               struct bt_ctf_field_type *field_type = field->type;
+
+               if (set_byte_order_funcs[field_type->declaration->id]) {
+                       set_byte_order_funcs[field_type->declaration->id](
+                               field_type, byte_order, set_native);
+               }
+       }
+}
+
+static
+void bt_ctf_field_type_array_set_byte_order(struct bt_ctf_field_type *type,
+               int byte_order, int set_native)
+{
+       struct bt_ctf_field_type_array *array_type =
+               container_of(type, struct bt_ctf_field_type_array,
+               parent);
+
+       if (set_byte_order_funcs[array_type->element_type->declaration->id]) {
+               set_byte_order_funcs[array_type->element_type->declaration->id](
+                       array_type->element_type, byte_order, set_native);
+       }
+}
+
+static
+void bt_ctf_field_type_sequence_set_byte_order(struct bt_ctf_field_type *type,
+               int byte_order, int set_native)
+{
+       struct bt_ctf_field_type_sequence *sequence_type =
+               container_of(type, struct bt_ctf_field_type_sequence,
+               parent);
+
+       if (set_byte_order_funcs[
+               sequence_type->element_type->declaration->id]) {
+               set_byte_order_funcs[
+                       sequence_type->element_type->declaration->id](
+                       sequence_type->element_type, byte_order, set_native);
+       }
 }
This page took 0.043426 seconds and 4 git commands to generate.