X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fsequence.c;h=50763d7ad7ec7b7ed85ec2b70b523873791dd30a;hp=9d84d0eece59e8a9d4a1f878e5da8cb5296a7818;hb=0f980a3595f61930659e392b1248c59490dd5a22;hpb=05628561ca57ff5d269571a72a12cb86854c5f70 diff --git a/types/sequence.c b/types/sequence.c index 9d84d0ee..50763d7a 100644 --- a/types/sequence.c +++ b/types/sequence.c @@ -18,117 +18,159 @@ #include #include +#include #ifndef max #define max(a, b) ((a) < (b) ? (b) : (a)) #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; - uint64_t i; + struct definition_sequence *sequence = + container_of(definition, struct definition_sequence, p); + struct declaration_sequence *sequence_declaration = sequence->declaration; + uint64_t len, oldlen, i; - fsrc->sequence_begin(src, sequence_type); - fdest->sequence_begin(dest, sequence_type); + fsrc->sequence_begin(src, sequence_declaration); + if (fdest) + 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); + len = sequence->len->value._unsigned; + g_array_set_size(sequence->elems, len); + /* + * Yes, large sequences could be _painfully slow_ to parse due + * to memory allocation for each event read. At least, never + * shrink the sequence. Note: the sequence GArray len should + * never be used as indicator of the current sequence length. + * One should always look at the sequence->len->value._unsigned + * value for that. + */ + oldlen = sequence->elems->len; + if (oldlen < len) + g_array_set_size(sequence->elems, len); + + for (i = oldlen; i < len; i++) { + struct field *field; + GString *str; + GQuark name; - for (i = 0; i < sequence->len->value._unsigned; i++) { - struct declaration *elem = - sequence->current_element.declaration; - elem->type->copy(dest, fdest, src, fsrc, elem); + str = g_string_new(""); + g_string_printf(str, "[%" PRIu64 "]", i); + (void) g_string_free(str, TRUE); + name = g_quark_from_string(str->str); + + field = &g_array_index(sequence->elems, struct field, i); + field->name = name; + field->definition = sequence_declaration->elem->definition_new(sequence_declaration->elem, + sequence->scope, + name, i); + field->definition->declaration->copy(dest, fdest, src, fsrc, field->definition); } - fsrc->sequence_end(src, sequence_type); - fdest->sequence_end(dest, sequence_type); + fsrc->sequence_end(src, sequence_declaration); + if (fdest) + 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); - free_type_scope(sequence_type->scope); - 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 type_scope *parent_scope) +struct declaration_sequence * + sequence_declaration_new(struct declaration_integer *len_declaration, + struct declaration *elem_declaration, + struct declaration_scope *parent_scope) { - struct type_sequence *sequence_type; - struct type *type; - - 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; - sequence_type->scope = new_type_scope(parent_scope); - type->id = CTF_TYPE_SEQUENCE; - 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; - return sequence_type; + 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->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; - - sequence = g_new(struct declaration_sequence, 1); - type_ref(&sequence_type->p); - sequence->p.type = type; - sequence->type = sequence_type; + 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); - len_parent = sequence_type->len_type->p.declaration_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, + sequence->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->declaration_new(sequence_type->elem, - parent_scope); + container_of(len_parent, struct definition_integer, p); + sequence->elems = g_array_new(FALSE, TRUE, sizeof(struct field)); return &sequence->p; } static -void _sequence_declaration_free(struct declaration *declaration) +void _sequence_definition_free(struct definition *definition) { - struct declaration_sequence *sequence = - container_of(declaration, struct declaration_sequence, p); - struct declaration *len_declaration = &sequence->len->p; - struct declaration *elem_declaration = - sequence->current_element.declaration; - - len_declaration->type->declaration_free(len_declaration); - elem_declaration->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; + uint64_t i; + + for (i = 0; i < sequence->elems->len; i++) { + struct field *field; + + field = &g_array_index(sequence->elems, struct field, i); + field->definition->declaration->definition_free(field->definition); + } + (void) g_array_free(sequence->elems, TRUE); + len_definition->declaration->definition_free(len_definition); + free_definition_scope(sequence->scope); + declaration_unref(sequence->p.declaration); g_free(sequence); } + +struct definition *sequence_index(struct definition_sequence *sequence, uint64_t i) +{ + if (i >= sequence->len->value._unsigned) + return NULL; + assert(i < sequence->elems->len); + return g_array_index(sequence->elems, struct field, i).definition; +}