X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Farray.c;h=047adac21902c7d7f438fc14a1e55099181280f1;hp=f592dba1ebdf9905cf3230586aaf990d0db9556c;hb=9b3c1d6f8e01603488e317ffef7a8e3c15c98459;hpb=c5e74408f9786219f6b44400dcf2098ab9cc78fb

diff --git a/types/array.c b/types/array.c
index f592dba1..047adac2 100644
--- 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,12 +20,13 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <inttypes.h>
 
 static
 struct definition *_array_definition_new(struct declaration *declaration,
 			struct definition_scope *parent_scope,
-			GQuark field_name, int index);
+			GQuark field_name, int index, const char *root_name);
 static
 void _array_definition_free(struct definition *definition);
 
@@ -38,9 +41,9 @@ int array_rw(struct stream_pos *pos, struct definition *definition)
 
 	/* No need to align, because the first field will align itself. */
 	for (i = 0; i < array_declaration->len; i++) {
-		struct definition *elem =
-			g_array_index(array_definition->elems, struct field, i).definition;
-		ret = generic_rw(pos, elem);
+		struct definition *field =
+			g_ptr_array_index(array_definition->elems, i);
+		ret = generic_rw(pos, field);
 		if (ret)
 			return ret;
 	}
@@ -86,40 +89,83 @@ static
 struct definition *
 	_array_definition_new(struct declaration *declaration,
 			      struct definition_scope *parent_scope,
-			      GQuark field_name, int index)
+			      GQuark field_name, int index, const char *root_name)
 {
 	struct declaration_array *array_declaration =
 		container_of(declaration, struct declaration_array, p);
 	struct definition_array *array;
-	uint64_t i;
+	int ret;
+	int i;
 
 	array = g_new(struct definition_array, 1);
 	declaration_ref(&array_declaration->p);
 	array->p.declaration = declaration;
 	array->declaration = array_declaration;
 	array->p.ref = 1;
-	array->p.index = index;
-	array->scope = new_definition_scope(parent_scope, field_name);
-	array->elems = g_array_sized_new(FALSE, TRUE, sizeof(struct field),
-					 array_declaration->len);
-	g_array_set_size(array->elems, array_declaration->len);
+	/*
+	 * Use INT_MAX order to ensure that all fields of the parent
+	 * scope are seen as being prior to this scope.
+	 */
+	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->p.scope = new_definition_scope(parent_scope, field_name, root_name);
+	ret = register_field_definition(field_name, &array->p,
+					parent_scope);
+	assert(!ret);
+	array->string = NULL;
+	array->elems = NULL;
+
+	if (array_declaration->elem->id == CTF_TYPE_INTEGER) {
+		struct declaration_integer *integer_declaration =
+			container_of(array_declaration->elem, struct declaration_integer, p);
+
+		if (integer_declaration->encoding == CTF_STRING_UTF8
+		      || integer_declaration->encoding == CTF_STRING_ASCII) {
+
+			array->string = g_string_new("");
+
+			if (integer_declaration->len == CHAR_BIT
+			    && integer_declaration->p.alignment == CHAR_BIT) {
+				return &array->p;
+			}
+		}
+	}
+
+	array->elems = g_ptr_array_sized_new(array_declaration->len);
+	g_ptr_array_set_size(array->elems, array_declaration->len);
 	for (i = 0; i < array_declaration->len; i++) {
-		struct field *field;
+		struct definition **field;
 		GString *str;
 		GQuark name;
 
 		str = g_string_new("");
-		g_string_printf(str, "[%" PRIu64 "]", i);
+		g_string_printf(str, "[%u]", (unsigned int) 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);
+		field = (struct definition **) &g_ptr_array_index(array->elems, i);
+		*field = array_declaration->elem->definition_new(array_declaration->elem,
+					  array->p.scope,
+					  name, i, NULL);
+		if (!*field)
+			goto error;
 	}
+
 	return &array->p;
+
+error:
+	for (i--; i >= 0; i--) {
+		struct definition *field;
+
+		field = g_ptr_array_index(array->elems, i);
+		field->declaration->definition_free(field);
+	}
+	(void) g_ptr_array_free(array->elems, TRUE);
+	free_definition_scope(array->p.scope);
+	declaration_unref(array->p.declaration);
+	g_free(array);
+	return NULL;
 }
 
 static
@@ -129,26 +175,72 @@ void _array_definition_free(struct definition *definition)
 		container_of(definition, struct definition_array, p);
 	uint64_t i;
 
-	for (i = 0; i < array->elems->len; i++) {
-		struct field *field;
+	if (array->string)
+		(void) g_string_free(array->string, TRUE);
+	if (array->elems) {
+		for (i = 0; i < array->elems->len; i++) {
+			struct definition *field;
 
-		field = &g_array_index(array->elems, struct field, i);
-		field->definition->declaration->definition_free(field->definition);
+			field = g_ptr_array_index(array->elems, i);
+			field->declaration->definition_free(field);
+		}
+		(void) g_ptr_array_free(array->elems, TRUE);
 	}
-	(void) g_array_free(array->elems, TRUE);
-	free_definition_scope(array->scope);
+	free_definition_scope(array->p.scope);
 	declaration_unref(array->p.declaration);
 	g_free(array);
 }
 
 uint64_t array_len(struct definition_array *array)
 {
+	if (!array->elems)
+		return array->string->len;
 	return array->elems->len;
 }
 
 struct definition *array_index(struct definition_array *array, uint64_t i)
 {
+	if (!array->elems)
+		return NULL;
 	if (i >= array->elems->len)
 		return NULL;
-	return g_array_index(array->elems, struct field, i).definition;
+	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;
 }