X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstring.c;h=daaeef5aa7514f00762e08b9cb79835663647645;hp=d38d3cf33b45a24920a1114e1555d0521f73bc00;hb=5f0b5523775fe5fe8dcc7c232aa831979a36498c;hpb=be85c1c7633af07e35db7b415d6ee8447c30e80a

diff --git a/types/string.c b/types/string.c
index d38d3cf3..daaeef5a 100644
--- a/types/string.c
+++ b/types/string.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - String Type Converter
  *
- * Copyright 2010 - 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
@@ -19,54 +21,103 @@
 #include <babeltrace/compiler.h>
 #include <babeltrace/align.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
+
+static
+struct definition *_string_definition_new(struct declaration *declaration,
+				struct definition_scope *parent_scope,
+				GQuark field_name, int index,
+				const char *root_name);
+static
+void _string_definition_free(struct definition *definition);
 
-void string_copy(struct stream_pos *dest, const struct format *fdest, 
-		 struct stream_pos *src, const struct format *fsrc,
-		 const struct type_class *type_class)
+static
+void _string_declaration_free(struct declaration *declaration)
 {
-	struct type_class_string *string_class =
-		container_of(type_class, struct type_class_string, p);
+	struct declaration_string *string_declaration =
+		container_of(declaration, struct declaration_string, p);
+	g_free(string_declaration);
+}
+
+struct declaration_string *
+	string_declaration_new(enum ctf_string_encoding encoding)
+{
+	struct declaration_string *string_declaration;
+
+	string_declaration = g_new(struct declaration_string, 1);
+	string_declaration->p.id = CTF_TYPE_STRING;
+	string_declaration->p.alignment = CHAR_BIT;
+	string_declaration->p.declaration_free = _string_declaration_free;
+	string_declaration->p.definition_new = _string_definition_new;
+	string_declaration->p.definition_free = _string_definition_free;
+	string_declaration->p.ref = 1;
+	string_declaration->encoding = encoding;
+	return string_declaration;
+}
 
-	if (fsrc->string_copy == fdest->string_copy) {
-		fsrc->string_copy(dest, src, string_class);
-	} else {
-		unsigned char *tmp = NULL;
+static
+struct definition *
+	_string_definition_new(struct declaration *declaration,
+			       struct definition_scope *parent_scope,
+			       GQuark field_name, int index,
+			       const char *root_name)
+{
+	struct declaration_string *string_declaration =
+		container_of(declaration, struct declaration_string, p);
+	struct definition_string *string;
+	int ret;
 
-		fsrc->string_read(&tmp, src, string_class);
-		fdest->string_write(dest, tmp, string_class);
-		fsrc->string_free_temp(tmp);
-	}
+	string = g_new(struct definition_string, 1);
+	declaration_ref(&string_declaration->p);
+	string->p.declaration = declaration;
+	string->declaration = string_declaration;
+	string->p.ref = 1;
+	/*
+	 * Use INT_MAX order to ensure that all fields of the parent
+	 * scope are seen as being prior to this scope.
+	 */
+	string->p.index = root_name ? INT_MAX : index;
+	string->p.name = field_name;
+	string->p.path = new_definition_path(parent_scope, field_name,
+					root_name);
+	string->p.scope = NULL;
+	string->value = NULL;
+	string->len = 0;
+	string->alloc_len = 0;
+	ret = register_field_definition(field_name, &string->p,
+					parent_scope);
+	assert(!ret);
+	return &string->p;
 }
 
-void string_type_free(struct type_class_string *string_class)
+static
+void _string_definition_free(struct definition *definition)
 {
-	g_free(string_class);
+	struct definition_string *string =
+		container_of(definition, struct definition_string, p);
+
+	declaration_unref(string->p.declaration);
+	g_free(string->value);
+	g_free(string);
 }
 
-static void _string_type_free(struct type_class *type_class)
+enum ctf_string_encoding get_string_encoding(const struct definition *field)
 {
-	struct type_class_string *string_class =
-		container_of(type_class, struct type_class_string, p);
-	string_type_free(string_class);
+	struct definition_string *string_definition;
+	const struct declaration_string *string_declaration;
+
+	string_definition = container_of(field, struct definition_string, p);
+	string_declaration = string_definition->declaration;
+
+	return string_declaration->encoding;
 }
 
-struct type_class_string *string_type_new(const char *name)
+char *get_string(const struct definition *field)
 {
-	struct type_class_string *string_class;
-	int ret;
+	struct definition_string *string_definition =
+		container_of(field, struct definition_string, p);
+
+	assert(string_definition->value != NULL);
 
-	string_class = g_new(struct type_class_string, 1);
-	string_class->p.name = g_quark_from_string(name);
-	string_class->p.alignment = CHAR_BIT;
-	string_class->p.copy = string_copy;
-	string_class->p.free = _string_type_free;
-	string_class->p.ref = 1;
-	if (string_class->p.name) {
-		ret = register_type(&string_class->p);
-		if (ret) {
-			g_free(string_class);
-			return NULL;
-		}
-	}
-	return string_class;
+	return string_definition->value;
 }