Update pretty-print

[babeltrace.git] / types / sequence.c

diff --git a/types/sequence.c b/types/sequence.c
index 50763d7ad7ec7b7ed85ec2b70b523873791dd30a..f4262cdb99b595a8119dccd2c59bab379c1d57dd 100644 (file)
--- a/types/sequence.c
+++ b/types/sequence.c
@@ -31,23 +31,19 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
 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,
-                  struct definition *definition)
+int sequence_rw(struct stream_pos *pos, struct definition *definition)
 {
-       struct definition_sequence *sequence =
+       struct definition_sequence *sequence_definition =
                container_of(definition, struct definition_sequence, p);
-       struct declaration_sequence *sequence_declaration = sequence->declaration;
+       const struct declaration_sequence *sequence_declaration =
+               sequence_definition->declaration;
        uint64_t len, oldlen, i;
+       int ret;
 
-       fsrc->sequence_begin(src, sequence_declaration);
-       if (fdest)
-               fdest->sequence_begin(dest, sequence_declaration);
-
-       sequence->len->p.declaration->copy(dest, fdest, src, fsrc,
-                                   &sequence->len->p);
-       len = sequence->len->value._unsigned;
-       g_array_set_size(sequence->elems, len);
+       ret = generic_rw(pos, &sequence_definition->len->p);
+       if (ret)
+               return ret;
+       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
@@ -56,12 +52,12 @@ void sequence_copy(struct stream_pos *dest, const struct format *fdest,
         * One should always look at the sequence->len->value._unsigned
         * value for that.
         */
-       oldlen = sequence->elems->len;
+       oldlen = sequence_definition->elems->len;
        if (oldlen < len)
-               g_array_set_size(sequence->elems, len);
+               g_ptr_array_set_size(sequence_definition->elems, len);
 
        for (i = oldlen; i < len; i++) {
-               struct field *field;
+               struct definition **field;
                GString *str;
                GQuark name;
 
@@ -70,16 +66,15 @@ void sequence_copy(struct stream_pos *dest, const struct format *fdest,
                (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,
+               field = (struct definition **) &g_ptr_array_index(sequence_definition->elems, i);
+               *field = sequence_declaration->elem->definition_new(sequence_declaration->elem,
+                                         sequence_definition->scope,
                                          name, i);
-               field->definition->declaration->copy(dest, fdest, src, fsrc, field->definition);
+               ret = generic_rw(pos, *field);
+               if (ret)
+                       return ret;
        }
-       fsrc->sequence_end(src, sequence_declaration);
-       if (fdest)
-               fdest->sequence_end(dest, sequence_declaration);
+       return 0;
 }
 
 static
@@ -112,7 +107,6 @@ struct declaration_sequence *
        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;
@@ -136,13 +130,15 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
        sequence->declaration = sequence_declaration;
        sequence->p.ref = 1;
        sequence->p.index = index;
+       sequence->p.name = field_name;
+       sequence->p.path = new_definition_path(parent_scope, field_name);
        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));
+       sequence->elems = g_ptr_array_new();
        return &sequence->p;
 }
 
@@ -155,22 +151,27 @@ void _sequence_definition_free(struct definition *definition)
        uint64_t i;
 
        for (i = 0; i < sequence->elems->len; i++) {
-               struct field *field;
+               struct definition *field;
 
-               field = &g_array_index(sequence->elems, struct field, i);
-               field->definition->declaration->definition_free(field->definition);
+               field = g_ptr_array_index(sequence->elems, i);
+               field->declaration->definition_free(field);
        }
-       (void) g_array_free(sequence->elems, TRUE);
+       (void) g_ptr_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);
 }
 
+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;
+       return g_ptr_array_index(sequence->elems, i);
 }