X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstruct.c;h=5e7e2b4ef3ef740cd94fcfd396fadb05ea14a555;hp=3bbb8409230ff26afd0653cc40b909d112994f81;hb=b35aa95b44558ea3f661155ec4b5584355da125d;hpb=ccd7e1c86f36342b0b06651cc52df86bb663c271

diff --git a/types/struct.c b/types/struct.c
index 3bbb8409..5e7e2b4e 100644
--- a/types/struct.c
+++ b/types/struct.c
@@ -3,7 +3,7 @@
  *
  * BabelTrace - Structure Type Converter
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - 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
@@ -17,116 +17,195 @@
  */
 
 #include <babeltrace/compiler.h>
-#include <babeltrace/types.h>
+#include <babeltrace/format.h>
+
+#ifndef max
+#define max(a, b)	((a) < (b) ? (b) : (a))
+#endif
+
+static
+struct declaration *_struct_declaration_new(struct type *type,
+				struct declaration_scope *parent_scope);
+static
+void _struct_declaration_free(struct declaration *declaration);
 
 void struct_copy(struct stream_pos *dest, const struct format *fdest, 
 		 struct stream_pos *src, const struct format *fsrc,
-		 const struct type_class *type_class)
+		 struct declaration *declaration)
 {
-	struct type_class_struct *struct_class =
-		container_of(type_class, struct type_class_struct, p);
-	unsigned int i;
+	struct declaration_struct *_struct =
+		container_of(declaration, struct declaration_struct, p);
+	struct type_struct *struct_type = _struct->type;
+	unsigned long i;
 
-	fsrc->struct_begin(src, struct_class);
-	fdest->struct_begin(dest, struct_class);
+	fsrc->struct_begin(src, struct_type);
+	fdest->struct_begin(dest, struct_type);
 
-	for (i = 0; i < struct_class->fields->len; i++) {
-		struct field *field = &g_array_index(struct_class->fields,
+	for (i = 0; i < _struct->fields->len; i++) {
+		struct field *field = &g_array_index(_struct->fields,
 						     struct field, i);
-		struct type_class *field_class = field->type_class;
+		struct type *field_type = field->declaration->type;
 
-		field_class->copy(dest, fdest, src, fsrc, &field_class->p);
+		field_type->copy(dest, fdest, src, fsrc, field->declaration);
 
 	}
-	fsrc->struct_end(src, struct_class);
-	fdest->struct_end(dest, struct_class);
+	fsrc->struct_end(src, struct_type);
+	fdest->struct_end(dest, struct_type);
 }
 
-void struct_type_free(struct type_class_struct *struct_class)
+static
+void _struct_type_free(struct type *type)
 {
-	g_hash_table_destroy(struct_class->fields_by_name);
-	g_array_free(struct_class->fields, true);
-	g_free(struct_class);
+	struct type_struct *struct_type =
+		container_of(type, struct type_struct, p);
+	unsigned long i;
+
+	free_type_scope(struct_type->scope);
+	g_hash_table_destroy(struct_type->fields_by_name);
+
+	for (i = 0; i < struct_type->fields->len; i++) {
+		struct type_field *type_field =
+			&g_array_index(struct_type->fields,
+				       struct type_field, i);
+		type_unref(type_field->type);
+	}
+	g_array_free(struct_type->fields, true);
+	g_free(struct_type);
 }
 
-static void _struct_type_free(struct type_class *type_class)
+struct type_struct *struct_type_new(const char *name,
+				    struct type_scope *parent_scope)
 {
-	struct type_class_struct *struct_class =
-		container_of(type_class, struct type_class_struct, p);
-	struct_type_free(struct_class);
+	struct type_struct *struct_type;
+	struct type *type;
+
+	struct_type = g_new(struct type_struct, 1);
+	type = &struct_type->p;
+	struct_type->fields_by_name = g_hash_table_new(g_direct_hash,
+						       g_direct_equal);
+	struct_type->fields = g_array_sized_new(FALSE, TRUE,
+						sizeof(struct type_field),
+						DEFAULT_NR_STRUCT_FIELDS);
+	struct_type->scope = new_type_scope(parent_scope);
+	type->name = g_quark_from_string(name);
+	type->alignment = 1;
+	type->copy = struct_copy;
+	type->type_free = _struct_type_free;
+	type->declaration_new = _struct_declaration_new;
+	type->declaration_free = _struct_declaration_free;
+	type->ref = 1;
+	return struct_type;
 }
 
-struct type_class_struct *struct_type_new(const char *name)
+static
+struct declaration *
+	_struct_declaration_new(struct type *type,
+				struct declaration_scope *parent_scope)
 {
-	struct type_class_struct *struct_class;
+	struct type_struct *struct_type =
+		container_of(type, struct type_struct, p);
+	struct declaration_struct *_struct;
+	unsigned long i;
 	int ret;
 
-	struct_class = g_new(struct type_class_struct, 1);
-	type_class = &float_class->p;
-
-	struct_class->fields_by_name = g_hash_table_new(g_direct_hash,
-							g_direct_equal);
-	struct_class->fields = g_array_sized_new(false, false,
-						 sizeof(struct field),
-						 DEFAULT_NR_STRUCT_FIELDS)
-	type_class->name = g_quark_from_string(name);
-	type_class->alignment = 1;
-	type_class->copy = struct_copy;
-	type_class->free = _struct_type_free;
-
-	if (type_class->name) {
-		ret = ctf_register_type(type_class);
-		if (ret)
-			goto error_register;
+	_struct = g_new(struct declaration_struct, 1);
+	type_ref(&struct_type->p);
+	_struct->p.type = type;
+	_struct->type = struct_type;
+	_struct->p.ref = 1;
+	_struct->scope = new_declaration_scope(parent_scope);
+	_struct->fields = g_array_sized_new(FALSE, TRUE,
+					    sizeof(struct field),
+					    DEFAULT_NR_STRUCT_FIELDS);
+	g_array_set_size(_struct->fields, struct_type->fields->len);
+	for (i = 0; i < struct_type->fields->len; i++) {
+		struct type_field *type_field =
+			&g_array_index(struct_type->fields,
+				       struct type_field, i);
+		struct field *field = &g_array_index(_struct->fields,
+						     struct field, i);
+
+		field->name = type_field->name;
+		field->declaration =
+			type_field->type->declaration_new(type_field->type,
+							  _struct->scope);
+		ret = register_declaration(field->name,
+					   field->declaration, _struct->scope);
+		assert(!ret);
 	}
-	return struct_class;
+	return &_struct->p;
+}
+
+static
+void _struct_declaration_free(struct declaration *declaration)
+{
+	struct declaration_struct *_struct =
+		container_of(declaration, struct declaration_struct, p);
+	unsigned long i;
 
-error_register:
-	g_free(struct_class);
-	return NULL;
+	assert(_struct->fields->len == _struct->type->fields->len);
+	for (i = 0; i < _struct->fields->len; i++) {
+		struct field *field = &g_array_index(_struct->fields,
+						     struct field, i);
+		declaration_unref(field->declaration);
+	}
+	free_declaration_scope(_struct->scope);
+	type_unref(_struct->p.type);
+	g_free(_struct);
 }
 
-void struct_type_add_field(struct type_class_struct *struct_class,
+void struct_type_add_field(struct type_struct *struct_type,
 			   const char *field_name,
-			   struct type_class *type_class)
+			   struct type *field_type)
 {
-	struct field *field;
+	struct type_field *field;
 	unsigned long index;
 
-	g_array_set_size(struct_class->fields, struct_class->fields->len + 1);
-	index = struct_class->fields->len - 1;	/* last field (new) */
-	field = &g_array_index(struct_class->fields, struct field, index);
+	g_array_set_size(struct_type->fields, struct_type->fields->len + 1);
+	index = struct_type->fields->len - 1;	/* last field (new) */
+	field = &g_array_index(struct_type->fields, struct type_field, index);
 	field->name = g_quark_from_string(field_name);
-	field->type_class = type_class;
+	type_ref(field_type);
+	field->type = field_type;
 	/* Keep index in hash rather than pointer, because array can relocate */
-	g_hash_table_insert(struct_class->fields_by_name,
+	g_hash_table_insert(struct_type->fields_by_name,
 			    (gpointer) (unsigned long) field->name,
 			    (gpointer) index);
 	/*
 	 * Alignment of structure is the max alignment of types contained
 	 * therein.
 	 */
-	struct_class->p.alignment = max(struct_class->p.alignment,
-					type_class->alignment);
+	struct_type->p.alignment = max(struct_type->p.alignment,
+				       field_type->alignment);
 }
 
 unsigned long
-struct_type_lookup_field_index(struct type_class_struct *struct_class,
-			       GQuark field_name)
+	struct_type_lookup_field_index(struct type_struct *struct_type,
+				       GQuark field_name)
 {
 	unsigned long index;
 
-	index = (unsigned long) g_hash_table_lookup(struct_class->fields_by_name,
-						    field_name);
+	index = (unsigned long) g_hash_table_lookup(struct_type->fields_by_name,
+						    (gconstpointer) (unsigned long) field_name);
 	return index;
 }
 
+/*
+ * field returned only valid as long as the field structure is not appended to.
+ */
+struct type_field *
+	struct_type_get_field_from_index(struct type_struct *struct_type,
+					 unsigned long index)
+{
+	return &g_array_index(struct_type->fields, struct type_field, index);
+}
+
 /*
  * field returned only valid as long as the field structure is not appended to.
  */
 struct field *
-struct_type_get_field_from_index(struct type_class_struct *struct_class,
-				 unsigned long index)
+struct_declaration_get_field_from_index(struct declaration_struct *_struct,
+					unsigned long index)
 {
-	return &g_array_index(struct_class->fields, struct field, index);
+	return &g_array_index(_struct->fields, struct field, index);
 }