X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fsequence.c;h=61a5b80de154bcb5e9b03c857d4bec79fb335c7a;hp=f6025af61b3470fdda7c43ff2e8feefbdfa373e1;hb=809cbff588674d09c14b128eb95d332048382770;hpb=4c8bfb7e0a9cef6e74cefa38ed54bf8cbd424183 diff --git a/types/sequence.c b/types/sequence.c index f6025af6..61a5b80d 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 @@ -18,79 +18,153 @@ #include #include +#include -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) +#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_rw(struct stream_pos *pos, 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_definition = + container_of(definition, struct definition_sequence, p); + const struct declaration_sequence *sequence_declaration = + sequence_definition->declaration; + uint64_t len, oldlen, i; - fsrc->sequence_begin(src, sequence_class); - fdest->sequence_begin(dest, sequence_class); + generic_rw(pos, &sequence_definition->len->p); + len = sequence_definition->len->value._unsigned; + /* + * 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_definition->elems->len; + if (oldlen < len) + g_array_set_size(sequence_definition->elems, len); - len = fsrc->uint_read(src, sequence_class->len_class); - fdest->uint_write(dest, sequence_class->len_class, len); + for (i = oldlen; i < len; i++) { + struct field *field; + GString *str; + GQuark name; - for (i = 0; i < len; i++) { - struct type_class *elem_class = sequence_class->elem; - elem_class->copy(dest, fdest, src, fsrc, elem_class); + 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_definition->elems, struct field, i); + field->name = name; + field->definition = sequence_declaration->elem->definition_new(sequence_declaration->elem, + sequence_definition->scope, + name, i); + generic_rw(pos, field->definition); } - fsrc->sequence_end(src, sequence_class); - fdest->sequence_end(dest, sequence_class); } -void sequence_type_free(struct type_class_sequence *sequence_class) +static +void _sequence_declaration_free(struct declaration *declaration) +{ + struct declaration_sequence *sequence_declaration = + container_of(declaration, struct declaration_sequence, p); + + free_declaration_scope(sequence_declaration->scope); + declaration_unref(&sequence_declaration->len_declaration->p); + declaration_unref(sequence_declaration->elem); + g_free(sequence_declaration); +} + +struct declaration_sequence * + sequence_declaration_new(struct declaration_integer *len_declaration, + struct declaration *elem_declaration, + struct declaration_scope *parent_scope) { - sequence_class->elem->free(sequence_class->elem); - type_unref(&sequence_class->len_class->p); - type_unref(sequence_class->elem); - g_free(sequence_class); + 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->declaration_free = _sequence_declaration_free; + declaration->definition_new = _sequence_definition_new; + declaration->definition_free = _sequence_definition_free; + declaration->ref = 1; + return sequence_declaration; } -static void _sequence_type_free(struct type_class *type_class) +static +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); - sequence_type_free(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->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 definition_integer, p); + sequence->elems = g_array_new(FALSE, TRUE, sizeof(struct field)); + return &sequence->p; } -struct type_class_sequence * -sequence_type_new(const char *name, struct type_class_integer *len_class, - struct type_class *elem) +static +void _sequence_definition_free(struct definition *definition) { - 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->free = _sequence_type_free; - type_class->ref = 1; - - if (type_class->name) { - ret = ctf_register_type(type_class); - if (ret) - goto error_register; + 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); } - return sequence_class; + (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); +} -error_register: - type_unref(&len_class->p); - type_unref(elem); - g_free(sequence_class); - return NULL; +uint64_t sequence_len(struct definition_sequence *sequence) +{ + return sequence->len->value._unsigned; +} + +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; }