X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Farray.c;h=f592dba1ebdf9905cf3230586aaf990d0db9556c;hp=3e1f2181be8d16193966163f158fe7e0a1e46ca2;hb=c5e74408f9786219f6b44400dcf2098ab9cc78fb;hpb=05c749e538ebc3a4f6735f62d022655cf92fc17e

diff --git a/types/array.c b/types/array.c
index 3e1f2181..f592dba1 100644
--- a/types/array.c
+++ b/types/array.c
@@ -18,6 +18,7 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
+#include <inttypes.h>
 
 static
 struct definition *_array_definition_new(struct declaration *declaration,
@@ -26,24 +27,24 @@ struct definition *_array_definition_new(struct declaration *declaration,
 static
 void _array_definition_free(struct definition *definition);
 
-void array_copy(struct stream_pos *dest, const struct format *fdest, 
-		struct stream_pos *src, const struct format *fsrc,
-		struct definition *definition)
+int array_rw(struct stream_pos *pos, struct definition *definition)
 {
-	struct definition_array *array =
+	struct definition_array *array_definition =
 		container_of(definition, struct definition_array, p);
-	struct declaration_array *array_declaration = array->declaration;
+	const struct declaration_array *array_declaration =
+		array_definition->declaration;
 	uint64_t i;
+	int ret;
 
-	fsrc->array_begin(src, array_declaration);
-	fdest->array_begin(dest, array_declaration);
-
+	/* No need to align, because the first field will align itself. */
 	for (i = 0; i < array_declaration->len; i++) {
-		struct definition *elem = array->current_element.definition;
-		elem->declaration->copy(dest, fdest, src, fsrc, elem);
+		struct definition *elem =
+			g_array_index(array_definition->elems, struct field, i).definition;
+		ret = generic_rw(pos, elem);
+		if (ret)
+			return ret;
 	}
-	fsrc->array_end(src, array_declaration);
-	fdest->array_end(dest, array_declaration);
+	return 0;
 }
 
 static
@@ -58,7 +59,7 @@ void _array_declaration_free(struct declaration *declaration)
 }
 
 struct declaration_array *
-	array_declaration_new(const char *name, size_t len,
+	array_declaration_new(size_t len,
 			      struct declaration *elem_declaration,
 			      struct declaration_scope *parent_scope)
 {
@@ -72,10 +73,8 @@ struct declaration_array *
 	array_declaration->elem = elem_declaration;
 	array_declaration->scope = new_declaration_scope(parent_scope);
 	declaration->id = CTF_TYPE_ARRAY;
-	declaration->name = g_quark_from_string(name);
 	/* No need to align the array, the first element will align itself */
 	declaration->alignment = 1;
-	declaration->copy = array_copy;
 	declaration->declaration_free = _array_declaration_free;
 	declaration->definition_new = _array_definition_new;
 	declaration->definition_free = _array_definition_free;
@@ -92,6 +91,7 @@ struct definition *
 	struct declaration_array *array_declaration =
 		container_of(declaration, struct declaration_array, p);
 	struct definition_array *array;
+	uint64_t i;
 
 	array = g_new(struct definition_array, 1);
 	declaration_ref(&array_declaration->p);
@@ -100,11 +100,25 @@ struct definition *
 	array->p.ref = 1;
 	array->p.index = index;
 	array->scope = new_definition_scope(parent_scope, field_name);
-	array->current_element.definition =
-		array_declaration->elem->definition_new(array_declaration->elem,
-					  parent_scope,
-					  g_quark_from_static_string("[]"),
-					  0);
+	array->elems = g_array_sized_new(FALSE, TRUE, sizeof(struct field),
+					 array_declaration->len);
+	g_array_set_size(array->elems, array_declaration->len);
+	for (i = 0; i < array_declaration->len; i++) {
+		struct field *field;
+		GString *str;
+		GQuark name;
+
+		str = g_string_new("");
+		g_string_printf(str, "[%" PRIu64 "]", i);
+		name = g_quark_from_string(str->str);
+		(void) g_string_free(str, TRUE);
+
+		field = &g_array_index(array->elems, struct field, i);
+		field->name = name;
+		field->definition = array_declaration->elem->definition_new(array_declaration->elem,
+					  array->scope,
+					  name, i);
+	}
 	return &array->p;
 }
 
@@ -113,11 +127,28 @@ void _array_definition_free(struct definition *definition)
 {
 	struct definition_array *array =
 		container_of(definition, struct definition_array, p);
-	struct definition *elem_definition =
-		array->current_element.definition;
+	uint64_t i;
 
-	elem_definition->declaration->definition_free(elem_definition);
+	for (i = 0; i < array->elems->len; i++) {
+		struct field *field;
+
+		field = &g_array_index(array->elems, struct field, i);
+		field->definition->declaration->definition_free(field->definition);
+	}
+	(void) g_array_free(array->elems, TRUE);
 	free_definition_scope(array->scope);
 	declaration_unref(array->p.declaration);
 	g_free(array);
 }
+
+uint64_t array_len(struct definition_array *array)
+{
+	return array->elems->len;
+}
+
+struct definition *array_index(struct definition_array *array, uint64_t i)
+{
+	if (i >= array->elems->len)
+		return NULL;
+	return g_array_index(array->elems, struct field, i).definition;
+}