Remove trace-collection.h from include_headers

[babeltrace.git] / types / array.c

diff --git a/types/array.c b/types/array.c
index 6c17299a532718cc52841b62497f2616456720f9..047adac21902c7d7f438fc14a1e55099181280f1 100644 (file)
--- a/types/array.c
+++ b/types/array.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Array 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
@@ -106,7 +109,7 @@ struct definition *
        array->p.index = root_name ? INT_MAX : index;
        array->p.name = field_name;
        array->p.path = new_definition_path(parent_scope, field_name, root_name);
-       array->scope = new_definition_scope(parent_scope, field_name, root_name);
+       array->p.scope = new_definition_scope(parent_scope, field_name, root_name);
        ret = register_field_definition(field_name, &array->p,
                                        parent_scope);
        assert(!ret);
@@ -143,7 +146,7 @@ struct definition *
 
                field = (struct definition **) &g_ptr_array_index(array->elems, i);
                *field = array_declaration->elem->definition_new(array_declaration->elem,
-                                         array->scope,
+                                         array->p.scope,
                                          name, i, NULL);
                if (!*field)
                        goto error;
@@ -159,7 +162,7 @@ error:
                field->declaration->definition_free(field);
        }
        (void) g_ptr_array_free(array->elems, TRUE);
-       free_definition_scope(array->scope);
+       free_definition_scope(array->p.scope);
        declaration_unref(array->p.declaration);
        g_free(array);
        return NULL;
@@ -183,7 +186,7 @@ void _array_definition_free(struct definition *definition)
                }
                (void) g_ptr_array_free(array->elems, TRUE);
        }
-       free_definition_scope(array->scope);
+       free_definition_scope(array->p.scope);
        declaration_unref(array->p.declaration);
        g_free(array);
 }
@@ -203,3 +206,41 @@ struct definition *array_index(struct definition_array *array, uint64_t i)
                return NULL;
        return g_ptr_array_index(array->elems, i);
 }
+
+int get_array_len(const struct definition *field)
+{
+       struct definition_array *array_definition;
+       struct declaration_array *array_declaration;
+
+       array_definition = container_of(field, struct definition_array, p);
+       array_declaration = array_definition->declaration;
+
+       return array_declaration->len;
+}
+
+GString *get_char_array(const struct definition *field)
+{
+       struct definition_array *array_definition;
+       struct declaration_array *array_declaration;
+       struct declaration *elem;
+
+       array_definition = container_of(field, struct definition_array, p);
+       array_declaration = array_definition->declaration;
+       elem = array_declaration->elem;
+       if (elem->id == CTF_TYPE_INTEGER) {
+               struct declaration_integer *integer_declaration =
+                       container_of(elem, struct declaration_integer, p);
+
+               if (integer_declaration->encoding == CTF_STRING_UTF8
+                               || integer_declaration->encoding == CTF_STRING_ASCII) {
+
+                       if (integer_declaration->len == CHAR_BIT
+                                       && integer_declaration->p.alignment == CHAR_BIT) {
+
+                               return array_definition->string;
+                       }
+               }
+       }
+       fprintf(stderr, "[warning] Extracting string\n");
+       return NULL;
+}