X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent-types.c;h=c750d2187a12a5534579d6f4d29a27b48f9f7651;hb=265e809cb65022c2d9f15c0ddc0d607445621b76;hp=12172e5df1002ee7228b6d50b0d00cd63c84f5cf;hpb=3ffba9614c0e3ca176b98adddda2581275cc505d;p=babeltrace.git diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c index 12172e5d..c750d218 100644 --- a/formats/ctf/ir/event-types.c +++ b/formats/ctf/ir/event-types.c @@ -29,8 +29,11 @@ #include #include #include +#include #include #include +#include +#include #include #include #include @@ -52,26 +55,26 @@ struct range_overlap_query { }; static -void bt_ctf_field_type_destroy(struct bt_ctf_ref *); +void bt_ctf_field_type_destroy(struct bt_object *); 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, @@ -226,6 +229,44 @@ struct bt_ctf_field_type *(* const type_copy_funcs[])( [CTF_TYPE_STRING] = bt_ctf_field_type_string_copy, }; +static +int bt_ctf_field_type_integer_compare(struct bt_ctf_field_type *, + struct bt_ctf_field_type *); +static +int bt_ctf_field_type_floating_point_compare(struct bt_ctf_field_type *, + struct bt_ctf_field_type *); +static +int bt_ctf_field_type_enumeration_compare(struct bt_ctf_field_type *, + struct bt_ctf_field_type *); +static +int bt_ctf_field_type_string_compare(struct bt_ctf_field_type *, + struct bt_ctf_field_type *); +static +int bt_ctf_field_type_structure_compare(struct bt_ctf_field_type *, + struct bt_ctf_field_type *); +static +int bt_ctf_field_type_variant_compare(struct bt_ctf_field_type *, + struct bt_ctf_field_type *); +static +int bt_ctf_field_type_array_compare(struct bt_ctf_field_type *, + struct bt_ctf_field_type *); +static +int bt_ctf_field_type_sequence_compare(struct bt_ctf_field_type *, + struct bt_ctf_field_type *); + +static +int (* const type_compare_funcs[])(struct bt_ctf_field_type *, + struct bt_ctf_field_type *) = { + [CTF_TYPE_INTEGER] = bt_ctf_field_type_integer_compare, + [CTF_TYPE_ENUM] = bt_ctf_field_type_enumeration_compare, + [CTF_TYPE_FLOAT] = bt_ctf_field_type_floating_point_compare, + [CTF_TYPE_STRUCT] = bt_ctf_field_type_structure_compare, + [CTF_TYPE_VARIANT] = bt_ctf_field_type_variant_compare, + [CTF_TYPE_ARRAY] = bt_ctf_field_type_array_compare, + [CTF_TYPE_SEQUENCE] = bt_ctf_field_type_sequence_compare, + [CTF_TYPE_STRING] = bt_ctf_field_type_string_compare, +}; + static void destroy_enumeration_mapping(struct enumeration_mapping *mapping) { @@ -235,10 +276,7 @@ void destroy_enumeration_mapping(struct enumeration_mapping *mapping) static void destroy_structure_field(struct structure_field *field) { - if (field->type) { - bt_ctf_field_type_put(field->type); - } - + bt_put(field->type); g_free(field); } @@ -291,19 +329,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_object_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; } @@ -330,7 +372,7 @@ int add_structure_field(GPtrArray *fields, goto end; } - bt_ctf_field_type_get(field_type); + bt_get(field_type); field->name = name_quark; field->type = field_type; g_hash_table_insert(field_name_to_index, @@ -342,23 +384,19 @@ end: } static -void bt_ctf_field_type_destroy(struct bt_ctf_ref *ref) +void bt_ctf_field_type_destroy(struct bt_object *obj) { 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 = container_of(obj, struct bt_ctf_field_type, base); type_id = type->declaration->id; if (type_id <= CTF_TYPE_UNKNOWN || type_id >= NR_CTF_TYPES) { return; } - type_destroy_funcs[type_id](ref); + type_destroy_funcs[type_id](type); } BT_HIDDEN @@ -424,7 +462,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; } @@ -571,9 +609,7 @@ struct bt_ctf_clock *bt_ctf_field_type_integer_get_mapped_clock( integer = container_of(type, struct bt_ctf_field_type_integer, parent); clock = integer->mapped_clock; - if (clock) { - bt_ctf_clock_get(clock); - } + bt_get(clock); end: return clock; } @@ -591,14 +627,8 @@ int bt_ctf_field_type_integer_set_mapped_clock( } 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); - } - + bt_put(integer->mapped_clock); + bt_get(clock); integer->mapped_clock = clock; end: return ret; @@ -624,11 +654,11 @@ struct bt_ctf_field_type *bt_ctf_field_type_enumeration_create( enumeration->parent.declaration = &enumeration->declaration.p; enumeration->parent.declaration->id = CTF_TYPE_ENUM; - bt_ctf_field_type_get(integer_container_type); + bt_get(integer_container_type); 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); @@ -652,7 +682,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_enumeration_get_container_type( enumeration_type = container_of(type, struct bt_ctf_field_type_enumeration, parent); container_type = enumeration_type->container; - bt_ctf_field_type_get(container_type); + bt_get(container_type); end: return container_type; } @@ -1033,7 +1063,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; } @@ -1144,7 +1174,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; @@ -1217,7 +1247,7 @@ int bt_ctf_field_type_structure_get_field(struct bt_ctf_field_type *type, field = g_ptr_array_index(structure->fields, index); if (field_type) { *field_type = field->type; - bt_ctf_field_type_get(field->type); + bt_get(field->type); } if (field_name) { *field_name = g_quark_to_string(field->name); @@ -1254,7 +1284,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_structure_get_field_type_by_name( field = structure->fields->pdata[index]; field_type = field->type; - bt_ctf_field_type_get(field_type); + bt_get(field_type); end: return field_type; } @@ -1278,14 +1308,16 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_create( variant->tag_name = g_string_new(tag_name); variant->field_name_to_index = g_hash_table_new(NULL, NULL); variant->fields = g_ptr_array_new_with_free_func( - (GDestroyNotify)destroy_structure_field); + (GDestroyNotify) destroy_structure_field); if (enum_tag) { - bt_ctf_field_type_get(enum_tag); + bt_get(enum_tag); variant->tag = container_of(enum_tag, struct bt_ctf_field_type_enumeration, parent); } - bt_ctf_field_type_init(&variant->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; @@ -1307,7 +1339,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_get_tag_type( } tag_type = &variant->tag->parent; - bt_ctf_field_type_get(tag_type); + bt_get(tag_type); end: return tag_type; } @@ -1428,7 +1460,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_get_field_type_by_name( field = g_ptr_array_index(variant->fields, index); field_type = field->type; - bt_ctf_field_type_get(field_type); + bt_get(field_type); end: return field_type; } @@ -1497,7 +1529,7 @@ int bt_ctf_field_type_variant_get_field(struct bt_ctf_field_type *type, field = g_ptr_array_index(variant->fields, index); if (field_type) { *field_type = field->type; - bt_ctf_field_type_get(field->type); + bt_get(field->type); } if (field_name) { *field_name = g_quark_to_string(field->name); @@ -1525,10 +1557,10 @@ 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_get(element_type); + bt_get(element_type); array->element_type = element_type; array->length = length; - bt_ctf_field_type_init(&array->parent); + bt_ctf_field_type_init(&array->parent, FALSE); return &array->parent; error: return NULL; @@ -1546,7 +1578,33 @@ struct bt_ctf_field_type *bt_ctf_field_type_array_get_element_type( array = container_of(type, struct bt_ctf_field_type_array, parent); ret = array->element_type; - bt_ctf_field_type_get(ret); + bt_get(ret); +end: + return ret; +} + +BT_HIDDEN +int bt_ctf_field_type_array_set_element_type(struct bt_ctf_field_type *type, + struct bt_ctf_field_type *element_type) +{ + int ret = 0; + struct bt_ctf_field_type_array *array; + + if (!type || !element_type || + (type->declaration->id != CTF_TYPE_ARRAY)) { + ret = -1; + goto end; + } + + array = container_of(type, struct bt_ctf_field_type_array, parent); + + if (array->element_type) { + BT_PUT(array->element_type); + } + + array->element_type = element_type; + bt_get(array->element_type); + end: return ret; } @@ -1585,10 +1643,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_get(element_type); + bt_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); + bt_ctf_field_type_init(&sequence->parent, FALSE); return &sequence->parent; error: return NULL; @@ -1607,7 +1665,33 @@ struct bt_ctf_field_type *bt_ctf_field_type_sequence_get_element_type( sequence = container_of(type, struct bt_ctf_field_type_sequence, parent); ret = sequence->element_type; - bt_ctf_field_type_get(ret); + bt_get(ret); +end: + return ret; +} + +BT_HIDDEN +int bt_ctf_field_type_sequence_set_element_type(struct bt_ctf_field_type *type, + struct bt_ctf_field_type *element_type) +{ + int ret = 0; + struct bt_ctf_field_type_sequence *sequence; + + if (!type || !element_type || + (type->declaration->id != CTF_TYPE_SEQUENCE)) { + ret = -1; + goto end; + } + + sequence = container_of(type, struct bt_ctf_field_type_sequence, parent); + + if (sequence->element_type) { + BT_PUT(sequence->element_type); + } + + sequence->element_type = element_type; + bt_get(sequence->element_type); + end: return ret; } @@ -1640,7 +1724,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; @@ -1710,7 +1794,7 @@ int bt_ctf_field_type_get_alignment(struct bt_ctf_field_type *type) } ret = bt_ctf_field_type_get_alignment(element); - bt_ctf_field_type_put(element); + bt_put(element); break; } case CTF_TYPE_ARRAY: @@ -1724,7 +1808,7 @@ int bt_ctf_field_type_get_alignment(struct bt_ctf_field_type *type) } ret = bt_ctf_field_type_get_alignment(element); - bt_ctf_field_type_put(element); + bt_put(element); break; } case CTF_TYPE_STRUCT: @@ -1751,7 +1835,7 @@ int bt_ctf_field_type_get_alignment(struct bt_ctf_field_type *type) assert(field); field_alignment = bt_ctf_field_type_get_alignment( field); - bt_ctf_field_type_put(field); + bt_put(field); if (field_alignment < 0) { ret = field_alignment; goto end; @@ -1774,13 +1858,26 @@ 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 bit-aligned (1) or byte aligned */ - if (!type || type->frozen || (alignment != 1 && (alignment & 0x7))) { + /* Alignment must be a power of two */ + if (!type || type->frozen || !is_power_of_two(alignment)) { + ret = -1; + goto end; + } + + type_id = bt_ctf_field_type_get_type_id(type); + if (type_id == CTF_TYPE_UNKNOWN) { ret = -1; goto end; } @@ -1791,6 +1888,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: @@ -1801,7 +1905,6 @@ 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; @@ -1812,7 +1915,7 @@ enum bt_ctf_byte_order bt_ctf_field_type_get_byte_order( { struct bt_ctf_field_type_integer *integer = container_of( type, struct bt_ctf_field_type_integer, parent); - internal_byte_order = integer->declaration.byte_order; + ret = integer->user_byte_order; break; } case CTF_TYPE_FLOAT: @@ -1821,26 +1924,18 @@ enum bt_ctf_byte_order bt_ctf_field_type_get_byte_order( container_of(type, struct bt_ctf_field_type_floating_point, parent); - internal_byte_order = floating_point->declaration.byte_order; + ret = floating_point->user_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; - } + assert(ret == BT_CTF_BYTE_ORDER_NATIVE || + ret == BT_CTF_BYTE_ORDER_LITTLE_ENDIAN || + ret == BT_CTF_BYTE_ORDER_BIG_ENDIAN || + ret == BT_CTF_BYTE_ORDER_NETWORK); + end: return ret; } @@ -1892,22 +1987,54 @@ enum ctf_type_id bt_ctf_field_type_get_type_id( return type->declaration->id; } -void bt_ctf_field_type_get(struct bt_ctf_field_type *type) +int bt_ctf_field_type_is_integer(struct bt_ctf_field_type *type) { - if (!type) { - return; - } + return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_INTEGER; +} - bt_ctf_ref_get(&type->ref_count); +int bt_ctf_field_type_is_floating_point(struct bt_ctf_field_type *type) +{ + return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_FLOAT; } -void bt_ctf_field_type_put(struct bt_ctf_field_type *type) +int bt_ctf_field_type_is_enumeration(struct bt_ctf_field_type *type) { - if (!type) { - return; - } + return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_ENUM; +} + +int bt_ctf_field_type_is_string(struct bt_ctf_field_type *type) +{ + return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_STRING; +} - bt_ctf_ref_put(&type->ref_count, bt_ctf_field_type_destroy); +int bt_ctf_field_type_is_structure(struct bt_ctf_field_type *type) +{ + return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_STRUCT; +} + +int bt_ctf_field_type_is_array(struct bt_ctf_field_type *type) +{ + return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_ARRAY; +} + +int bt_ctf_field_type_is_sequence(struct bt_ctf_field_type *type) +{ + return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_SEQUENCE; +} + +int bt_ctf_field_type_is_variant(struct bt_ctf_field_type *type) +{ + return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_VARIANT; +} + +void bt_ctf_field_type_get(struct bt_ctf_field_type *type) +{ + bt_get(type); +} + +void bt_ctf_field_type_put(struct bt_ctf_field_type *type) +{ + bt_put(type); } BT_HIDDEN @@ -2114,6 +2241,35 @@ end: return ret; } +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) +{ + int ret = 0; + struct bt_ctf_field_type_structure *structure; + + if (!type || !field || + bt_ctf_field_type_get_type_id(type) != CTF_TYPE_STRUCT) { + ret = -1; + goto end; + } + + structure = container_of(type, struct bt_ctf_field_type_structure, + parent); + if (index < 0 || index >= structure->fields->len) { + ret = -1; + goto end; + } + + bt_get(field); + bt_put(((struct structure_field *) + g_ptr_array_index(structure->fields, index))->type); + ((struct structure_field *) structure->fields->pdata[index])->type = + field; +end: + return ret; +} + BT_HIDDEN int bt_ctf_field_type_variant_get_field_name_index( struct bt_ctf_field_type *type, const char *name) @@ -2170,6 +2326,18 @@ 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) @@ -2192,6 +2360,18 @@ 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) @@ -2207,9 +2387,9 @@ int bt_ctf_field_type_variant_set_tag(struct bt_ctf_field_type *type, variant = container_of(type, struct bt_ctf_field_type_variant, parent); - bt_ctf_field_type_get(tag); + bt_get(tag); if (variant->tag) { - bt_ctf_field_type_put(&variant->tag->parent); + bt_put(&variant->tag->parent); } variant->tag = container_of(tag, struct bt_ctf_field_type_enumeration, parent); @@ -2217,139 +2397,150 @@ 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_get(field); + bt_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_ref *ref) +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 *integer = + (struct bt_ctf_field_type_integer *) type; - if (!ref) { + if (!type) { return; } - integer = container_of( - container_of(ref, struct bt_ctf_field_type, ref_count), - struct bt_ctf_field_type_integer, parent); - if (integer->mapped_clock) { - bt_ctf_clock_put(integer->mapped_clock); - } + bt_put(integer->mapped_clock); g_free(integer); } static -void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_ref *ref) +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 *enumeration = + (struct bt_ctf_field_type_enumeration *) type; - if (!ref) { + if (!type) { return; } - 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); + bt_put(enumeration->container); g_free(enumeration); } static -void bt_ctf_field_type_floating_point_destroy(struct bt_ctf_ref *ref) +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 *floating_point = + (struct bt_ctf_field_type_floating_point *) type; - if (!ref) { + if (!type) { return; } - 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); } static -void bt_ctf_field_type_structure_destroy(struct bt_ctf_ref *ref) +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 *structure = + (struct bt_ctf_field_type_structure *) type; - if (!ref) { + if (!type) { 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); } static -void bt_ctf_field_type_variant_destroy(struct bt_ctf_ref *ref) +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 *variant = + (struct bt_ctf_field_type_variant *) type; - if (!ref) { + if (!type) { return; } - 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); + bt_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_ref *ref) +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 *array = + (struct bt_ctf_field_type_array *) type; - if (!ref) { + if (!type) { return; } - 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); + bt_put(array->element_type); g_free(array); } static -void bt_ctf_field_type_sequence_destroy(struct bt_ctf_ref *ref) +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 *sequence = + (struct bt_ctf_field_type_sequence *) type; - if (!ref) { + if (!type) { return; } - 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); + bt_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_ref *ref) +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 *string = + (struct bt_ctf_field_type_string *) type; - if (!ref) { + if (!type) { return; } - string = container_of( - container_of(ref, struct bt_ctf_field_type, ref_count), - struct bt_ctf_field_type_string, parent); g_free(string); } @@ -2394,8 +2585,6 @@ 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); @@ -2587,7 +2776,7 @@ int bt_ctf_field_type_enumeration_serialize(struct bt_ctf_field_type *type, g_string_assign(context->field_name, ""); } error_put_container_type: - bt_ctf_field_type_put(container_type); + bt_put(container_type); end: return ret; } @@ -2782,6 +2971,33 @@ int bt_ctf_field_type_string_serialize(struct bt_ctf_field_type *type, return 0; } +static +enum bt_ctf_byte_order get_ctf_ir_byte_order(int byte_order) { + enum bt_ctf_byte_order ret; + + switch (byte_order) { + case BT_CTF_BYTE_ORDER_LITTLE_ENDIAN: + case LITTLE_ENDIAN: + ret = BT_CTF_BYTE_ORDER_LITTLE_ENDIAN; + break; + case BT_CTF_BYTE_ORDER_BIG_ENDIAN: + case BIG_ENDIAN: + ret = BT_CTF_BYTE_ORDER_BIG_ENDIAN; + break; + case BT_CTF_BYTE_ORDER_NETWORK: + ret = BT_CTF_BYTE_ORDER_NETWORK; + break; + case BT_CTF_BYTE_ORDER_NATIVE: + ret = BT_CTF_BYTE_ORDER_NATIVE; + break; + default: + ret = BT_CTF_BYTE_ORDER_UNKNOWN; + break; + } + + return ret; +} + static void bt_ctf_field_type_integer_set_byte_order(struct bt_ctf_field_type *type, int byte_order, int set_native) @@ -2790,10 +3006,17 @@ void bt_ctf_field_type_integer_set_byte_order(struct bt_ctf_field_type *type, struct bt_ctf_field_type_integer, parent); if (set_native) { - integer_type->declaration.byte_order = - integer_type->declaration.byte_order == 0 ? - byte_order : integer_type->declaration.byte_order; + if (integer_type->user_byte_order == BT_CTF_BYTE_ORDER_NATIVE) { + /* + * User byte order is native, so we can set + * the real byte order. + */ + integer_type->declaration.byte_order = + byte_order; + } } else { + integer_type->user_byte_order = + get_ctf_ir_byte_order(byte_order); integer_type->declaration.byte_order = byte_order; } } @@ -2819,20 +3042,24 @@ void bt_ctf_field_type_floating_point_set_byte_order( parent); 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; + if (floating_point_type->user_byte_order == + BT_CTF_BYTE_ORDER_NATIVE) { + /* + * User byte order is native, so we can set + * the real byte order. + */ + 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; + } } else { + floating_point_type->user_byte_order = + get_ctf_ir_byte_order(byte_order); floating_point_type->declaration.byte_order = byte_order; floating_point_type->sign.byte_order = byte_order; floating_point_type->mantissa.byte_order = byte_order; @@ -2929,9 +3156,12 @@ struct bt_ctf_field_type *bt_ctf_field_type_integer_copy( parent); copy_integer->declaration = integer->declaration; if (integer->mapped_clock) { - bt_ctf_clock_get(integer->mapped_clock); + bt_get(integer->mapped_clock); copy_integer->mapped_clock = integer->mapped_clock; } + + copy_integer->user_byte_order = integer->user_byte_order; + end: return copy; } @@ -2977,16 +3207,12 @@ struct bt_ctf_field_type *bt_ctf_field_type_enumeration_copy( copy_enumeration->declaration = enumeration->declaration; end: - if (copy_container) { - bt_ctf_field_type_put(copy_container); - } + bt_put(copy_container); return copy; error: - if (copy_container) { - bt_ctf_field_type_put(copy_container); - } - bt_ctf_field_type_put(copy); - return NULL; + bt_put(copy_container); + BT_PUT(copy); + return copy; } static @@ -3009,6 +3235,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_floating_point_copy( copy_float->sign = floating_point->sign; copy_float->mantissa = floating_point->mantissa; copy_float->exp = floating_point->exp; + copy_float->user_byte_order = floating_point->user_byte_order; end: return copy; } @@ -3065,8 +3292,8 @@ struct bt_ctf_field_type *bt_ctf_field_type_structure_copy( end: return copy; error: - bt_ctf_field_type_put(copy); - return NULL; + BT_PUT(copy); + return copy; } static @@ -3134,18 +3361,12 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_copy( } } end: - if (copy_tag) { - bt_ctf_field_type_put(copy_tag); - } - + bt_put(copy_tag); return copy; error: - if (copy_tag) { - bt_ctf_field_type_put(copy_tag); - } - - bt_ctf_field_type_put(copy); - return NULL; + bt_put(copy_tag); + BT_PUT(copy); + return copy; } static @@ -3171,10 +3392,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_array_copy( parent); copy_array->declaration = array->declaration; end: - if (copy_element) { - bt_ctf_field_type_put(copy_element); - } - + bt_put(copy_element); return copy; } @@ -3210,16 +3428,10 @@ struct bt_ctf_field_type *bt_ctf_field_type_sequence_copy( } } end: - if (copy_element) { - bt_ctf_field_type_put(copy_element); - } - + bt_put(copy_element); return copy; error: - if (copy) { - bt_ctf_field_type_put(copy); - copy = NULL; - } + BT_PUT(copy); goto end; } @@ -3243,3 +3455,407 @@ struct bt_ctf_field_type *bt_ctf_field_type_string_copy( end: return copy; } + +static +int bt_ctf_field_type_integer_compare(struct bt_ctf_field_type *type_a, + struct bt_ctf_field_type *type_b) +{ + int ret = 1; + struct bt_ctf_field_type_integer *integer_a; + struct bt_ctf_field_type_integer *integer_b; + struct declaration_integer *decl_a; + struct declaration_integer *decl_b; + + integer_a = container_of(type_a, struct bt_ctf_field_type_integer, + parent); + integer_b = container_of(type_b, struct bt_ctf_field_type_integer, + parent); + decl_a = &integer_a->declaration; + decl_b = &integer_b->declaration; + + /* Length */ + if (decl_a->len != decl_b->len) { + goto end; + } + + /* + * Compare user byte orders only, not the cached, + * real byte orders. + */ + if (integer_a->user_byte_order != integer_b->user_byte_order) { + goto end; + } + + /* Signedness */ + if (decl_a->signedness != decl_b->signedness) { + goto end; + } + + /* Base */ + if (decl_a->base != decl_b->base) { + goto end; + } + + /* Encoding */ + if (decl_a->encoding != decl_b->encoding) { + goto end; + } + + /* Mapped clock */ + if (integer_a->mapped_clock != integer_b->mapped_clock) { + goto end; + } + + /* Equal */ + ret = 0; + +end: + return ret; +} + +static +int bt_ctf_field_type_floating_point_compare(struct bt_ctf_field_type *type_a, + struct bt_ctf_field_type *type_b) +{ + int ret = 1; + struct bt_ctf_field_type_floating_point *float_a; + struct bt_ctf_field_type_floating_point *float_b; + + float_a = container_of(type_a, + struct bt_ctf_field_type_floating_point, parent); + float_b = container_of(type_b, + struct bt_ctf_field_type_floating_point, parent); + + /* Sign length */ + if (float_a->sign.len != float_b->sign.len) { + goto end; + } + + /* Exponent length */ + if (float_a->exp.len != float_b->exp.len) { + goto end; + } + + /* Mantissa length */ + if (float_a->mantissa.len != float_b->mantissa.len) { + goto end; + } + + /* + * Compare user byte orders only, not the cached, + * real byte orders. + */ + if (float_a->user_byte_order != float_b->user_byte_order) { + goto end; + } + + /* Equal */ + ret = 0; + +end: + return ret; +} + +static +int compare_enumeration_mappings(struct enumeration_mapping *mapping_a, + struct enumeration_mapping *mapping_b) +{ + int ret = 1; + + /* Label */ + if (mapping_a->string != mapping_b->string) { + goto end; + } + + /* Range start */ + if (mapping_a->range_start._unsigned != + mapping_b->range_start._unsigned) { + goto end; + } + + /* Range end */ + if (mapping_a->range_end._unsigned != + mapping_b->range_end._unsigned) { + goto end; + } + + /* Equal */ + ret = 0; + +end: + return ret; +} + +static +int bt_ctf_field_type_enumeration_compare(struct bt_ctf_field_type *type_a, + struct bt_ctf_field_type *type_b) +{ + int ret = 1; + int i; + struct bt_ctf_field_type_enumeration *enum_a; + struct bt_ctf_field_type_enumeration *enum_b; + + enum_a = container_of(type_a, + struct bt_ctf_field_type_enumeration, parent); + enum_b = container_of(type_b, + struct bt_ctf_field_type_enumeration, parent); + + /* Container field type */ + ret = bt_ctf_field_type_compare(enum_a->container, enum_b->container); + if (ret) { + goto end; + } + + ret = 1; + + /* Entries */ + if (enum_a->entries->len != enum_b->entries->len) { + goto end; + } + + for (i = 0; i < enum_a->entries->len; ++i) { + struct enumeration_mapping *mapping_a = + g_ptr_array_index(enum_a->entries, i); + struct enumeration_mapping *mapping_b = + g_ptr_array_index(enum_b->entries, i); + + if (compare_enumeration_mappings(mapping_a, mapping_b)) { + goto end; + } + } + + /* Equal */ + ret = 0; + +end: + return ret; +} + +static +int bt_ctf_field_type_string_compare(struct bt_ctf_field_type *type_a, + struct bt_ctf_field_type *type_b) +{ + int ret = 1; + struct bt_ctf_field_type_string *string_a; + struct bt_ctf_field_type_string *string_b; + + string_a = container_of(type_a, + struct bt_ctf_field_type_string, parent); + string_b = container_of(type_b, + struct bt_ctf_field_type_string, parent); + + /* Encoding */ + if (string_a->declaration.encoding != string_b->declaration.encoding) { + goto end; + } + + /* Equal */ + ret = 0; + +end: + return ret; +} + +static +int compare_structure_fields(struct structure_field *field_a, + struct structure_field *field_b) +{ + int ret = 1; + + /* Label */ + if (field_a->name != field_b->name) { + goto end; + } + + /* Type */ + ret = bt_ctf_field_type_compare(field_a->type, field_b->type); + +end: + return ret; +} + +static +int bt_ctf_field_type_structure_compare(struct bt_ctf_field_type *type_a, + struct bt_ctf_field_type *type_b) +{ + int ret = 1; + int i; + struct bt_ctf_field_type_structure *struct_a; + struct bt_ctf_field_type_structure *struct_b; + + struct_a = container_of(type_a, + struct bt_ctf_field_type_structure, parent); + struct_b = container_of(type_b, + struct bt_ctf_field_type_structure, parent); + + /* Alignment */ + if (bt_ctf_field_type_get_alignment(type_a) != + bt_ctf_field_type_get_alignment(type_b)) { + goto end; + } + + /* Fields */ + if (struct_a->fields->len != struct_b->fields->len) { + goto end; + } + + for (i = 0; i < struct_a->fields->len; ++i) { + struct structure_field *field_a = + g_ptr_array_index(struct_a->fields, i); + struct structure_field *field_b = + g_ptr_array_index(struct_b->fields, i); + + ret = compare_structure_fields(field_a, field_b); + if (ret) { + goto end; + } + + ret = 1; + } + + /* Equal */ + ret = 0; + +end: + return ret; +} + +static +int bt_ctf_field_type_variant_compare(struct bt_ctf_field_type *type_a, + struct bt_ctf_field_type *type_b) +{ + int ret = 1; + int i; + struct bt_ctf_field_type_variant *variant_a; + struct bt_ctf_field_type_variant *variant_b; + + variant_a = container_of(type_a, + struct bt_ctf_field_type_variant, parent); + variant_b = container_of(type_b, + struct bt_ctf_field_type_variant, parent); + + /* Tag name */ + if (strcmp(variant_a->tag_name->str, variant_b->tag_name->str)) { + goto end; + } + + /* Tag type */ + ret = bt_ctf_field_type_compare( + (struct bt_ctf_field_type *) variant_a->tag, + (struct bt_ctf_field_type *) variant_b->tag); + if (ret) { + goto end; + } + + ret = 1; + + /* Fields */ + if (variant_a->fields->len != variant_b->fields->len) { + goto end; + } + + for (i = 0; i < variant_a->fields->len; ++i) { + struct structure_field *field_a = + g_ptr_array_index(variant_a->fields, i); + struct structure_field *field_b = + g_ptr_array_index(variant_b->fields, i); + + ret = compare_structure_fields(field_a, field_b); + if (ret) { + goto end; + } + + ret = 1; + } + + /* Equal */ + ret = 0; + +end: + return ret; +} + +static +int bt_ctf_field_type_array_compare(struct bt_ctf_field_type *type_a, + struct bt_ctf_field_type *type_b) +{ + int ret = 1; + struct bt_ctf_field_type_array *array_a; + struct bt_ctf_field_type_array *array_b; + + array_a = container_of(type_a, + struct bt_ctf_field_type_array, parent); + array_b = container_of(type_b, + struct bt_ctf_field_type_array, parent); + + /* Length */ + if (array_a->length != array_b->length) { + goto end; + } + + /* Element type */ + ret = bt_ctf_field_type_compare(array_a->element_type, + array_b->element_type); + +end: + return ret; +} + +static +int bt_ctf_field_type_sequence_compare(struct bt_ctf_field_type *type_a, + struct bt_ctf_field_type *type_b) +{ + int ret = -1; + struct bt_ctf_field_type_sequence *sequence_a; + struct bt_ctf_field_type_sequence *sequence_b; + + sequence_a = container_of(type_a, + struct bt_ctf_field_type_sequence, parent); + sequence_b = container_of(type_b, + struct bt_ctf_field_type_sequence, parent); + + /* Length name */ + if (strcmp(sequence_a->length_field_name->str, + sequence_b->length_field_name->str)) { + goto end; + } + + /* Element type */ + ret = bt_ctf_field_type_compare(sequence_a->element_type, + sequence_b->element_type); + +end: + return ret; +} + +int bt_ctf_field_type_compare(struct bt_ctf_field_type *type_a, + struct bt_ctf_field_type *type_b) +{ + int ret = 1; + + if (type_a == type_b) { + /* Same reference: equal (even if both are NULL) */ + ret = 0; + goto end; + } + + if (!type_a || !type_b) { + ret = -1; + goto end; + } + + if (type_a->declaration->id != type_b->declaration->id) { + /* Different type IDs */ + goto end; + } + + if (type_a->declaration->id == CTF_TYPE_UNKNOWN) { + /* Both have unknown type IDs */ + goto end; + } + + ret = type_compare_funcs[type_a->declaration->id](type_a, type_b); + +end: + return ret; +}