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

diff --git a/types/sequence.c b/types/sequence.c
index 8f3fed9a..ae91ef87 100644
--- a/types/sequence.c
+++ b/types/sequence.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Sequence 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,122 +20,205 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
-
-#ifndef max
-#define max(a, b)	((a) < (b) ? (b) : (a))
-#endif
+#include <inttypes.h>
 
 static
-struct type *_sequence_type_new(struct type_class *type_class,
-				struct declaration_scope *parent_scope);
+struct definition *_sequence_definition_new(struct declaration *declaration,
+					struct definition_scope *parent_scope,
+					GQuark field_name, int index,
+					const char *root_name);
 static
-void _sequence_type_free(struct type *type);
+void _sequence_definition_free(struct definition *definition);
 
-void sequence_copy(struct stream_pos *dest, const struct format *fdest, 
-		   struct stream_pos *src, const struct format *fsrc,
-		   struct type *type)
+int sequence_rw(struct stream_pos *pos, struct definition *definition)
 {
-	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);
-	fdest->sequence_begin(dest, sequence);
-
-	sequence->len->p._class->copy(dest, fdest, src, fsrc,
-				      &sequence->len->p);
+	struct definition_sequence *sequence_definition =
+		container_of(definition, struct definition_sequence, p);
+	const struct declaration_sequence *sequence_declaration =
+		sequence_definition->declaration;
+	uint64_t len, oldlen, i;
+	int ret;
 
-	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);
+	len = sequence_definition->length->value._unsigned;
+	/*
+	 * Yes, large sequences could be _painfully slow_ to parse due
+	 * to memory allocation for each event read. At least, never
+	 * shrink the sequence. Note: the sequence GArray len should
+	 * never be used as indicator of the current sequence length.
+	 * One should always look at the sequence->len->value._unsigned
+	 * value for that.
+	 */
+	oldlen = sequence_definition->elems->len;
+	if (oldlen < len)
+		g_ptr_array_set_size(sequence_definition->elems, len);
+
+	for (i = oldlen; i < len; i++) {
+		struct definition **field;
+		GString *str;
+		GQuark name;
+
+		str = g_string_new("");
+		g_string_printf(str, "[%" PRIu64 "]", i);
+		name = g_quark_from_string(str->str);
+		(void) g_string_free(str, TRUE);
+
+		field = (struct definition **) &g_ptr_array_index(sequence_definition->elems, i);
+		*field = sequence_declaration->elem->definition_new(sequence_declaration->elem,
+					  sequence_definition->p.scope,
+					  name, i, NULL);
+		ret = generic_rw(pos, *field);
+		if (ret)
+			return ret;
 	}
-	fsrc->sequence_end(src, sequence);
-	fdest->sequence_end(dest, sequence);
+	return 0;
 }
 
 static
-void _sequence_type_class_free(struct type_class *type_class)
+void _sequence_declaration_free(struct declaration *declaration)
 {
-	struct type_class_sequence *sequence_class =
-		container_of(type_class, struct type_class_sequence, p);
+	struct declaration_sequence *sequence_declaration =
+		container_of(declaration, struct declaration_sequence, p);
 
-	type_class_unref(&sequence_class->len_class->p);
-	type_class_unref(sequence_class->elem);
-	g_free(sequence_class);
+	free_declaration_scope(sequence_declaration->scope);
+	g_array_free(sequence_declaration->length_name, TRUE);
+	declaration_unref(sequence_declaration->elem);
+	g_free(sequence_declaration);
 }
 
