Fix: assign the current clock for mmap traces

[babeltrace.git] / types / sequence.c

diff --git a/types/sequence.c b/types/sequence.c
index 119522d7de7a084f42345aef5a73b999755ebf7e..bd49d2a6507f116a5f916a423785761e06fd1cb5 100644 (file)
--- a/types/sequence.c
+++ b/types/sequence.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Sequence Type Converter
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * 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,6 +20,7 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <inttypes.h>
 
 static
@@ -57,13 +60,18 @@ int sequence_rw(struct stream_pos *pos, struct definition *definition)
 
                str = g_string_new("");
                g_string_printf(str, "[%" PRIu64 "]", i);
-               (void) g_string_free(str, TRUE);
                name = g_quark_from_string(str->str);
+               (void) g_string_free(str, TRUE);
 
                field = (struct definition **) &g_ptr_array_index(sequence_definition->elems, i);
                *field = sequence_declaration->elem->definition_new(sequence_declaration->elem,
-                                         sequence_definition->scope,
+                                         sequence_definition->p.scope,
                                          name, i, NULL);
+       }
+       for (i = 0; i < len; i++) {
+               struct definition **field;
+
+               field = (struct definition **) &g_ptr_array_index(sequence_definition->elems, i);
                ret = generic_rw(pos, *field);
                if (ret)
                        return ret;
@@ -133,13 +141,13 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
        sequence->p.index = root_name ? INT_MAX : index;
        sequence->p.name = field_name;
        sequence->p.path = new_definition_path(parent_scope, field_name, root_name);
-       sequence->scope = new_definition_scope(parent_scope, field_name, root_name);
+       sequence->p.scope = new_definition_scope(parent_scope, field_name, root_name);
        ret = register_field_definition(field_name, &sequence->p,
                                        parent_scope);
        assert(!ret);
-       len_parent = lookup_definition(sequence->scope->scope_path,
-                                      sequence_declaration->length_name,
-                                      parent_scope);
+       len_parent = lookup_path_definition(sequence->p.scope->scope_path,
+                                           sequence_declaration->length_name,
+                                           parent_scope);
        if (!len_parent) {
                printf("[error] Lookup for sequence length field failed.\n");
                goto error;
@@ -151,11 +159,31 @@ struct definition *_sequence_definition_new(struct declaration *declaration,
                goto error;
        }
        definition_ref(len_parent);
+
+       sequence->string = NULL;
+       sequence->elems = NULL;
+
+       if (sequence_declaration->elem->id == CTF_TYPE_INTEGER) {
+               struct declaration_integer *integer_declaration =
+                       container_of(sequence_declaration->elem, struct declaration_integer, p);
+
+               if (integer_declaration->encoding == CTF_STRING_UTF8
+                     || integer_declaration->encoding == CTF_STRING_ASCII) {
+
+                       sequence->string = g_string_new("");
+
+                       if (integer_declaration->len == CHAR_BIT
+                           && integer_declaration->p.alignment == CHAR_BIT) {
+                               return &sequence->p;
+                       }
+               }
+       }
+
        sequence->elems = g_ptr_array_new();
        return &sequence->p;
 
 error:
-       free_definition_scope(sequence->scope);
+       free_definition_scope(sequence->p.scope);
        declaration_unref(&sequence_declaration->p);
        g_free(sequence);
        return NULL;
@@ -169,15 +197,19 @@ void _sequence_definition_free(struct definition *definition)
        struct definition *len_definition = &sequence->length->p;
        uint64_t i;
 
-       for (i = 0; i < sequence->elems->len; i++) {
-               struct definition *field;
+       if (sequence->string)
+               (void) g_string_free(sequence->string, TRUE);
+       if (sequence->elems) {
+               for (i = 0; i < sequence->elems->len; i++) {
+                       struct definition *field;
 
-               field = g_ptr_array_index(sequence->elems, i);
-               field->declaration->definition_free(field);
+                       field = g_ptr_array_index(sequence->elems, i);
+                       field->declaration->definition_free(field);
+               }
        }
        (void) g_ptr_array_free(sequence->elems, TRUE);
        definition_unref(len_definition);
-       free_definition_scope(sequence->scope);
+       free_definition_scope(sequence->p.scope);
        declaration_unref(sequence->p.declaration);
        g_free(sequence);
 }
@@ -189,6 +221,8 @@ uint64_t sequence_len(struct definition_sequence *sequence)
 
 struct definition *sequence_index(struct definition_sequence *sequence, uint64_t i)
 {
+       if (!sequence->elems)
+               return NULL;
        if (i >= sequence->length->value._unsigned)
                return NULL;
        assert(i < sequence->elems->len);