X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fsequence.c;h=2f6a7f189910e517409a0836254d82aa58bb5d19;hp=40a6998376b2e02b386edd2c1df40ebc9ea9e7d0;hb=9e29e16ee50d03cf4fdc0cea0220832323939dc3;hpb=e19c3d69b39d2fa422ab54b5ec7192799f536680 diff --git a/types/sequence.c b/types/sequence.c index 40a69983..2f6a7f18 100644 --- a/types/sequence.c +++ b/types/sequence.c @@ -24,120 +24,116 @@ #endif static -struct declaration *_sequence_declaration_new(struct type *type, - struct declaration_scope *parent_scope); +struct definition *_sequence_definition_new(struct declaration *declaration, + struct definition_scope *parent_scope, + GQuark field_name, int index); static -void _sequence_declaration_free(struct declaration *declaration); +void _sequence_definition_free(struct definition *definition); void sequence_copy(struct stream_pos *dest, const struct format *fdest, struct stream_pos *src, const struct format *fsrc, - struct declaration *declaration) + struct definition *definition) { - struct declaration_sequence *sequence = - container_of(declaration, struct declaration_sequence, p); - struct type_sequence *sequence_type = sequence->type; + struct definition_sequence *sequence = + container_of(definition, struct definition_sequence, p); + struct declaration_sequence *sequence_declaration = sequence->declaration; uint64_t i; - fsrc->sequence_begin(src, sequence_type); - fdest->sequence_begin(dest, sequence_type); + fsrc->sequence_begin(src, sequence_declaration); + fdest->sequence_begin(dest, sequence_declaration); - sequence->len->p.type->copy(dest, fdest, src, fsrc, + sequence->len->p.declaration->copy(dest, fdest, src, fsrc, &sequence->len->p); for (i = 0; i < sequence->len->value._unsigned; i++) { - struct declaration *elem_type = - sequence->current_element.declaration; - elem_type->p.type->copy(dest, fdest, src, fsrc, elem_type); + struct definition *elem = + sequence->current_element.definition; + elem->declaration->copy(dest, fdest, src, fsrc, elem); } - fsrc->sequence_end(src, sequence_type); - fdest->sequence_end(dest, sequence_type); + fsrc->sequence_end(src, sequence_declaration); + fdest->sequence_end(dest, sequence_declaration); } static -void _sequence_type_free(struct type *type) +void _sequence_declaration_free(struct declaration *declaration) { - struct type_sequence *sequence_type = - container_of(type, struct type_sequence, p); + struct declaration_sequence *sequence_declaration = + container_of(declaration, struct declaration_sequence, p); - type_unref(&sequence_type->len_type->p); - type_unref(sequence_type->elem); - g_free(sequence_type); + free_declaration_scope(sequence_declaration->scope); + declaration_unref(&sequence_declaration->len_declaration->p); + declaration_unref(sequence_declaration->elem); + g_free(sequence_declaration); } -struct type_sequence * - sequence_type_new(const char *name, struct type_integer *len_type, - struct type *elem_type) +struct declaration_sequence * + sequence_declaration_new(const char *name, struct declaration_integer *len_declaration, + struct declaration *elem_declaration, + struct declaration_scope *parent_scope) { - struct type_sequence *sequence_type; - struct type *type; - int ret; - - sequence_type = g_new(struct type_sequence, 1); - type = &sequence_type->p; - assert(!len_type->signedness); - type_ref(&len_type->p); - sequence_type->len_type = len_type; - type_ref(elem_type); - sequence_type->elem = elem_type; - type->name = g_quark_from_string(name); - type->alignment = max(len_type->p.alignment, elem_type->alignment); - type->copy = sequence_copy; - type->type_free = _sequence_type_free; - type->declaration_new = _sequence_declaration_new; - type->declaration_free = _sequence_declaration_free; - type->ref = 1; - - if (type->name) { - ret = register_type(type); - if (ret) - goto error_register; - } - return sequence_type; - -error_register: - type_unref(&len_type->p); - type_unref(elem_type); - g_free(sequence_type); - return NULL; + struct declaration_sequence *sequence_declaration; + struct declaration *declaration; + + sequence_declaration = g_new(struct declaration_sequence, 1); + declaration = &sequence_declaration->p; + assert(!len_declaration->signedness); + declaration_ref(&len_declaration->p); + sequence_declaration->len_declaration = len_declaration; + declaration_ref(elem_declaration); + sequence_declaration->elem = elem_declaration; + sequence_declaration->scope = new_declaration_scope(parent_scope); + declaration->id = CTF_TYPE_SEQUENCE; + declaration->name = g_quark_from_string(name); + declaration->alignment = max(len_declaration->p.alignment, elem_declaration->alignment); + declaration->copy = sequence_copy; + declaration->declaration_free = _sequence_declaration_free; + declaration->definition_new = _sequence_definition_new; + declaration->definition_free = _sequence_definition_free; + declaration->ref = 1; + return sequence_declaration; } static -struct declaration *_sequence_declaration_new(struct type *type, - struct declaration_scope *parent_scope) +struct definition *_sequence_definition_new(struct declaration *declaration, + struct definition_scope *parent_scope, + GQuark field_name, int index) { - struct type_sequence *sequence_type = - container_of(type, struct type_sequence, p); - struct declaration_sequence *sequence; - struct declaration *len_parent; + struct declaration_sequence *sequence_declaration = + container_of(declaration, struct declaration_sequence, p); + struct definition_sequence *sequence; + struct definition *len_parent; - sequence = g_new(struct declaration_sequence, 1); - type_ref(&sequence_type->p); - sequence->p.type = sequence_type; + sequence = g_new(struct definition_sequence, 1); + declaration_ref(&sequence_declaration->p); + sequence->p.declaration = declaration; + sequence->declaration = sequence_declaration; sequence->p.ref = 1; - sequence->scope = new_declaration_scope(parent_scope); - len_parent = - sequence_type->len_type.p->type_new(&sequence_type->len_type.p, - parent_scope); + sequence->p.index = index; + sequence->scope = new_definition_scope(parent_scope, field_name); + len_parent = sequence_declaration->len_declaration->p.definition_new(&sequence_declaration->len_declaration->p, + parent_scope, + g_quark_from_static_string("length"), 0); sequence->len = - container_of(len_parent, struct declaration_integer, p); - sequence->current_element.declaration = - sequence_type->elem.p->type_new(&sequence_type->elem.p, - parent_scope); + container_of(len_parent, struct definition_integer, p); + sequence->current_element.definition = + sequence_declaration->elem->definition_new(sequence_declaration->elem, + parent_scope, + g_quark_from_static_string("[]"), 1); return &sequence->p; } static -void _sequence_declaration_free(struct declaration *declaration) +void _sequence_definition_free(struct definition *definition) { - struct type_sequence *sequence = - container_of(declaration, struct type_sequence, p); - struct declaration *len_declaration = sequence->len; - struct declaration *elem_declaration = - sequence->current_element.declaration; - - len_declaration->p.type->declaration_free(len_declaration); - elem_declaration->p.type->declaration_free(elem_declaration); - free_declaration_scope(sequence->scope); - type_unref(sequence->p.type); + struct definition_sequence *sequence = + container_of(definition, struct definition_sequence, p); + struct definition *len_definition = &sequence->len->p; + struct definition *elem_definition = + sequence->current_element.definition; + + len_definition->declaration->definition_free(len_definition); + elem_definition->declaration->definition_free(elem_definition); + free_definition_scope(sequence->scope); + declaration_unref(sequence->p.declaration); g_free(sequence); }