-struct type_class_sequence *
-sequence_type_class_new(const char *name, struct type_class_integer *len_class,
-			struct type_class *elem)
+struct declaration_sequence *
+	sequence_declaration_new(const char *length,
+			  struct declaration *elem_declaration,
+			  struct declaration_scope *parent_scope)
 {
-	struct type_class_sequence *sequence_class;
-	struct type_class *type_class;
+	struct declaration_sequence *sequence_declaration;
+	struct declaration *declaration;
+
+	sequence_declaration = g_new(struct declaration_sequence, 1);
+	declaration = &sequence_declaration->p;
+
+	sequence_declaration->length_name = g_array_new(FALSE, TRUE, sizeof(GQuark));
+	append_scope_path(length, sequence_declaration->length_name);
+
+	declaration_ref(elem_declaration);
+	sequence_declaration->elem = elem_declaration;
+	sequence_declaration->scope = new_declaration_scope(parent_scope);
+	declaration->id = CTF_TYPE_SEQUENCE;
+	declaration->alignment = elem_declaration->alignment;
+	declaration->declaration_free = _sequence_declaration_free;
+	declaration->definition_new = _sequence_definition_new;
+	declaration->definition_free = _sequence_definition_free;
+	declaration->ref = 1;
+	return sequence_declaration;
+}
+
+static
+struct definition *_sequence_definition_new(struct declaration *declaration,
+				struct definition_scope *parent_scope,
+				GQuark field_name, int index,
+				const char *root_name)
+{
+	struct declaration_sequence *sequence_declaration =
+		container_of(declaration, struct declaration_sequence, p);
+	struct definition_sequence *sequence;
+	struct definition *len_parent;
 	int ret;
 
-	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);
-	sequence_class->elem = elem;
-	type_class->name = g_quark_from_string(name);
-	type_class->alignment = max(len_class->p.alignment,
-				    elem->alignment);
-	type_class->copy = sequence_copy;
-	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) {
-		ret = register_type(type_class);
-		if (ret)
-			goto error_register;
+	sequence = g_new(struct definition_sequence, 1);
+	declaration_ref(&sequence_declaration->p);
+	sequence->p.declaration = declaration;
+	sequence->declaration = sequence_declaration;
+	sequence->p.ref = 1;
+	/*
+	 * Use INT_MAX order to ensure that all fields of the parent
+	 * scope are seen as being prior to this scope.
+	 */
+	sequence->p.index = root_name ? INT_MAX : index;
+	sequence->p.name = field_name;
+	sequence->p.path = new_definition_path(parent_scope, field_name, root_name);
+	sequence->p.scope = new_definition_scope(parent_scope, field_name, root_name);
+	ret = register_field_definition(field_name, &sequence->p,
+					parent_scope);
+	assert(!ret);
+	len_parent = lookup_path_definition(sequence->p.scope->scope_path,
+					    sequence_declaration->length_name,
+					    parent_scope);
+	if (!len_parent) {
+		printf("[error] Lookup for sequence length field failed.\n");
+		goto error;
+	}
+	sequence->length =
+		container_of(len_parent, struct definition_integer, p);
+	if (sequence->length->declaration->signedness) {
+		printf("[error] Sequence length field should be unsigned.\n");
+		goto error;
+	}
+	definition_ref(len_parent);
+
+	sequence->string = NULL;
+	sequence->elems = NULL;
+
+	if (sequence_declaration->elem->id == CTF_TYPE_INTEGER) {
+		struct declaration_integer *integer_declaration =
+			container_of(sequence_declaration->elem, struct declaration_integer, p);
+
+		if (integer_declaration->encoding == CTF_STRING_UTF8
+		      || integer_declaration->encoding == CTF_STRING_ASCII) {
+
+			sequence->string = g_string_new("");
+
+			if (integer_declaration->len == CHAR_BIT
+			    && integer_declaration->p.alignment == CHAR_BIT) {
+				return &sequence->p;
+			}
+		}
 	}
-	return sequence_class;
 
-error_register:
-	type_class_unref(&len_class->p);
-	type_class_unref(elem);
-	g_free(sequence_class);
+	sequence->elems = g_ptr_array_new();
+	return &sequence->p;
+
+error:
+	free_definition_scope(sequence->p.scope);
+	declaration_unref(&sequence_declaration->p);
+	g_free(sequence);
 	return NULL;
 }
 
 static
-struct type *_sequence_type_new(struct type_class *type_class,
-				struct declaration_scope *parent_scope)
+void _sequence_definition_free(struct definition *definition)
 {
-	struct type_class_sequence *sequence_class =
-		container_of(type_class, struct type_class_sequence, p);
-	struct type_sequence *sequence;
+	struct definition_sequence *sequence =
+		container_of(definition, struct definition_sequence, p);
+	struct definition *len_definition = &sequence->length->p;
+	uint64_t i;
 
-	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;
+	if (sequence->string)
+		(void) g_string_free(sequence->string, TRUE);
+	if (sequence->elems) {
+		for (i = 0; i < sequence->elems->len; i++) {
+			struct definition *field;
+
+			field = g_ptr_array_index(sequence->elems, i);
+			field->declaration->definition_free(field);
+		}
+	}
+	(void) g_ptr_array_free(sequence->elems, TRUE);
+	definition_unref(len_definition);
+	free_definition_scope(sequence->p.scope);
+	declaration_unref(sequence->p.declaration);
+	g_free(sequence);
 }
 
-static
-void _sequence_type_free(struct type *type)
+uint64_t sequence_len(struct definition_sequence *sequence)
 {
-	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);
+	return sequence->length->value._unsigned;
+}
+
+struct definition *sequence_index(struct definition_sequence *sequence, uint64_t i)
+{
+	if (!sequence->elems)
+		return NULL;
+	if (i >= sequence->length->value._unsigned)
+		return NULL;
+	assert(i < sequence->elems->len);
+	return g_ptr_array_index(sequence->elems, i);
 }