X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstruct.c;h=138da167509ae25c8cf0f218b4ca5ccfeaf63978;hp=1a2b59d51e26e9cbb319f313aac798dba2bd0d51;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=b1a2f5806630289aa0b85edbb7f7c581cfa26178

diff --git a/types/struct.c b/types/struct.c
index 1a2b59d5..138da167 100644
--- a/types/struct.c
+++ b/types/struct.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Structure 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
@@ -14,10 +16,20 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
+#include <errno.h>
 
 #ifndef max
 #define max(a, b)	((a) < (b) ? (b) : (a))
@@ -26,7 +38,8 @@
 static
 struct definition *_struct_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 _struct_definition_free(struct definition *definition);
 
@@ -68,7 +81,8 @@ void _struct_declaration_free(struct declaration *declaration)
 }
 
 struct declaration_struct *
-	struct_declaration_new(struct declaration_scope *parent_scope)
+	struct_declaration_new(struct declaration_scope *parent_scope,
+			       uint64_t min_align)
 {
 	struct declaration_struct *struct_declaration;
 	struct declaration *declaration;
@@ -82,7 +96,7 @@ struct declaration_struct *
 						DEFAULT_NR_STRUCT_FIELDS);
 	struct_declaration->scope = new_declaration_scope(parent_scope);
 	declaration->id = CTF_TYPE_STRUCT;
-	declaration->alignment = 1;
+	declaration->alignment = max(1, min_align);
 	declaration->declaration_free = _struct_declaration_free;
 	declaration->definition_new = _struct_definition_new;
 	declaration->definition_free = _struct_definition_free;
@@ -94,12 +108,13 @@ static
 struct definition *
 	_struct_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_struct *struct_declaration =
 		container_of(declaration, struct declaration_struct, p);
 	struct definition_struct *_struct;
-	unsigned long i;
+	int i;
 	int ret;
 
 	_struct = g_new(struct definition_struct, 1);
@@ -107,9 +122,19 @@ struct definition *
 	_struct->p.declaration = declaration;
 	_struct->declaration = struct_declaration;
 	_struct->p.ref = 1;
-	_struct->p.index = index;
+	/*
+	 * Use INT_MAX order to ensure that all fields of the parent
+	 * scope are seen as being prior to this scope.
+	 */
+	_struct->p.index = root_name ? INT_MAX : index;
 	_struct->p.name = field_name;
-	_struct->scope = new_definition_scope(parent_scope, field_name);
+	_struct->p.path = new_definition_path(parent_scope, field_name, root_name);
+	_struct->p.scope = new_definition_scope(parent_scope, field_name, root_name);
+
+	ret = register_field_definition(field_name, &_struct->p,
+					parent_scope);
+	assert(!ret || ret == -EPERM);
+
 	_struct->fields = g_ptr_array_sized_new(DEFAULT_NR_STRUCT_FIELDS);
 	g_ptr_array_set_size(_struct->fields, struct_declaration->fields->len);
 	for (i = 0; i < struct_declaration->fields->len; i++) {
@@ -120,14 +145,22 @@ struct definition *
 			(struct definition **) &g_ptr_array_index(_struct->fields, i);
 
 		*field = declaration_field->declaration->definition_new(declaration_field->declaration,
-							  _struct->scope,
-							  declaration_field->name, i);
-		ret = register_field_definition(declaration_field->name,
-						*field,
-						_struct->scope);
-		assert(!ret);
+							  _struct->p.scope,
+							  declaration_field->name, i, NULL);
+		if (!*field)
+			goto error;
 	}
 	return &_struct->p;
+
+error:
+	for (i--; i >= 0; i--) {
+		struct definition *field = g_ptr_array_index(_struct->fields, i);
+		definition_unref(field);
+	}
+	free_definition_scope(_struct->p.scope);
+	declaration_unref(&struct_declaration->p);
+	g_free(_struct);
+	return NULL;
 }
 
 static
@@ -142,8 +175,9 @@ void _struct_definition_free(struct definition *definition)
 		struct definition *field = g_ptr_array_index(_struct->fields, i);
 		definition_unref(field);
 	}
-	free_definition_scope(_struct->scope);
+	free_definition_scope(_struct->p.scope);
 	declaration_unref(_struct->p.declaration);
+	g_ptr_array_free(_struct->fields, TRUE);
 	g_free(_struct);
 }
 
@@ -215,3 +249,8 @@ struct_definition_get_field_from_index(struct definition_struct *_struct,
 		return NULL;
 	return g_ptr_array_index(_struct->fields, index);
 }
+
+uint64_t struct_declaration_len(struct declaration_struct *struct_declaration)
+{
+	return struct_declaration->fields->len;
+}