X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fsequence.c;h=2f6a7f189910e517409a0836254d82aa58bb5d19;hp=8f3fed9aff924105dee3220b67475f6a832dcc08;hb=9e29e16ee50d03cf4fdc0cea0220832323939dc3;hpb=c054553dac076f91196b372fa19efaf2adc4e4f9 diff --git a/types/sequence.c b/types/sequence.c index 8f3fed9a..2f6a7f18 100644 --- a/types/sequence.c +++ b/types/sequence.c @@ -24,116 +24,116 @@ #endif static -struct type *_sequence_type_new(struct type_class *type_class, - 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_type_free(struct type *type); +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 type *type) + struct definition *definition) { - struct type_sequence *sequence = - container_of(type, struct type_sequence, p); - struct type_class_sequence *sequence_class = sequence->_class; + 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); - fdest->sequence_begin(dest, sequence); + fsrc->sequence_begin(src, sequence_declaration); + fdest->sequence_begin(dest, sequence_declaration); - sequence->len->p._class->copy(dest, fdest, src, fsrc, - &sequence->len->p); + sequence->len->p.declaration->copy(dest, fdest, src, fsrc, + &sequence->len->p); for (i = 0; i < sequence->len->value._unsigned; i++) { - struct type *elem_type = sequence->current_element.type; - elem_type->p._class->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); - fdest->sequence_end(dest, sequence); + fsrc->sequence_end(src, sequence_declaration); + fdest->sequence_end(dest, sequence_declaration); } static -void _sequence_type_class_free(struct type_class *type_class) +void _sequence_declaration_free(struct declaration *declaration) { - struct type_class_sequence *sequence_class = - container_of(type_class, struct type_class_sequence, p); + struct declaration_sequence *sequence_declaration = + container_of(declaration, struct declaration_sequence, p); - type_class_unref(&sequence_class->len_class->p); - type_class_unref(sequence_class->elem); - g_free(sequence_class); + free_declaration_scope(sequence_declaration->scope); + declaration_unref(&sequence_declaration->len_declaration->p); + declaration_unref(sequence_declaration->elem); + g_free(sequence_declaration); } -struct type_class_sequence * -sequence_type_class_new(const char *name, struct type_class_integer *len_class, - struct type_class *elem) +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_class_sequence *sequence_class; - struct type_class *type_class; - int ret; - - sequence_class = g_new(struct type_class_sequence, 1); - type_class = &sequence_class->p; - assert(!len_class->signedness); - type_ref(&len_class->p); - sequence_class->len_class = len_class; - type_ref(elem); - sequence_class->elem = elem; - type_class->name = g_quark_from_string(name); - type_class->alignment = max(len_class->p.alignment, - elem->alignment); - type_class->copy = sequence_copy; - type_class->class_free = _sequence_type_class_free; - type_class->type_new = _sequence_type_new; - type_class->type_free = _sequence_type_free; - type_class->ref = 1; - - if (type_class->name) { - ret = register_type(type_class); - if (ret) - goto error_register; - } - return sequence_class; - -error_register: - type_class_unref(&len_class->p); - type_class_unref(elem); - g_free(sequence_class); - 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 type *_sequence_type_new(struct type_class *type_class, - 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_class_sequence *sequence_class = - container_of(type_class, struct type_class_sequence, p); - struct type_sequence *sequence; - - sequence = g_new(struct type_sequence, 1); - type_class_ref(&sequence_class->p); - sequence->p._class = sequence_class; + struct declaration_sequence *sequence_declaration = + container_of(declaration, struct declaration_sequence, p); + struct definition_sequence *sequence; + struct definition *len_parent; + + 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); - sequence->len.type = - sequence_class->len_class.p->type_new(&sequence_class->len_class.p, - parent_scope); - sequence->current_element.type = - sequence_class->elem.p->type_new(&sequence_class->elem.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 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_type_free(struct type *type) +void _sequence_definition_free(struct definition *definition) { - struct type_sequence *sequence = - container_of(type, struct type_sequence, p); - struct type *len_type = sequence->len.type; - struct type *elem_type = sequence->current_element.type; - - len_type->p._class->type_free(len_type); - elem_type->p._class->type_free(elem_type); - free_declaration_scope(sequence->scope); - type_class_unref(sequence->p._class); + 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); }