X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstruct.c;h=211d1b02dd16bbc199695f29a976c6eb3c4c8759;hp=03c92ea4093bff548ea398cf955a7f687fe3a862;hb=809cbff588674d09c14b128eb95d332048382770;hpb=f66259163f060ada8d0fee348857c968e338ea40

diff --git a/types/struct.c b/types/struct.c
index 03c92ea4..211d1b02 100644
--- a/types/struct.c
+++ b/types/struct.c
@@ -25,32 +25,22 @@
 
 static
 struct definition *_struct_definition_new(struct declaration *declaration,
-				struct definition_scope *parent_scope);
+				struct definition_scope *parent_scope,
+				GQuark field_name, int index);
 static
 void _struct_definition_free(struct definition *definition);
 
-void struct_copy(struct stream_pos *dest, const struct format *fdest, 
-		 struct stream_pos *src, const struct format *fsrc,
-		 struct definition *definition)
+void struct_rw(struct stream_pos *ppos, struct definition *definition)
 {
-	struct definition_struct *_struct =
+	struct definition_struct *struct_definition =
 		container_of(definition, struct definition_struct, p);
-	struct declaration_struct *struct_declaration = _struct->declaration;
 	unsigned long i;
 
-	fsrc->struct_begin(src, struct_declaration);
-	fdest->struct_begin(dest, struct_declaration);
-
-	for (i = 0; i < _struct->fields->len; i++) {
-		struct field *field = &g_array_index(_struct->fields,
+	for (i = 0; i < struct_definition->fields->len; i++) {
+		struct field *field = &g_array_index(struct_definition->fields,
 						     struct field, i);
-		struct declaration *field_declaration = field->definition->declaration;
-
-		field_declaration->copy(dest, fdest, src, fsrc, field->definition);
-
+		generic_rw(ppos, field->definition);
 	}
-	fsrc->struct_end(src, struct_declaration);
-	fdest->struct_end(dest, struct_declaration);
 }
 
 static
@@ -73,8 +63,8 @@ void _struct_declaration_free(struct declaration *declaration)
 	g_free(struct_declaration);
 }
 
-struct declaration_struct *struct_declaration_new(const char *name,
-				    struct declaration_scope *parent_scope)
+struct declaration_struct *
+	struct_declaration_new(struct declaration_scope *parent_scope)
 {
 	struct declaration_struct *struct_declaration;
 	struct declaration *declaration;
@@ -88,9 +78,7 @@ struct declaration_struct *struct_declaration_new(const char *name,
 						DEFAULT_NR_STRUCT_FIELDS);
 	struct_declaration->scope = new_declaration_scope(parent_scope);
 	declaration->id = CTF_TYPE_STRUCT;
-	declaration->name = g_quark_from_string(name);
 	declaration->alignment = 1;
-	declaration->copy = struct_copy;
 	declaration->declaration_free = _struct_declaration_free;
 	declaration->definition_new = _struct_definition_new;
 	declaration->definition_free = _struct_definition_free;
@@ -101,7 +89,8 @@ struct declaration_struct *struct_declaration_new(const char *name,
 static
 struct definition *
 	_struct_definition_new(struct declaration *declaration,
-			       struct definition_scope *parent_scope)
+			       struct definition_scope *parent_scope,
+			       GQuark field_name, int index)
 {
 	struct declaration_struct *struct_declaration =
 		container_of(declaration, struct declaration_struct, p);
@@ -114,7 +103,8 @@ struct definition *
 	_struct->p.declaration = declaration;
 	_struct->declaration = struct_declaration;
 	_struct->p.ref = 1;
-	_struct->scope = new_definition_scope(parent_scope);
+	_struct->p.index = index;
+	_struct->scope = new_definition_scope(parent_scope, field_name);
 	_struct->fields = g_array_sized_new(FALSE, TRUE,
 					    sizeof(struct field),
 					    DEFAULT_NR_STRUCT_FIELDS);
@@ -129,7 +119,8 @@ struct definition *
 		field->name = declaration_field->name;
 		field->definition =
 			declaration_field->declaration->definition_new(declaration_field->declaration,
-							  _struct->scope);
+							  _struct->scope,
+							  field->name, i);
 		ret = register_field_definition(field->name,
 						field->definition,
 						_struct->scope);
@@ -181,15 +172,24 @@ void struct_declaration_add_field(struct declaration_struct *struct_declaration,
 				       field_declaration->alignment);
 }
 
-unsigned long
-	struct_declaration_lookup_field_index(struct declaration_struct *struct_declaration,
+/*
+ * struct_declaration_lookup_field_index - returns field index
+ *
+ * Returns the index of a field in a structure, or -1 if it does not
+ * exist.
+ */
+int struct_declaration_lookup_field_index(struct declaration_struct *struct_declaration,
 				       GQuark field_name)
 {
-	unsigned long index;
-
-	index = (unsigned long) g_hash_table_lookup(struct_declaration->fields_by_name,
-						    (gconstpointer) (unsigned long) field_name);
-	return index;
+	gpointer index;
+	gboolean found;
+
+	found = g_hash_table_lookup_extended(struct_declaration->fields_by_name,
+				    (gconstpointer) (unsigned long) field_name,
+				    NULL, &index);
+	if (!found)
+		return -1;
+	return (int) (unsigned long) index;
 }
 
 /*
@@ -197,8 +197,10 @@ unsigned long
  */
 struct declaration_field *
 	struct_declaration_get_field_from_index(struct declaration_struct *struct_declaration,
-					 unsigned long index)
+					 int index)
 {
+	if (index < 0)
+		return NULL;
 	return &g_array_index(struct_declaration->fields, struct declaration_field, index);
 }
 
@@ -207,7 +209,9 @@ struct declaration_field *
  */
 struct field *
 struct_definition_get_field_from_index(struct definition_struct *_struct,
-					unsigned long index)
+					int index)
 {
+	if (index < 0)
+		return NULL;
 	return &g_array_index(_struct->fields, struct field, index);
 }