X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fsequence.c;h=8f3fed9aff924105dee3220b67475f6a832dcc08;hp=4967182821d74a031fb7c4e5de6c51d18352cd4d;hb=c054553dac076f91196b372fa19efaf2adc4e4f9;hpb=8a4035bcbfe691490b031f08533676597f72a4ac

diff --git a/types/sequence.c b/types/sequence.c
index 49671828..8f3fed9a 100644
--- a/types/sequence.c
+++ b/types/sequence.c
@@ -3,7 +3,7 @@
  *
  * BabelTrace - Sequence 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
@@ -23,47 +23,49 @@
 #define max(a, b)	((a) < (b) ? (b) : (a))
 #endif
 
+static
+struct type *_sequence_type_new(struct type_class *type_class,
+				struct declaration_scope *parent_scope);
+static
+void _sequence_type_free(struct type *type);
+
 void sequence_copy(struct stream_pos *dest, const struct format *fdest, 
 		   struct stream_pos *src, const struct format *fsrc,
-		   const struct type_class *type_class)
+		   struct type *type)
 {
-	struct type_class_sequence *sequence_class =
-		container_of(type_class, struct type_class_sequence, p);
-	unsigned int i;
-	size_t len;
+	struct type_sequence *sequence =
+		container_of(type, struct type_sequence, p);
+	struct type_class_sequence *sequence_class = sequence->_class;
+	uint64_t i;
 
-	fsrc->sequence_begin(src, sequence_class);
-	fdest->sequence_begin(dest, sequence_class);
+	fsrc->sequence_begin(src, sequence);
+	fdest->sequence_begin(dest, sequence);
 
-	len = fsrc->uint_read(src, sequence_class->len_class);
-	fdest->uint_write(dest, sequence_class->len_class, len);
+	sequence->len->p._class->copy(dest, fdest, src, fsrc,
+				      &sequence->len->p);
 
-	for (i = 0; i < len; i++) {
-		struct type_class *elem_class = sequence_class->elem;
-		elem_class->copy(dest, fdest, src, fsrc, elem_class);
+	for (i = 0; i < sequence->len->value._unsigned; i++) {
+		struct type *elem_type = sequence->current_element.type;
+		elem_type->p._class->copy(dest, fdest, src, fsrc, elem_type);
 	}
-	fsrc->sequence_end(src, sequence_class);
-	fdest->sequence_end(dest, sequence_class);
+	fsrc->sequence_end(src, sequence);
+	fdest->sequence_end(dest, sequence);
 }
 
-void sequence_type_free(struct type_class_sequence *sequence_class)
-{
-	sequence_class->elem->free(sequence_class->elem);
-	type_unref(&sequence_class->len_class->p);
-	type_unref(sequence_class->elem);
-	g_free(sequence_class);
-}
-
-static void _sequence_type_free(struct type_class *type_class)
+static
+void _sequence_type_class_free(struct type_class *type_class)
 {
 	struct type_class_sequence *sequence_class =
 		container_of(type_class, struct type_class_sequence, p);
-	sequence_type_free(sequence_class);
+
+	type_class_unref(&sequence_class->len_class->p);
+	type_class_unref(sequence_class->elem);
+	g_free(sequence_class);
 }
 
 struct type_class_sequence *
-sequence_type_new(const char *name, struct type_class_integer *len_class,
-		  struct type_class *elem)
+sequence_type_class_new(const char *name, struct type_class_integer *len_class,
+			struct type_class *elem)
 {
 	struct type_class_sequence *sequence_class;
 	struct type_class *type_class;
@@ -71,9 +73,7 @@ sequence_type_new(const char *name, struct type_class_integer *len_class,
 
 	sequence_class = g_new(struct type_class_sequence, 1);
 	type_class = &sequence_class->p;
-
 	assert(!len_class->signedness);
-
 	type_ref(&len_class->p);
 	sequence_class->len_class = len_class;
 	type_ref(elem);
@@ -82,7 +82,9 @@ sequence_type_new(const char *name, struct type_class_integer *len_class,
 	type_class->alignment = max(len_class->p.alignment,
 				    elem->alignment);
 	type_class->copy = sequence_copy;
-	type_class->free = _sequence_type_free;
+	type_class->class_free = _sequence_type_class_free;
+	type_class->type_new = _sequence_type_new;
+	type_class->type_free = _sequence_type_free;
 	type_class->ref = 1;
 
 	if (type_class->name) {
@@ -93,8 +95,45 @@ sequence_type_new(const char *name, struct type_class_integer *len_class,
 	return sequence_class;
 
 error_register:
-	type_unref(&len_class->p);
-	type_unref(elem);
+	type_class_unref(&len_class->p);
+	type_class_unref(elem);
 	g_free(sequence_class);
 	return NULL;
 }
+
+static
+struct type *_sequence_type_new(struct type_class *type_class,
+				struct declaration_scope *parent_scope)
+{
+	struct type_class_sequence *sequence_class =
+		container_of(type_class, struct type_class_sequence, p);
+	struct type_sequence *sequence;
+
+	sequence = g_new(struct type_sequence, 1);
+	type_class_ref(&sequence_class->p);
+	sequence->p._class = sequence_class;
+	sequence->p.ref = 1;
+	sequence->scope = new_declaration_scope(parent_scope);
+	sequence->len.type =
+		sequence_class->len_class.p->type_new(&sequence_class->len_class.p,
+						      parent_scope);
+	sequence->current_element.type =
+		sequence_class->elem.p->type_new(&sequence_class->elem.p,
+						 parent_scope);
+	return &sequence->p;
+}
+
+static
+void _sequence_type_free(struct type *type)
+{
+	struct type_sequence *sequence =
+		container_of(type, struct type_sequence, p);
+	struct type *len_type = sequence->len.type;
+	struct type *elem_type = sequence->current_element.type;
+
+	len_type->p._class->type_free(len_type);
+	elem_type->p._class->type_free(elem_type);
+	free_declaration_scope(sequence->scope);
+	type_class_unref(sequence->p._class);
+	g_free(sequence);
+}