X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent-types.c;h=9d2bd39b0a108b8239ba9b649f9cb38e19ae16f4;hp=ee81257149673373ed00c7d94af1a637a47ec4d4;hb=32fe3f28047342b3b0ad04ce0c03bfb97e11127f;hpb=4ebdec03ec8a1da1d672229533d1c699ed875555 diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c index ee812571..9d2bd39b 100644 --- a/formats/ctf/ir/event-types.c +++ b/formats/ctf/ir/event-types.c @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include #include #include @@ -52,26 +54,26 @@ struct range_overlap_query { }; static -void bt_ctf_field_type_destroy(struct bt_ctf_ref *); +void bt_ctf_field_type_destroy(struct bt_ref *); static -void bt_ctf_field_type_integer_destroy(struct bt_ctf_ref *); +void bt_ctf_field_type_integer_destroy(struct bt_ctf_field_type *); static -void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_ref *); +void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_field_type *); static -void bt_ctf_field_type_floating_point_destroy(struct bt_ctf_ref *); +void bt_ctf_field_type_floating_point_destroy(struct bt_ctf_field_type *); static -void bt_ctf_field_type_structure_destroy(struct bt_ctf_ref *); +void bt_ctf_field_type_structure_destroy(struct bt_ctf_field_type *); static -void bt_ctf_field_type_variant_destroy(struct bt_ctf_ref *); +void bt_ctf_field_type_variant_destroy(struct bt_ctf_field_type *); static -void bt_ctf_field_type_array_destroy(struct bt_ctf_ref *); +void bt_ctf_field_type_array_destroy(struct bt_ctf_field_type *); static -void bt_ctf_field_type_sequence_destroy(struct bt_ctf_ref *); +void bt_ctf_field_type_sequence_destroy(struct bt_ctf_field_type *); static -void bt_ctf_field_type_string_destroy(struct bt_ctf_ref *); +void bt_ctf_field_type_string_destroy(struct bt_ctf_field_type *); static -void (* const type_destroy_funcs[])(struct bt_ctf_ref *) = { +void (* const type_destroy_funcs[])(struct bt_ctf_field_type *) = { [CTF_TYPE_INTEGER] = bt_ctf_field_type_integer_destroy, [CTF_TYPE_ENUM] = bt_ctf_field_type_enumeration_destroy, @@ -188,6 +190,44 @@ void (* const set_byte_order_funcs[])(struct bt_ctf_field_type *, [CTF_TYPE_STRING] = NULL, }; +static +struct bt_ctf_field_type *bt_ctf_field_type_integer_copy( + struct bt_ctf_field_type *); +static +struct bt_ctf_field_type *bt_ctf_field_type_enumeration_copy( + struct bt_ctf_field_type *); +static +struct bt_ctf_field_type *bt_ctf_field_type_floating_point_copy( + struct bt_ctf_field_type *); +static +struct bt_ctf_field_type *bt_ctf_field_type_structure_copy( + struct bt_ctf_field_type *); +static +struct bt_ctf_field_type *bt_ctf_field_type_variant_copy( + struct bt_ctf_field_type *); +static +struct bt_ctf_field_type *bt_ctf_field_type_array_copy( + struct bt_ctf_field_type *); +static +struct bt_ctf_field_type *bt_ctf_field_type_sequence_copy( + struct bt_ctf_field_type *); +static +struct bt_ctf_field_type *bt_ctf_field_type_string_copy( + struct bt_ctf_field_type *); + +static +struct bt_ctf_field_type *(* const type_copy_funcs[])( + struct bt_ctf_field_type *) = { + [CTF_TYPE_INTEGER] = bt_ctf_field_type_integer_copy, + [CTF_TYPE_ENUM] = bt_ctf_field_type_enumeration_copy, + [CTF_TYPE_FLOAT] = bt_ctf_field_type_floating_point_copy, + [CTF_TYPE_STRUCT] = bt_ctf_field_type_structure_copy, + [CTF_TYPE_VARIANT] = bt_ctf_field_type_variant_copy, + [CTF_TYPE_ARRAY] = bt_ctf_field_type_array_copy, + [CTF_TYPE_SEQUENCE] = bt_ctf_field_type_sequence_copy, + [CTF_TYPE_STRING] = bt_ctf_field_type_string_copy, +}; + static void destroy_enumeration_mapping(struct enumeration_mapping *mapping) { @@ -253,19 +293,23 @@ gint compare_enumeration_mappings_unsigned(struct enumeration_mapping **a, } static -void bt_ctf_field_type_init(struct bt_ctf_field_type *type) +void bt_ctf_field_type_init(struct bt_ctf_field_type *type, int init_bo) { enum ctf_type_id type_id = type->declaration->id; - int ret; assert(type && (type_id > CTF_TYPE_UNKNOWN) && (type_id < NR_CTF_TYPES)); - bt_ctf_ref_init(&type->ref_count); + bt_ctf_base_init(type, bt_ctf_field_type_destroy); type->freeze = type_freeze_funcs[type_id]; type->serialize = type_serialize_funcs[type_id]; - ret = bt_ctf_field_type_set_byte_order(type, BT_CTF_BYTE_ORDER_NATIVE); - assert(!ret); + + if (init_bo) { + int ret = bt_ctf_field_type_set_byte_order(type, + BT_CTF_BYTE_ORDER_NATIVE); + assert(!ret); + } + type->declaration->alignment = 1; } @@ -304,26 +348,25 @@ end: } static -void bt_ctf_field_type_destroy(struct bt_ctf_ref *ref) +void bt_ctf_field_type_destroy(struct bt_ref *ref) { struct bt_ctf_field_type *type; + struct bt_ctf_base *base; enum ctf_type_id type_id; if (!ref) { return; } - type = container_of(ref, struct bt_ctf_field_type, ref_count); + base = container_of(ref, struct bt_ctf_base, ref_count); + type = container_of(base, struct bt_ctf_field_type, base); 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); + type_destroy_funcs[type_id](type); } BT_HIDDEN @@ -347,6 +390,27 @@ int bt_ctf_field_type_validate(struct bt_ctf_field_type *type) ret = enumeration->entries->len ? 0 : -1; break; } + case CTF_TYPE_SEQUENCE: + { + struct bt_ctf_field_type_sequence *sequence = + container_of(type, struct bt_ctf_field_type_sequence, + parent); + + /* length field name should be set at this point */ + ret = sequence->length_field_name->len ? 0 : -1; + break; + } + case CTF_TYPE_VARIANT: + { + struct bt_ctf_field_type_variant *variant = + container_of(type, struct bt_ctf_field_type_variant, + parent); + + if (variant->tag_name->len == 0 || !variant->tag) { + ret = -1; + } + break; + } default: break; } @@ -368,7 +432,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_integer_create(unsigned int size) integer->declaration.len = size; integer->declaration.base = BT_CTF_INTEGER_BASE_DECIMAL; integer->declaration.encoding = CTF_STRING_NONE; - bt_ctf_field_type_init(&integer->parent); + bt_ctf_field_type_init(&integer->parent, TRUE); return &integer->parent; } @@ -572,7 +636,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_enumeration_create( enumeration->container = integer_container_type; enumeration->entries = g_ptr_array_new_with_free_func( (GDestroyNotify)destroy_enumeration_mapping); - bt_ctf_field_type_init(&enumeration->parent); + bt_ctf_field_type_init(&enumeration->parent, FALSE); return &enumeration->parent; error: g_free(enumeration); @@ -977,7 +1041,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_floating_point_create(void) floating_point->mantissa.p.alignment = 1; floating_point->exp.p.alignment = 1; - bt_ctf_field_type_init(&floating_point->parent); + bt_ctf_field_type_init(&floating_point->parent, TRUE); end: return floating_point ? &floating_point->parent : NULL; } @@ -1088,7 +1152,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_structure_create(void) 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); + bt_ctf_field_type_init(&structure->parent, TRUE); return &structure->parent; error: return NULL; @@ -1116,11 +1180,6 @@ int bt_ctf_field_type_structure_add_field(struct bt_ctf_field_type *type, ret = -1; goto end; } - - if (type->declaration->alignment < field_type->declaration->alignment) { - type->declaration->alignment = - field_type->declaration->alignment; - } end: return ret; } @@ -1151,8 +1210,7 @@ int bt_ctf_field_type_structure_get_field(struct bt_ctf_field_type *type, struct structure_field *field; int ret = 0; - if (!type || index < 0 || !field_name || !field_type || - (type->declaration->id != CTF_TYPE_STRUCT)) { + if (!type || index < 0 || (type->declaration->id != CTF_TYPE_STRUCT)) { ret = -1; goto end; } @@ -1165,9 +1223,13 @@ int bt_ctf_field_type_structure_get_field(struct bt_ctf_field_type *type, } 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); + if (field_type) { + *field_type = field->type; + bt_ctf_field_type_get(field->type); + } + if (field_name) { + *field_name = g_quark_to_string(field->name); + } end: return ret; } @@ -1210,8 +1272,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_create( { struct bt_ctf_field_type_variant *variant = NULL; - if (!enum_tag || bt_ctf_validate_identifier(tag_name) || - (enum_tag->declaration->id != CTF_TYPE_ENUM)) { + if (tag_name && bt_ctf_validate_identifier(tag_name)) { goto error; } @@ -1226,10 +1287,15 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_create( 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); + if (enum_tag) { + 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, TRUE); + /* A variant's alignment is undefined */ + variant->parent.declaration->alignment = 0; return &variant->parent; error: return NULL; @@ -1246,6 +1312,10 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_get_tag_type( } variant = container_of(type, struct bt_ctf_field_type_variant, parent); + if (!variant->tag) { + goto end; + } + tag_type = &variant->tag->parent; bt_ctf_field_type_get(tag_type); end: @@ -1263,18 +1333,40 @@ const char *bt_ctf_field_type_variant_get_tag_name( } variant = container_of(type, struct bt_ctf_field_type_variant, parent); + if (variant->tag_name->len == 0) { + goto end; + } + tag_name = variant->tag_name->str; end: return tag_name; } +int bt_ctf_field_type_variant_set_tag_name( + struct bt_ctf_field_type *type, const char *name) +{ + int ret = 0; + struct bt_ctf_field_type_variant *variant; + + if (!type || type->frozen || + (type->declaration->id != CTF_TYPE_VARIANT) || + bt_ctf_validate_identifier(name)) { + ret = -1; + goto end; + } + + variant = container_of(type, struct bt_ctf_field_type_variant, parent); + g_string_assign(variant->tag_name, name); +end: + return ret; +} + 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) { size_t i; int ret = 0; - int name_found = 0; struct bt_ctf_field_type_variant *variant; GQuark field_name_quark = g_quark_from_string(field_name); @@ -1287,19 +1379,31 @@ int bt_ctf_field_type_variant_add_field(struct bt_ctf_field_type *type, } 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; + /* The user has explicitly provided a tag; validate against it. */ + if (variant->tag) { + int name_found = 0; + + /* 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) { + /* Validation failed */ + ret = -1; + goto end; } } - if (!name_found || add_structure_field(variant->fields, - variant->field_name_to_index, field_type, field_name)) { + if (add_structure_field(variant->fields, variant->field_name_to_index, + field_type, field_name)) { ret = -1; goto end; } @@ -1388,8 +1492,7 @@ int bt_ctf_field_type_variant_get_field(struct bt_ctf_field_type *type, struct structure_field *field; int ret = 0; - if (!type || index < 0 || !field_name || !field_type || - (type->declaration->id != CTF_TYPE_VARIANT)) { + if (!type || index < 0 || (type->declaration->id != CTF_TYPE_VARIANT)) { ret = -1; goto end; } @@ -1402,9 +1505,13 @@ int bt_ctf_field_type_variant_get_field(struct bt_ctf_field_type *type, } 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); + if (field_type) { + *field_type = field->type; + bt_ctf_field_type_get(field->type); + } + if (field_name) { + *field_name = g_quark_to_string(field->name); + } end: return ret; } @@ -1431,9 +1538,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_array_create( 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; + bt_ctf_field_type_init(&array->parent, FALSE); return &array->parent; error: return NULL; @@ -1493,9 +1598,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_sequence_create( 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; + bt_ctf_field_type_init(&sequence->parent, FALSE); return &sequence->parent; error: return NULL; @@ -1547,7 +1650,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_string_create(void) string->parent.declaration = &string->declaration.p; string->parent.declaration->id = CTF_TYPE_STRING; - bt_ctf_field_type_init(&string->parent); + bt_ctf_field_type_init(&string->parent, TRUE); string->declaration.encoding = CTF_STRING_UTF8; string->parent.declaration->alignment = CHAR_BIT; return &string->parent; @@ -1592,24 +1695,115 @@ end: int bt_ctf_field_type_get_alignment(struct bt_ctf_field_type *type) { int ret; + enum ctf_type_id type_id; if (!type) { ret = -1; goto end; } - ret = (int) type->declaration->alignment; + if (type->frozen) { + ret = (int) type->declaration->alignment; + goto end; + } + + type_id = bt_ctf_field_type_get_type_id(type); + switch (type_id) { + case CTF_TYPE_SEQUENCE: + { + struct bt_ctf_field_type *element = + bt_ctf_field_type_sequence_get_element_type(type); + + if (!element) { + ret = -1; + goto end; + } + + ret = bt_ctf_field_type_get_alignment(element); + bt_ctf_field_type_put(element); + break; + } + case CTF_TYPE_ARRAY: + { + struct bt_ctf_field_type *element = + bt_ctf_field_type_array_get_element_type(type); + + if (!element) { + ret = -1; + goto end; + } + + ret = bt_ctf_field_type_get_alignment(element); + bt_ctf_field_type_put(element); + break; + } + case CTF_TYPE_STRUCT: + { + int i, element_count; + + element_count = bt_ctf_field_type_structure_get_field_count( + type); + if (element_count < 0) { + ret = element_count; + goto end; + } + + for (i = 0; i < element_count; i++) { + struct bt_ctf_field_type *field; + int field_alignment; + + ret = bt_ctf_field_type_structure_get_field(type, NULL, + &field, i); + if (ret) { + goto end; + } + + assert(field); + field_alignment = bt_ctf_field_type_get_alignment( + field); + bt_ctf_field_type_put(field); + if (field_alignment < 0) { + ret = field_alignment; + goto end; + } + + type->declaration->alignment = MAX(field_alignment, + type->declaration->alignment); + } + ret = (int) type->declaration->alignment; + break; + } + case CTF_TYPE_UNKNOWN: + ret = -1; + break; + default: + ret = (int) type->declaration->alignment; + break; + } end: return ret; } +static inline +int is_power_of_two(unsigned int value) +{ + return ((value & (value - 1)) == 0) && value > 0; +} + int bt_ctf_field_type_set_alignment(struct bt_ctf_field_type *type, unsigned int alignment) { int ret = 0; + enum ctf_type_id type_id; + + /* Alignment must be a power of two */ + if (!type || type->frozen || !is_power_of_two(alignment)) { + ret = -1; + goto end; + } - /* Alignment must be bit-aligned (1) or byte aligned */ - if (!type || type->frozen || (alignment != 1 && (alignment & 0x7))) { + type_id = bt_ctf_field_type_get_type_id(type); + if (type_id == CTF_TYPE_UNKNOWN) { ret = -1; goto end; } @@ -1620,6 +1814,13 @@ int bt_ctf_field_type_set_alignment(struct bt_ctf_field_type *type, goto end; } + if (type_id == CTF_TYPE_VARIANT || type_id == CTF_TYPE_SEQUENCE || + type_id == CTF_TYPE_ARRAY) { + /* Setting an alignment on these types makes no sense */ + ret = -1; + goto end; + } + type->declaration->alignment = alignment; ret = 0; end: @@ -1686,7 +1887,6 @@ int bt_ctf_field_type_set_byte_order(struct bt_ctf_field_type *type, goto end; } - type_id = type->declaration->id; switch (byte_order) { case BT_CTF_BYTE_ORDER_NATIVE: /* Leave unset. Will be initialized by parent. */ @@ -1704,6 +1904,7 @@ int bt_ctf_field_type_set_byte_order(struct bt_ctf_field_type *type, goto end; } + type_id = type->declaration->id; if (set_byte_order_funcs[type_id]) { set_byte_order_funcs[type_id](type, internal_byte_order, 0); } @@ -1721,36 +1922,14 @@ enum ctf_type_id bt_ctf_field_type_get_type_id( return type->declaration->id; } -const char *bt_ctf_field_type_get_alias_name( - struct bt_ctf_field_type *type) -{ - 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; - } - - bt_ctf_ref_get(&type->ref_count); + bt_ctf_get(type); } void bt_ctf_field_type_put(struct bt_ctf_field_type *type) { - if (!type) { - return; - } - - bt_ctf_ref_put(&type->ref_count, bt_ctf_field_type_destroy); + bt_ctf_put(type); } BT_HIDDEN @@ -1859,142 +2038,413 @@ void bt_ctf_field_type_set_native_byte_order(struct bt_ctf_field_type *type, } } -static -void bt_ctf_field_type_integer_destroy(struct bt_ctf_ref *ref) +BT_HIDDEN +struct bt_ctf_field_type *bt_ctf_field_type_copy(struct bt_ctf_field_type *type) { - struct bt_ctf_field_type_integer *integer; + struct bt_ctf_field_type *copy = NULL; - if (!ref) { - return; + if (!type) { + goto end; } - 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); + copy = type_copy_funcs[type->declaration->id](type); +end: + return copy; } -static -void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_ref *ref) +BT_HIDDEN +struct bt_ctf_field_path *bt_ctf_field_path_create(void) { - struct bt_ctf_field_type_enumeration *enumeration; + struct bt_ctf_field_path *field_path = NULL; - if (!ref) { - return; + field_path = g_new0(struct bt_ctf_field_path, 1); + if (!field_path) { + goto end; } - enumeration = container_of( - container_of(ref, struct bt_ctf_field_type, ref_count), - struct bt_ctf_field_type_enumeration, parent); - g_ptr_array_free(enumeration->entries, TRUE); - bt_ctf_field_type_put(enumeration->container); - g_free(enumeration); + field_path->root = CTF_NODE_UNKNOWN; + field_path->path_indexes = g_array_new(TRUE, FALSE, sizeof(int)); + if (!field_path->path_indexes) { + bt_ctf_field_path_destroy(field_path); + field_path = NULL; + } +end: + return field_path; } -static -void bt_ctf_field_type_floating_point_destroy(struct bt_ctf_ref *ref) + +BT_HIDDEN +struct bt_ctf_field_path *bt_ctf_field_path_copy( + struct bt_ctf_field_path *path) { - struct bt_ctf_field_type_floating_point *floating_point; + struct bt_ctf_field_path *new_path = bt_ctf_field_path_create(); - if (!ref) { - return; + if (!new_path) { + goto end; } - floating_point = container_of( - container_of(ref, struct bt_ctf_field_type, ref_count), - struct bt_ctf_field_type_floating_point, parent); - g_free(floating_point); + new_path->root = path->root; + g_array_insert_vals(new_path->path_indexes, 0, + path->path_indexes->data, path->path_indexes->len); +end: + return new_path; } -static -void bt_ctf_field_type_structure_destroy(struct bt_ctf_ref *ref) +BT_HIDDEN +void bt_ctf_field_path_destroy(struct bt_ctf_field_path *path) { - struct bt_ctf_field_type_structure *structure; - - if (!ref) { + if (!path) { return; } - structure = container_of( - container_of(ref, struct bt_ctf_field_type, ref_count), - struct bt_ctf_field_type_structure, parent); - g_ptr_array_free(structure->fields, TRUE); - g_hash_table_destroy(structure->field_name_to_index); - g_free(structure); + if (path->path_indexes) { + g_array_free(path->path_indexes, TRUE); + } + g_free(path); } -static -void bt_ctf_field_type_variant_destroy(struct bt_ctf_ref *ref) +BT_HIDDEN +int bt_ctf_field_type_structure_get_field_name_index( + struct bt_ctf_field_type *type, const char *name) { - struct bt_ctf_field_type_variant *variant; + int ret; + size_t index; + GQuark name_quark; + struct bt_ctf_field_type_structure *structure; - if (!ref) { - return; + if (!type || !name || + bt_ctf_field_type_get_type_id(type) != CTF_TYPE_STRUCT) { + ret = -1; + goto end; } - variant = container_of( - container_of(ref, struct bt_ctf_field_type, ref_count), - struct bt_ctf_field_type_variant, parent); - g_ptr_array_free(variant->fields, TRUE); - g_hash_table_destroy(variant->field_name_to_index); - g_string_free(variant->tag_name, TRUE); - bt_ctf_field_type_put(&variant->tag->parent); - g_free(variant); -} - -static -void bt_ctf_field_type_array_destroy(struct bt_ctf_ref *ref) -{ - struct bt_ctf_field_type_array *array; - - if (!ref) { - return; + name_quark = g_quark_try_string(name); + if (!name_quark) { + ret = -1; + goto end; } - array = container_of( - container_of(ref, struct bt_ctf_field_type, ref_count), - struct bt_ctf_field_type_array, parent); - bt_ctf_field_type_put(array->element_type); - g_free(array); + 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)) { + ret = -1; + goto end; + } + ret = (int) index; +end: + return ret; } -static -void bt_ctf_field_type_sequence_destroy(struct bt_ctf_ref *ref) +BT_HIDDEN +int bt_ctf_field_type_structure_set_field_index(struct bt_ctf_field_type *type, + struct bt_ctf_field_type *field, int index) { - struct bt_ctf_field_type_sequence *sequence; + int ret = 0; + struct bt_ctf_field_type_structure *structure; - if (!ref) { - return; + if (!type || !field || + bt_ctf_field_type_get_type_id(type) != CTF_TYPE_STRUCT) { + ret = -1; + goto end; } - sequence = container_of( - container_of(ref, struct bt_ctf_field_type, ref_count), - struct bt_ctf_field_type_sequence, parent); - bt_ctf_field_type_put(sequence->element_type); - g_string_free(sequence->length_field_name, TRUE); - g_free(sequence); -} - -static -void bt_ctf_field_type_string_destroy(struct bt_ctf_ref *ref) -{ - struct bt_ctf_field_type_string *string; - - if (!ref) { - return; + structure = container_of(type, struct bt_ctf_field_type_structure, + parent); + if (index < 0 || index >= structure->fields->len) { + ret = -1; + goto end; } - string = container_of( - container_of(ref, struct bt_ctf_field_type, ref_count), - struct bt_ctf_field_type_string, parent); - g_free(string); + bt_ctf_field_type_get(field); + bt_ctf_field_type_put(((struct structure_field *) + g_ptr_array_index(structure->fields, index))->type); + ((struct structure_field *) structure->fields->pdata[index])->type = + field; +end: + return ret; } -static -void generic_field_type_freeze(struct bt_ctf_field_type *type) +BT_HIDDEN +int bt_ctf_field_type_variant_get_field_name_index( + struct bt_ctf_field_type *type, const char *name) { - type->frozen = 1; + int ret; + size_t index; + GQuark name_quark; + struct bt_ctf_field_type_variant *variant; + + if (!type || !name || + bt_ctf_field_type_get_type_id(type) != CTF_TYPE_VARIANT) { + ret = -1; + goto end; + } + + name_quark = g_quark_try_string(name); + if (!name_quark) { + ret = -1; + 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)) { + ret = -1; + goto end; + } + ret = (int) index; +end: + return ret; +} + +BT_HIDDEN +int bt_ctf_field_type_sequence_set_length_field_path( + struct bt_ctf_field_type *type, + struct bt_ctf_field_path *path) +{ + int ret = 0; + struct bt_ctf_field_type_sequence *sequence; + + if (!type || bt_ctf_field_type_get_type_id(type) != CTF_TYPE_SEQUENCE) { + ret = -1; + goto end; + } + + sequence = container_of(type, struct bt_ctf_field_type_sequence, + parent); + if (sequence->length_field_path) { + bt_ctf_field_path_destroy(sequence->length_field_path); + } + sequence->length_field_path = path; +end: + return ret; +} + +BT_HIDDEN +struct bt_ctf_field_path *bt_ctf_field_type_sequence_get_length_field_path( + struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type_sequence *sequence; + + sequence = container_of(type, struct bt_ctf_field_type_sequence, + parent); + + return sequence->length_field_path; +} + +BT_HIDDEN +int bt_ctf_field_type_variant_set_tag_field_path(struct bt_ctf_field_type *type, + struct bt_ctf_field_path *path) +{ + int ret = 0; + struct bt_ctf_field_type_variant *variant; + + if (!type || bt_ctf_field_type_get_type_id(type) != CTF_TYPE_VARIANT) { + ret = -1; + goto end; + } + + variant = container_of(type, struct bt_ctf_field_type_variant, + parent); + if (variant->tag_path) { + bt_ctf_field_path_destroy(variant->tag_path); + } + variant->tag_path = path; +end: + return ret; +} + +BT_HIDDEN +struct bt_ctf_field_path *bt_ctf_field_type_variant_get_tag_field_path( + struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type_variant *variant; + + variant = container_of(type, struct bt_ctf_field_type_variant, + parent); + + return variant->tag_path; +} + +BT_HIDDEN +int bt_ctf_field_type_variant_set_tag(struct bt_ctf_field_type *type, + struct bt_ctf_field_type *tag) +{ + int ret = 0; + struct bt_ctf_field_type_variant *variant; + + if (!type || !tag || type->frozen || + bt_ctf_field_type_get_type_id(tag) != CTF_TYPE_ENUM) { + ret = -1; + goto end; + } + + variant = container_of(type, struct bt_ctf_field_type_variant, + parent); + bt_ctf_field_type_get(tag); + if (variant->tag) { + bt_ctf_field_type_put(&variant->tag->parent); + } + variant->tag = container_of(tag, struct bt_ctf_field_type_enumeration, + parent); +end: + return ret; +} + +BT_HIDDEN +int bt_ctf_field_type_variant_set_field_index(struct bt_ctf_field_type *type, + struct bt_ctf_field_type *field, int index) +{ + int ret = 0; + struct bt_ctf_field_type_variant *variant; + + if (!type || !field || + bt_ctf_field_type_get_type_id(type) != CTF_TYPE_VARIANT) { + ret = -1; + goto end; + } + + variant = container_of(type, struct bt_ctf_field_type_variant, + parent); + if (index < 0 || index >= variant->fields->len) { + ret = -1; + goto end; + } + + bt_ctf_field_type_get(field); + bt_ctf_field_type_put(((struct structure_field *) + g_ptr_array_index(variant->fields, index))->type); + ((struct structure_field *) variant->fields->pdata[index])->type = + field; +end: + return ret; +} + +static +void bt_ctf_field_type_integer_destroy(struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type_integer *integer = + (struct bt_ctf_field_type_integer *) type; + + if (!type) { + return; + } + + if (integer->mapped_clock) { + bt_ctf_clock_put(integer->mapped_clock); + } + g_free(integer); +} + +static +void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type_enumeration *enumeration = + (struct bt_ctf_field_type_enumeration *) type; + + if (!type) { + return; + } + + g_ptr_array_free(enumeration->entries, TRUE); + bt_ctf_field_type_put(enumeration->container); + g_free(enumeration); +} + +static +void bt_ctf_field_type_floating_point_destroy(struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type_floating_point *floating_point = + (struct bt_ctf_field_type_floating_point *) type; + + if (!type) { + return; + } + + g_free(floating_point); +} + +static +void bt_ctf_field_type_structure_destroy(struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type_structure *structure = + (struct bt_ctf_field_type_structure *) type; + + if (!type) { + return; + } + + g_ptr_array_free(structure->fields, TRUE); + g_hash_table_destroy(structure->field_name_to_index); + g_free(structure); +} + +static +void bt_ctf_field_type_variant_destroy(struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type_variant *variant = + (struct bt_ctf_field_type_variant *) type; + + if (!type) { + return; + } + + g_ptr_array_free(variant->fields, TRUE); + g_hash_table_destroy(variant->field_name_to_index); + g_string_free(variant->tag_name, TRUE); + bt_ctf_field_type_put(&variant->tag->parent); + bt_ctf_field_path_destroy(variant->tag_path); + g_free(variant); +} + +static +void bt_ctf_field_type_array_destroy(struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type_array *array = + (struct bt_ctf_field_type_array *) type; + + if (!type) { + return; + } + + bt_ctf_field_type_put(array->element_type); + g_free(array); +} + +static +void bt_ctf_field_type_sequence_destroy(struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type_sequence *sequence = + (struct bt_ctf_field_type_sequence *) type; + + if (!type) { + return; + } + + bt_ctf_field_type_put(sequence->element_type); + g_string_free(sequence->length_field_name, TRUE); + bt_ctf_field_path_destroy(sequence->length_field_path); + g_free(sequence); +} + +static +void bt_ctf_field_type_string_destroy(struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type_string *string = + (struct bt_ctf_field_type_string *) type; + + if (!type) { + return; + } + + g_free(string); +} + +static +void generic_field_type_freeze(struct bt_ctf_field_type *type) +{ + type->frozen = 1; } static @@ -2019,9 +2469,11 @@ void bt_ctf_field_type_structure_freeze(struct bt_ctf_field_type *type) struct bt_ctf_field_type_structure *structure_type = container_of( type, struct bt_ctf_field_type_structure, parent); + /* Cache the alignment */ + type->declaration->alignment = bt_ctf_field_type_get_alignment(type); generic_field_type_freeze(type); - g_ptr_array_foreach(structure_type->fields, (GFunc)freeze_structure_field, - NULL); + g_ptr_array_foreach(structure_type->fields, + (GFunc) freeze_structure_field, NULL); } static @@ -2030,9 +2482,11 @@ void bt_ctf_field_type_variant_freeze(struct bt_ctf_field_type *type) struct bt_ctf_field_type_variant *variant_type = container_of( type, struct bt_ctf_field_type_variant, parent); + /* Cache the alignment */ + type->declaration->alignment = bt_ctf_field_type_get_alignment(type); generic_field_type_freeze(type); - g_ptr_array_foreach(variant_type->fields, (GFunc)freeze_structure_field, - NULL); + g_ptr_array_foreach(variant_type->fields, + (GFunc) freeze_structure_field, NULL); } static @@ -2041,6 +2495,8 @@ void bt_ctf_field_type_array_freeze(struct bt_ctf_field_type *type) struct bt_ctf_field_type_array *array_type = container_of( type, struct bt_ctf_field_type_array, parent); + /* Cache the alignment */ + type->declaration->alignment = bt_ctf_field_type_get_alignment(type); generic_field_type_freeze(type); bt_ctf_field_type_freeze(array_type->element_type); } @@ -2051,6 +2507,8 @@ void bt_ctf_field_type_sequence_freeze(struct bt_ctf_field_type *type) struct bt_ctf_field_type_sequence *sequence_type = container_of( type, struct bt_ctf_field_type_sequence, parent); + /* Cache the alignment */ + type->declaration->alignment = bt_ctf_field_type_get_alignment(type); generic_field_type_freeze(type); bt_ctf_field_type_freeze(sequence_type->element_type); } @@ -2303,8 +2761,13 @@ int bt_ctf_field_type_variant_serialize(struct bt_ctf_field_type *type, GString *variant_field_name = context->field_name; context->field_name = g_string_new(""); - g_string_append_printf(context->string, - "variant <%s> {\n", variant->tag_name->str); + if (variant->tag_name->len > 0) { + g_string_append_printf(context->string, + "variant <%s> {\n", variant->tag_name->str); + } else { + g_string_append(context->string, "variant {\n"); + } + context->current_indentation_level++; for (i = 0; i < variant->fields->len; i++) { struct structure_field *field = variant->fields->pdata[i]; @@ -2536,3 +2999,335 @@ void bt_ctf_field_type_sequence_set_byte_order(struct bt_ctf_field_type *type, sequence_type->element_type, byte_order, set_native); } } + +static +struct bt_ctf_field_type *bt_ctf_field_type_integer_copy( + struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type *copy; + struct bt_ctf_field_type_integer *integer, *copy_integer; + + integer = container_of(type, struct bt_ctf_field_type_integer, parent); + copy = bt_ctf_field_type_integer_create(integer->declaration.len); + if (!copy) { + goto end; + } + + copy_integer = container_of(copy, struct bt_ctf_field_type_integer, + parent); + copy_integer->declaration = integer->declaration; + if (integer->mapped_clock) { + bt_ctf_clock_get(integer->mapped_clock); + copy_integer->mapped_clock = integer->mapped_clock; + } +end: + return copy; +} + +static +struct bt_ctf_field_type *bt_ctf_field_type_enumeration_copy( + struct bt_ctf_field_type *type) +{ + size_t i; + struct bt_ctf_field_type *copy = NULL, *copy_container; + struct bt_ctf_field_type_enumeration *enumeration, *copy_enumeration; + + enumeration = container_of(type, struct bt_ctf_field_type_enumeration, + parent); + + /* Copy the source enumeration's container */ + copy_container = bt_ctf_field_type_copy(enumeration->container); + if (!copy_container) { + goto end; + } + + copy = bt_ctf_field_type_enumeration_create(copy_container); + if (!copy) { + goto end; + } + copy_enumeration = container_of(copy, + struct bt_ctf_field_type_enumeration, parent); + + /* Copy all enumaration entries */ + for (i = 0; i < enumeration->entries->len; i++) { + struct enumeration_mapping *mapping = g_ptr_array_index( + enumeration->entries, i); + struct enumeration_mapping* copy_mapping = g_new0( + struct enumeration_mapping, 1); + + if (!copy_mapping) { + goto error; + } + + *copy_mapping = *mapping; + g_ptr_array_add(copy_enumeration->entries, copy_mapping); + } + + copy_enumeration->declaration = enumeration->declaration; +end: + if (copy_container) { + bt_ctf_field_type_put(copy_container); + } + return copy; +error: + if (copy_container) { + bt_ctf_field_type_put(copy_container); + } + bt_ctf_field_type_put(copy); + return NULL; +} + +static +struct bt_ctf_field_type *bt_ctf_field_type_floating_point_copy( + struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type *copy; + struct bt_ctf_field_type_floating_point *floating_point, *copy_float; + + floating_point = container_of(type, + struct bt_ctf_field_type_floating_point, parent); + copy = bt_ctf_field_type_floating_point_create(); + if (!copy) { + goto end; + } + + copy_float = container_of(copy, + struct bt_ctf_field_type_floating_point, parent); + copy_float->declaration = floating_point->declaration; + copy_float->sign = floating_point->sign; + copy_float->mantissa = floating_point->mantissa; + copy_float->exp = floating_point->exp; +end: + return copy; +} + +static +struct bt_ctf_field_type *bt_ctf_field_type_structure_copy( + struct bt_ctf_field_type *type) +{ + int i; + GHashTableIter iter; + gpointer key, value; + struct bt_ctf_field_type *copy; + struct bt_ctf_field_type_structure *structure, *copy_structure; + + structure = container_of(type, struct bt_ctf_field_type_structure, + parent); + copy = bt_ctf_field_type_structure_create(); + if (!copy) { + goto end; + } + + copy_structure = container_of(copy, + struct bt_ctf_field_type_structure, parent); + + /* Copy field_name_to_index */ + g_hash_table_iter_init(&iter, structure->field_name_to_index); + while (g_hash_table_iter_next (&iter, &key, &value)) { + g_hash_table_insert(copy_structure->field_name_to_index, + key, value); + } + + for (i = 0; i < structure->fields->len; i++) { + struct structure_field *entry, *copy_entry; + struct bt_ctf_field_type *copy_field; + + copy_entry = g_new0(struct structure_field, 1); + if (!copy_entry) { + goto error; + } + + entry = g_ptr_array_index(structure->fields, i); + copy_field = bt_ctf_field_type_copy(entry->type); + if (!copy_field) { + g_free(copy_entry); + goto error; + } + + copy_entry->name = entry->name; + copy_entry->type = copy_field; + g_ptr_array_add(copy_structure->fields, copy_entry); + } + + copy_structure->declaration = structure->declaration; +end: + return copy; +error: + bt_ctf_field_type_put(copy); + return NULL; +} + +static +struct bt_ctf_field_type *bt_ctf_field_type_variant_copy( + struct bt_ctf_field_type *type) +{ + int i; + GHashTableIter iter; + gpointer key, value; + struct bt_ctf_field_type *copy = NULL, *copy_tag = NULL; + struct bt_ctf_field_type_variant *variant, *copy_variant; + + variant = container_of(type, struct bt_ctf_field_type_variant, + parent); + if (variant->tag) { + copy_tag = bt_ctf_field_type_copy(&variant->tag->parent); + if (!copy_tag) { + goto end; + } + } + + copy = bt_ctf_field_type_variant_create(copy_tag, + variant->tag_name->len ? variant->tag_name->str : NULL); + if (!copy) { + goto end; + } + + copy_variant = container_of(copy, struct bt_ctf_field_type_variant, + parent); + + /* Copy field_name_to_index */ + g_hash_table_iter_init(&iter, variant->field_name_to_index); + while (g_hash_table_iter_next (&iter, &key, &value)) { + g_hash_table_insert(copy_variant->field_name_to_index, + key, value); + } + + for (i = 0; i < variant->fields->len; i++) { + struct structure_field *entry, *copy_entry; + struct bt_ctf_field_type *copy_field; + + copy_entry = g_new0(struct structure_field, 1); + if (!copy_entry) { + goto error; + } + + entry = g_ptr_array_index(variant->fields, i); + copy_field = bt_ctf_field_type_copy(entry->type); + if (!copy_field) { + g_free(copy_entry); + goto error; + } + + copy_entry->name = entry->name; + copy_entry->type = copy_field; + g_ptr_array_add(copy_variant->fields, copy_entry); + } + + copy_variant->declaration = variant->declaration; + if (variant->tag_path) { + copy_variant->tag_path = bt_ctf_field_path_copy( + variant->tag_path); + if (!copy_variant->tag_path) { + goto error; + } + } +end: + if (copy_tag) { + bt_ctf_field_type_put(copy_tag); + } + + return copy; +error: + if (copy_tag) { + bt_ctf_field_type_put(copy_tag); + } + + bt_ctf_field_type_put(copy); + return NULL; +} + +static +struct bt_ctf_field_type *bt_ctf_field_type_array_copy( + struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type *copy = NULL, *copy_element; + struct bt_ctf_field_type_array *array, *copy_array; + + array = container_of(type, struct bt_ctf_field_type_array, + parent); + copy_element = bt_ctf_field_type_copy(array->element_type); + if (!copy_element) { + goto end; + } + + copy = bt_ctf_field_type_array_create(copy_element, array->length); + if (!copy) { + goto end; + } + + copy_array = container_of(copy, struct bt_ctf_field_type_array, + parent); + copy_array->declaration = array->declaration; +end: + if (copy_element) { + bt_ctf_field_type_put(copy_element); + } + + return copy; +} + +static +struct bt_ctf_field_type *bt_ctf_field_type_sequence_copy( + struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type *copy = NULL, *copy_element; + struct bt_ctf_field_type_sequence *sequence, *copy_sequence; + + sequence = container_of(type, struct bt_ctf_field_type_sequence, + parent); + copy_element = bt_ctf_field_type_copy(sequence->element_type); + if (!copy_element) { + goto end; + } + + copy = bt_ctf_field_type_sequence_create(copy_element, + sequence->length_field_name->len ? + sequence->length_field_name->str : NULL); + if (!copy) { + goto end; + } + + copy_sequence = container_of(copy, struct bt_ctf_field_type_sequence, + parent); + copy_sequence->declaration = sequence->declaration; + if (sequence->length_field_path) { + copy_sequence->length_field_path = bt_ctf_field_path_copy( + sequence->length_field_path); + if (!copy_sequence->length_field_path) { + goto error; + } + } +end: + if (copy_element) { + bt_ctf_field_type_put(copy_element); + } + + return copy; +error: + if (copy) { + bt_ctf_field_type_put(copy); + copy = NULL; + } + goto end; +} + +static +struct bt_ctf_field_type *bt_ctf_field_type_string_copy( + struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type *copy; + struct bt_ctf_field_type_string *string, *copy_string; + + copy = bt_ctf_field_type_string_create(); + if (!copy) { + goto end; + } + + string = container_of(type, struct bt_ctf_field_type_string, + parent); + copy_string = container_of(type, struct bt_ctf_field_type_string, + parent); + copy_string->declaration = string->declaration; +end: + return copy; +}