X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Farray.c;h=047adac21902c7d7f438fc14a1e55099181280f1;hp=0be26476df8605945713bb74927a0848cfd9ed85;hb=9b3c1d6f8e01603488e317ffef7a8e3c15c98459;hpb=98df1c9fb24d5e7e10bf628692011e130e0d8339

diff --git a/types/array.c b/types/array.c
index 0be26476..047adac2 100644
--- a/types/array.c
+++ b/types/array.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Array 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,6 +20,7 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <inttypes.h>
 
 static
@@ -106,10 +109,29 @@ struct definition *
 	array->p.index = root_name ? INT_MAX : index;
 	array->p.name = field_name;
 	array->p.path = new_definition_path(parent_scope, field_name, root_name);
-	array->scope = new_definition_scope(parent_scope, field_name, root_name);
+	array->p.scope = new_definition_scope(parent_scope, field_name, root_name);
 	ret = register_field_definition(field_name, &array->p,
 					parent_scope);
 	assert(!ret);
+	array->string = NULL;
+	array->elems = NULL;
+
+	if (array_declaration->elem->id == CTF_TYPE_INTEGER) {
+		struct declaration_integer *integer_declaration =
+			container_of(array_declaration->elem, struct declaration_integer, p);
+
+		if (integer_declaration->encoding == CTF_STRING_UTF8
+		      || integer_declaration->encoding == CTF_STRING_ASCII) {
+
+			array->string = g_string_new("");
+
+			if (integer_declaration->len == CHAR_BIT
+			    && integer_declaration->p.alignment == CHAR_BIT) {
+				return &array->p;
+			}
+		}
+	}
+
 	array->elems = g_ptr_array_sized_new(array_declaration->len);
 	g_ptr_array_set_size(array->elems, array_declaration->len);
 	for (i = 0; i < array_declaration->len; i++) {
@@ -124,11 +146,12 @@ struct definition *
 
 		field = (struct definition **) &g_ptr_array_index(array->elems, i);
 		*field = array_declaration->elem->definition_new(array_declaration->elem,
-					  array->scope,
+					  array->p.scope,
 					  name, i, NULL);
 		if (!*field)
 			goto error;
 	}
+
 	return &array->p;
 
 error:
@@ -139,7 +162,7 @@ error:
 		field->declaration->definition_free(field);
 	}
 	(void) g_ptr_array_free(array->elems, TRUE);
-	free_definition_scope(array->scope);
+	free_definition_scope(array->p.scope);
 	declaration_unref(array->p.declaration);
 	g_free(array);
 	return NULL;
@@ -152,26 +175,72 @@ void _array_definition_free(struct definition *definition)
 		container_of(definition, struct definition_array, p);
 	uint64_t i;
 
-	for (i = 0; i < array->elems->len; i++) {
-		struct definition *field;
+	if (array->string)
+		(void) g_string_free(array->string, TRUE);
+	if (array->elems) {
+		for (i = 0; i < array->elems->len; i++) {
+			struct definition *field;
 
-		field = g_ptr_array_index(array->elems, i);
-		field->declaration->definition_free(field);
+			field = g_ptr_array_index(array->elems, i);
+			field->declaration->definition_free(field);
+		}
+		(void) g_ptr_array_free(array->elems, TRUE);
 	}
-	(void) g_ptr_array_free(array->elems, TRUE);
-	free_definition_scope(array->scope);
+	free_definition_scope(array->p.scope);
 	declaration_unref(array->p.declaration);
 	g_free(array);
 }
 
 uint64_t array_len(struct definition_array *array)
 {
+	if (!array->elems)
+		return array->string->len;
 	return array->elems->len;
 }
 
 struct definition *array_index(struct definition_array *array, uint64_t i)
 {
+	if (!array->elems)
+		return NULL;
 	if (i >= array->elems->len)
 		return NULL;
 	return g_ptr_array_index(array->elems, i);
 }
+
+int get_array_len(const struct definition *field)
+{
+	struct definition_array *array_definition;
+	struct declaration_array *array_declaration;
+
+	array_definition = container_of(field, struct definition_array, p);
+	array_declaration = array_definition->declaration;
+
+	return array_declaration->len;
+}
+
+GString *get_char_array(const struct definition *field)
+{
+	struct definition_array *array_definition;
+	struct declaration_array *array_declaration;
+	struct declaration *elem;
+
+	array_definition = container_of(field, struct definition_array, p);
+	array_declaration = array_definition->declaration;
+	elem = array_declaration->elem;
+	if (elem->id == CTF_TYPE_INTEGER) {
+		struct declaration_integer *integer_declaration =
+			container_of(elem, struct declaration_integer, p);
+
+		if (integer_declaration->encoding == CTF_STRING_UTF8
+				|| integer_declaration->encoding == CTF_STRING_ASCII) {
+
+			if (integer_declaration->len == CHAR_BIT
+					&& integer_declaration->p.alignment == CHAR_BIT) {
+
+				return array_definition->string;
+			}
+		}
+	}
+	fprintf(stderr, "[warning] Extracting string\n");
+	return NULL;
+}