X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fsequence.c;h=2f6a7f189910e517409a0836254d82aa58bb5d19;hp=a8d745296f72746341b78173b77797019d699edd;hb=9e29e16ee50d03cf4fdc0cea0220832323939dc3;hpb=ccd7e1c86f36342b0b06651cc52df86bb663c271 diff --git a/types/sequence.c b/types/sequence.c index a8d74529..2f6a7f18 100644 --- a/types/sequence.c +++ b/types/sequence.c @@ -3,7 +3,7 @@ * * BabelTrace - Sequence Type Converter * - * Copyright 2010 - Mathieu Desnoyers + * Copyright 2010, 2011 - Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -17,73 +17,123 @@ */ #include -#include +#include + +#ifndef max +#define max(a, b) ((a) < (b) ? (b) : (a)) +#endif + +static +struct definition *_sequence_definition_new(struct declaration *declaration, + struct definition_scope *parent_scope, + GQuark field_name, int index); +static +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, - const struct type_class *type_class) + struct definition *definition) { - struct type_class_sequence *sequence_class = - container_of(type_class, struct type_class_sequence, p); - unsigned int i; - size_t len; + 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_class); - fdest->sequence_begin(dest, sequence_class); + fsrc->sequence_begin(src, sequence_declaration); + fdest->sequence_begin(dest, sequence_declaration); - len = fsrc->uint_read(src, sequence_class->len_class); - fdest->uint_write(dest, sequence_class->len_class, len); + sequence->len->p.declaration->copy(dest, fdest, src, fsrc, + &sequence->len->p); - for (i = 0; i < len; i++) { - struct type_class *elem_class = sequence_class->elem; - elem_class->copy(dest, fdest, src, fsrc, &elem_class->p); + for (i = 0; i < sequence->len->value._unsigned; i++) { + struct definition *elem = + sequence->current_element.definition; + elem->declaration->copy(dest, fdest, src, fsrc, elem); } - fsrc->sequence_end(src, sequence_class); - fdest->sequence_end(dest, sequence_class); + fsrc->sequence_end(src, sequence_declaration); + fdest->sequence_end(dest, sequence_declaration); } -void sequence_type_free(struct type_class_sequence *sequence_class) +static +void _sequence_declaration_free(struct declaration *declaration) { - sequence_class->elem->free(&sequence_class->elem->p); - g_free(sequence_class); -} + struct declaration_sequence *sequence_declaration = + container_of(declaration, struct declaration_sequence, p); -static void _sequence_type_free(struct type_class *type_class) -{ - struct type_class_struct *sequence_class = - container_of(type_class, struct type_class_sequence, p); - sequence_type_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_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; - int ret; + struct declaration_sequence *sequence_declaration; + struct declaration *declaration; - sequence_class = g_new(struct type_class_sequence, 1); - type_class = &float_class->p; + 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; +} - assert(!len_class->signedness); +static +struct definition *_sequence_definition_new(struct declaration *declaration, + struct definition_scope *parent_scope, + GQuark field_name, int index) +{ + struct declaration_sequence *sequence_declaration = + container_of(declaration, struct declaration_sequence, p); + struct definition_sequence *sequence; + struct definition *len_parent; - sequence_class->len = len; - type_class->name = g_quark_from_string(name); - type_class->alignment = max(len_class->p.alignment, - elem->p.alignment); - type_class->copy = sequence_copy; - type_class->free = _sequence_type_free; + 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->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; +} - if (type_class->name) { - ret = ctf_register_type(type_class); - if (ret) - goto error_register; - } - return sequence_class; +static +void _sequence_definition_free(struct definition *definition) +{ + 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; -error_register: - len_class->p.free(&len_class->p); - sequence_class->elem->free(&sequence_class->elem->p); - g_free(sequence_class); - return NULL; + 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); }