X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent-types.c;h=9b6e7bbbfd8c0ac0b1d65ed3be343dc8a8d2ad2a;hb=aa4e271c0a4467105f3909779875746ca3eeeedf;hp=5e9b31fe954b869e7c46c9aeb6c27543adffe1ed;hpb=e54fab7eb1bbd74bbfb8ed9f3422b90d8d54a2d1;p=babeltrace.git diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c index 5e9b31fe..9b6e7bbb 100644 --- a/formats/ctf/ir/event-types.c +++ b/formats/ctf/ir/event-types.c @@ -28,6 +28,8 @@ #include #include +#include +#include #include #include #include @@ -149,19 +151,79 @@ 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 +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 @@ -275,7 +337,6 @@ int add_structure_field(GPtrArray *fields, (gpointer) (unsigned long) name_quark, (gpointer) (unsigned long) fields->len); g_ptr_array_add(fields, field); - bt_ctf_field_type_freeze(field_type); end: return ret; } @@ -297,9 +358,6 @@ void bt_ctf_field_type_destroy(struct bt_ctf_ref *ref) return; } - if (type->alias_name) { - g_string_free(type->alias_name, TRUE); - } type_destroy_funcs[type_id](ref); } @@ -313,12 +371,40 @@ 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; + } + 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; } end: return ret; @@ -329,7 +415,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; } @@ -387,11 +473,6 @@ 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; - goto end; - } - integer->declaration.signedness = !!is_signed; end: return ret; @@ -478,6 +559,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) { @@ -703,10 +829,10 @@ end: return name; } -int64_t bt_ctf_field_type_enumeration_get_mapping_count( +int bt_ctf_field_type_enumeration_get_mapping_count( struct bt_ctf_field_type *type) { - int64_t ret = 0; + int ret = 0; struct bt_ctf_field_type_enumeration *enumeration; if (!type || (type->declaration->id != CTF_TYPE_ENUM)) { @@ -716,14 +842,14 @@ int64_t bt_ctf_field_type_enumeration_get_mapping_count( enumeration = container_of(type, struct bt_ctf_field_type_enumeration, parent); - ret = enumeration->entries->len; + ret = (int) enumeration->entries->len; end: return ret; } static inline struct enumeration_mapping *get_enumeration_mapping( - struct bt_ctf_field_type *type, size_t index) + struct bt_ctf_field_type *type, int index) { struct enumeration_mapping *mapping = NULL; struct bt_ctf_field_type_enumeration *enumeration; @@ -740,13 +866,13 @@ end: } int bt_ctf_field_type_enumeration_get_mapping( - struct bt_ctf_field_type *type, size_t index, + 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 || !string || !range_start || !range_end || + if (!type || index < 0 || !string || !range_start || !range_end || (type->declaration->id != CTF_TYPE_ENUM)) { ret = -1; goto end; @@ -766,13 +892,13 @@ end: } int bt_ctf_field_type_enumeration_get_mapping_unsigned( - struct bt_ctf_field_type *type, size_t index, + 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 || !string || !range_start || !range_end || + if (!type || index < 0 || !string || !range_start || !range_end || (type->declaration->id != CTF_TYPE_ENUM)) { ret = -1; goto end; @@ -792,15 +918,13 @@ end: } int bt_ctf_field_type_enumeration_get_mapping_index_by_name( - struct bt_ctf_field_type *type, const char *name, - size_t *index) + struct bt_ctf_field_type *type, const char *name) { - size_t i; GQuark name_quark; struct bt_ctf_field_type_enumeration *enumeration; - int ret = 0; + int i, ret = 0; - if (!type || !name || !index || + if (!type || !name || (type->declaration->id != CTF_TYPE_ENUM)) { ret = -1; goto end; @@ -819,7 +943,7 @@ int bt_ctf_field_type_enumeration_get_mapping_index_by_name( get_enumeration_mapping(type, i); if (mapping->string == name_quark) { - *index = i; + ret = i; goto end; } } @@ -830,14 +954,12 @@ end: } int bt_ctf_field_type_enumeration_get_mapping_index_by_value( - struct bt_ctf_field_type *type, int64_t value, - size_t *index) + struct bt_ctf_field_type *type, int64_t value) { struct bt_ctf_field_type_enumeration *enumeration; - size_t i; - int ret = 0; + int i, ret = 0; - if (!type || !index || (type->declaration->id != CTF_TYPE_ENUM)) { + if (!type || (type->declaration->id != CTF_TYPE_ENUM)) { ret = -1; goto end; } @@ -850,7 +972,7 @@ int bt_ctf_field_type_enumeration_get_mapping_index_by_value( if (value >= mapping->range_start._signed && value <= mapping->range_end._signed) { - *index = i; + ret = i; goto end; } } @@ -861,14 +983,12 @@ end: } int bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value( - struct bt_ctf_field_type *type, uint64_t value, - size_t *index) + struct bt_ctf_field_type *type, uint64_t value) { struct bt_ctf_field_type_enumeration *enumeration; - size_t i; - int ret = 0; + int i, ret = 0; - if (!type || !index || (type->declaration->id != CTF_TYPE_ENUM)) { + if (!type || (type->declaration->id != CTF_TYPE_ENUM)) { ret = -1; goto end; } @@ -881,7 +1001,7 @@ int bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value( if (value >= mapping->range_start._unsigned && value <= mapping->range_end._unsigned) { - *index = i; + ret = i; goto end; } } @@ -1021,10 +1141,10 @@ struct bt_ctf_field_type *bt_ctf_field_type_structure_create(void) 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; @@ -1038,7 +1158,7 @@ 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; @@ -1061,10 +1181,10 @@ end: return ret; } -int64_t bt_ctf_field_type_structure_get_field_count( +int bt_ctf_field_type_structure_get_field_count( struct bt_ctf_field_type *type) { - int64_t ret = 0; + int ret = 0; struct bt_ctf_field_type_structure *structure; if (!type || (type->declaration->id != CTF_TYPE_STRUCT)) { @@ -1074,20 +1194,20 @@ int64_t bt_ctf_field_type_structure_get_field_count( structure = container_of(type, struct bt_ctf_field_type_structure, parent); - ret = structure->fields->len; + 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, - size_t index) + int index) { struct bt_ctf_field_type_structure *structure; struct structure_field *field; int ret = 0; - if (!type || !field_name || !field_type || + if (!type || index < 0 || !field_name || !field_type || (type->declaration->id != CTF_TYPE_STRUCT)) { ret = -1; goto end; @@ -1146,8 +1266,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_create( { struct bt_ctf_field_type_variant *variant = NULL; - if (!enum_tag || validate_identifier(tag_name) || - (enum_tag->declaration->id != CTF_TYPE_ENUM)) { + if (tag_name && bt_ctf_validate_identifier(tag_name)) { goto error; } @@ -1159,13 +1278,16 @@ 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); + 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); return &variant->parent; error: return NULL; @@ -1182,6 +1304,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: @@ -1199,23 +1325,45 @@ 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); if (!type || !field_type || type->frozen || - validate_identifier(field_name) || + bt_ctf_validate_identifier(field_name) || (type->declaration->id != CTF_TYPE_VARIANT) || bt_ctf_field_type_validate(field_type)) { ret = -1; @@ -1223,19 +1371,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; } @@ -1298,9 +1458,9 @@ end: return field_type; } -int64_t bt_ctf_field_type_variant_get_field_count(struct bt_ctf_field_type *type) +int bt_ctf_field_type_variant_get_field_count(struct bt_ctf_field_type *type) { - int64_t ret = 0; + int ret = 0; struct bt_ctf_field_type_variant *variant; if (!type || (type->declaration->id != CTF_TYPE_VARIANT)) { @@ -1310,7 +1470,7 @@ int64_t bt_ctf_field_type_variant_get_field_count(struct bt_ctf_field_type *type variant = container_of(type, struct bt_ctf_field_type_variant, parent); - ret = variant->fields->len; + ret = (int) variant->fields->len; end: return ret; @@ -1318,13 +1478,13 @@ end: 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, - size_t index) + int index) { struct bt_ctf_field_type_variant *variant; struct structure_field *field; int ret = 0; - if (!type || !field_name || !field_type || + if (!type || index < 0 || !field_name || !field_type || (type->declaration->id != CTF_TYPE_VARIANT)) { ret = -1; goto end; @@ -1363,10 +1523,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; @@ -1413,7 +1574,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_sequence_create( { 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; } @@ -1425,10 +1586,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; @@ -1565,6 +1726,7 @@ 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; @@ -1575,9 +1737,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); - ret = integer->declaration.byte_order == LITTLE_ENDIAN ? - BT_CTF_BYTE_ORDER_LITTLE_ENDIAN : - BT_CTF_BYTE_ORDER_BIG_ENDIAN; + internal_byte_order = integer->declaration.byte_order; break; } case CTF_TYPE_FLOAT: @@ -1586,13 +1746,25 @@ enum bt_ctf_byte_order bt_ctf_field_type_get_byte_order( container_of(type, struct bt_ctf_field_type_floating_point, parent); - ret = floating_point->declaration.byte_order == LITTLE_ENDIAN ? - BT_CTF_BYTE_ORDER_LITTLE_ENDIAN : - BT_CTF_BYTE_ORDER_BIG_ENDIAN; + 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; @@ -1610,11 +1782,10 @@ 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: - 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; @@ -1628,8 +1799,9 @@ 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); + set_byte_order_funcs[type_id](type, internal_byte_order, 0); } end: return ret; @@ -1645,20 +1817,6 @@ 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) { @@ -1768,6 +1926,174 @@ 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); + } +} + +BT_HIDDEN +struct bt_ctf_field_type *bt_ctf_field_type_copy(struct bt_ctf_field_type *type) +{ + struct bt_ctf_field_type *copy = NULL; + + if (!type) { + goto end; + } + + copy = type_copy_funcs[type->declaration->id](type); +end: + return copy; +} + +BT_HIDDEN +struct bt_ctf_field_path *bt_ctf_field_path_create(void) +{ + struct bt_ctf_field_path *field_path = NULL; + + field_path = g_new0(struct bt_ctf_field_path, 1); + if (!field_path) { + goto end; + } + + 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; +} + + +BT_HIDDEN +struct bt_ctf_field_path *bt_ctf_field_path_copy( + struct bt_ctf_field_path *path) +{ + struct bt_ctf_field_path *new_path = bt_ctf_field_path_create(); + + if (!new_path) { + goto end; + } + + 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; +} + +BT_HIDDEN +void bt_ctf_field_path_destroy(struct bt_ctf_field_path *path) +{ + if (!path) { + return; + } + + if (path->path_indexes) { + g_array_free(path->path_indexes, TRUE); + } + g_free(path); +} + +BT_HIDDEN +int bt_ctf_field_type_structure_get_field_name_index( + struct bt_ctf_field_type *type, const char *name) +{ + int ret; + size_t index; + GQuark name_quark; + struct bt_ctf_field_type_structure *structure; + + if (!type || !name || + bt_ctf_field_type_get_type_id(type) != CTF_TYPE_STRUCT) { + ret = -1; + goto end; + } + + name_quark = g_quark_try_string(name); + if (!name_quark) { + ret = -1; + 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)) { + ret = -1; + goto end; + } + ret = (int) index; +end: + return ret; +} + +BT_HIDDEN +int bt_ctf_field_type_variant_get_field_name_index( + struct bt_ctf_field_type *type, const char *name) +{ + 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; +} static void bt_ctf_field_type_integer_destroy(struct bt_ctf_ref *ref) { @@ -1780,6 +2106,9 @@ 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); + if (integer->mapped_clock) { + bt_ctf_clock_put(integer->mapped_clock); + } g_free(integer); } @@ -1881,6 +2210,7 @@ void bt_ctf_field_type_sequence_destroy(struct bt_ctf_ref *ref) struct bt_ctf_field_type_sequence, parent); 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); } @@ -2018,15 +2348,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 @@ -2195,8 +2541,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]; @@ -2301,24 +2652,455 @@ 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); + } +} + +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; +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; }