X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ftypes.c;h=1f93da4e245dba471d27ae5a5b314f905b05079c;hp=b766f8d8d4cb415e23011c82eaf217ded71b110a;hb=41253107837c6698a01af3133d11762302d8f9e5;hpb=e19c3d69b39d2fa422ab54b5ec7192799f536680

diff --git a/types/types.c b/types/types.c
index b766f8d8..1f93da4e 100644
--- a/types/types.c
+++ b/types/types.c
@@ -1,5 +1,5 @@
 /*
- * types.c
+ * declarations.c
  *
  * BabelTrace - Converter
  *
@@ -23,56 +23,216 @@
 #include <errno.h>
 
 static
-struct type *lookup_type_scope(GQuark qname, struct declaration_scope *scope)
+struct definition *
+	lookup_typedef_declaration_scope(GQuark declaration_name,
+		struct declaration_scope *scope)
 {
-	return g_hash_table_lookup(scope->types,
-				   (gconstpointer) (unsigned long) qname);
+	return g_hash_table_lookup(scope->typedef_declarations,
+				   (gconstpointer) (unsigned long) declaration_name);
 }
 
-struct type *lookup_type(GQuark qname, struct declaration_scope *scope)
+struct definition *lookup_typedef_declaration(GQuark declaration_name,
+		struct declaration_scope *scope)
 {
-	struct type *type;
+	struct definition *definition;
 
 	while (scope) {
-		type = lookup_type_scope(qname, scope);
-		if (type)
-			return type;
+		definition = lookup_typedef_declaration_scope(declaration_name,
+							      scope);
+		if (definition)
+			return definition;
 		scope = scope->parent_scope;
 	}
 	return NULL;
 }
 
-static void free_type(struct type *type)
+int register_typedef_declaration(GQuark name, struct declaration *declaration,
+		struct declaration_scope *scope)
 {
-	type->type_free(type);
+	if (!name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_typedef_declaration_scope(name, scope))
+		return -EEXIST;
+
+	g_hash_table_insert(scope->typedef_declarations,
+			    (gpointer) (unsigned long) name,
+			    declaration);
+	declaration_ref(declaration);
+	return 0;
 }
 
-static void free_declaration(struct declaration *declaration)
+static
+struct definition *
+	lookup_field_definition_scope(GQuark field_name,
+		struct definition_scope *scope)
 {
-	declaration->p.declaration_free(declaration);
+	return g_hash_table_lookup(scope->definitions,
+				   (gconstpointer) (unsigned long) field_name);
 }
 
-int register_type(struct type *type, struct declaration_scope *scope)
+/*
+ * Returns the index at which the paths differ.
+ * If the value returned equals len, it means the paths are identical
+ * from index 0 to len-1.
+ */
+static int compare_paths(GArray *a, GArray *b, int len)
 {
-	/* Only lookup in local scope */
-	if (lookup_type_scope(type->name, scope))
-		return -EEXIST;
+	int i;
 
-	g_hash_table_insert(scope->types,
-			    (gpointer) (unsigned long) type->name,
-			    type);
-	return 0;
+	assert(len <= a->len);
+	assert(len <= b->len);
+
+	for (i = 0; i < len; i++) {
+		GQuark qa, qb;
+
+		qa = g_array_index(a, GQuark, i);
+		qb = g_array_index(b, GQuark, i);
+		if (qa != qb)
+			return i;
+	}
+	return i;
+}
+
+static int is_path_child_of(GArray *path, GArray *maybe_parent)
+{
+	if (path->len <= maybe_parent->len)
+		return 0;
+	if (compare_paths(path, maybe_parent, maybe_parent->len)
+			== maybe_parent->len)
+		return 1;
+	else
+		return 0;
 }
 
-void type_ref(struct type *type)
+static struct definition_scope *
+	get_definition_scope(struct definition *definition)
 {
-	type->ref++;
+	switch (definition->declaration->id) {
+	case CTF_TYPE_STRUCT:
+	{
+		struct definition_struct *def =
+			container_of(definition, struct definition_struct, p);
+		return def->scope;
+	}
+	case CTF_TYPE_VARIANT:
+	{
+		struct definition_variant *def =
+			container_of(definition, struct definition_variant, p);
+		return def->scope;
+	}
+	case CTF_TYPE_ARRAY:
+	{
+		struct definition_array *def =
+			container_of(definition, struct definition_array, p);
+		return def->scope;
+	}
+	case CTF_TYPE_SEQUENCE:
+	{
+		struct definition_sequence *def =
+			container_of(definition, struct definition_sequence, p);
+		return def->scope;
+	}
+
+	case CTF_TYPE_INTEGER:
+	case CTF_TYPE_FLOAT:
+	case CTF_TYPE_ENUM:
+	case CTF_TYPE_STRING:
+	case CTF_TYPE_UNKNOWN:
+	default:
+		return NULL;
+	}
 }
 
-void type_unref(struct type *type)
+/*
+ * OK, here is the fun. We want to lookup a field that is:
+ * - either in the same dynamic scope:
+ *   - either in the current scope, but prior to the current field.
+ *   - or in a parent scope (or parent of parent ...) still in a field
+ *     prior to the current field position within the parents.
+ * - or in a different dynamic scope:
+ *   - either in a upper dynamic scope (walk down a targeted scope from
+ *     the dynamic scope root)
+ *   - or in a lower dynamic scope (failure)
+ * The dynamic scope roots are linked together, so we can access the
+ * parent dynamic scope from the child dynamic scope by walking up to
+ * the parent.
+ * If we cannot find such a field that is prior to our current path, we
+ * return NULL.
+ *
+ * cur_path: the path leading to the variant definition.
+ * lookup_path: the path leading to the enum we want to look for.
+ * scope: the definition scope containing the variant definition.
+ */
+struct definition *
+	lookup_definition(GArray *cur_path,
+			  GArray *lookup_path,
+			  struct definition_scope *scope)
 {
-	if (!--type->ref)
-		free_type(type);
+	struct definition *definition, *lookup_definition;
+	GQuark last;
+	int index;
+
+	while (scope) {
+		/* going up in the hierarchy. Check where we come from. */
+		assert(is_path_child_of(cur_path, scope->scope_path));
+		assert(cur_path->len - scope->scope_path->len == 1);
+		last = g_array_index(cur_path, GQuark, cur_path->len - 1);
+		definition = lookup_field_definition_scope(last, scope);
+		assert(definition);
+		index = definition->index;
+lookup:
+		if (is_path_child_of(lookup_path, scope->scope_path)) {
+			/* Means we can lookup the field in this scope */
+			last = g_array_index(lookup_path, GQuark,
+					     scope->scope_path->len);
+			lookup_definition = lookup_field_definition_scope(last, scope);
+			if (!lookup_definition || ((index != -1) && lookup_definition->index >= index))
+				return NULL;
+			/* Found it! And it is prior to the current field. */
+			if (lookup_path->len - scope->scope_path->len == 1) {
+				/* Direct child */
+				return lookup_definition;
+			} else {
+				scope = get_definition_scope(lookup_definition);
+				/* Check if the definition has a sub-scope */
+				if (!scope)
+					return NULL;
+				/*
+				 * Don't compare index anymore, because we are
+				 * going within a scope that has been validated
+				 * to be entirely prior to the current scope.
+				 */
+				cur_path = NULL;
+				index = -1;
+				goto lookup;
+			}
+		} else {
+			assert(index != -1);
+			/* lookup_path is within an upper scope */
+			cur_path = scope->scope_path;
+			scope = scope->parent_scope;
+		}
+	}
+	return NULL;
+}
+
+int register_field_definition(GQuark field_name, struct definition *definition,
+		struct definition_scope *scope)
+{
+	if (!field_name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_field_definition_scope(field_name, scope))
+		return -EEXIST;
+
+	g_hash_table_insert(scope->definitions,
+			    (gpointer) (unsigned long) field_name,
+			    definition);
+	definition_ref(definition);
+	return 0;
 }
 
 void declaration_ref(struct declaration *declaration)
@@ -83,7 +243,18 @@ void declaration_ref(struct declaration *declaration)
 void declaration_unref(struct declaration *declaration)
 {
 	if (!--declaration->ref)
-		free_declaration(declaration);
+		declaration->declaration_free(declaration);
+}
+
+void definition_ref(struct definition *definition)
+{
+	definition->ref++;
+}
+
+void definition_unref(struct definition *definition)
+{
+	if (!--definition->ref)
+		definition->declaration->definition_free(definition);
 }
 
 struct declaration_scope *
@@ -91,15 +262,199 @@ struct declaration_scope *
 {
 	struct declaration_scope *scope = g_new(struct declaration_scope, 1);
 
-	scope->types = g_hash_table_new_full(g_direct_hash,
+	scope->typedef_declarations = g_hash_table_new_full(g_direct_hash,
 					g_direct_equal, NULL,
-					(GDestroyNotify) type_unref);
+					(GDestroyNotify) definition_unref);
+	scope->struct_declarations = g_hash_table_new_full(g_direct_hash,
+					g_direct_equal, NULL,
+					(GDestroyNotify) declaration_unref);
+	scope->variant_declarations = g_hash_table_new_full(g_direct_hash,
+					g_direct_equal, NULL,
+					(GDestroyNotify) declaration_unref);
+	scope->enum_declarations = g_hash_table_new_full(g_direct_hash,
+					g_direct_equal, NULL,
+					(GDestroyNotify) declaration_unref);
 	scope->parent_scope = parent_scope;
 	return scope;
 }
 
 void free_declaration_scope(struct declaration_scope *scope)
 {
-	g_hash_table_destroy(scope->types);
+	g_hash_table_destroy(scope->enum_declarations);
+	g_hash_table_destroy(scope->variant_declarations);
+	g_hash_table_destroy(scope->struct_declarations);
+	g_hash_table_destroy(scope->typedef_declarations);
+	g_free(scope);
+}
+
+static
+struct declaration_struct *lookup_struct_declaration_scope(GQuark struct_name,
+					     struct declaration_scope *scope)
+{
+	return g_hash_table_lookup(scope->struct_declarations,
+				   (gconstpointer) (unsigned long) struct_name);
+}
+
+struct declaration_struct *lookup_struct_declaration(GQuark struct_name,
+				       struct declaration_scope *scope)
+{
+	struct declaration_struct *declaration;
+
+	while (scope) {
+		declaration = lookup_struct_declaration_scope(struct_name, scope);
+		if (declaration)
+			return declaration;
+		scope = scope->parent_scope;
+	}
+	return NULL;
+}
+
+int register_struct_declaration(GQuark struct_name,
+	struct declaration_struct *struct_declaration,
+	struct declaration_scope *scope)
+{
+	if (!struct_name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_struct_declaration_scope(struct_name, scope))
+		return -EEXIST;
+
+	g_hash_table_insert(scope->struct_declarations,
+			    (gpointer) (unsigned long) struct_name,
+			    struct_declaration);
+	declaration_ref(&struct_declaration->p);
+	return 0;
+}
+
+static
+struct declaration_variant *
+	lookup_variant_declaration_scope(GQuark variant_name,
+		struct declaration_scope *scope)
+{
+	return g_hash_table_lookup(scope->variant_declarations,
+				   (gconstpointer) (unsigned long) variant_name);
+}
+
+struct declaration_variant *
+	lookup_variant_declaration(GQuark variant_name,
+		struct declaration_scope *scope)
+{
+	struct declaration_variant *declaration;
+
+	while (scope) {
+		declaration = lookup_variant_declaration_scope(variant_name, scope);
+		if (declaration)
+			return declaration;
+		scope = scope->parent_scope;
+	}
+	return NULL;
+}
+
+int register_variant_declaration(GQuark variant_name,
+		struct declaration_variant *variant_declaration,
+		struct declaration_scope *scope)
+{
+	if (!variant_name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_variant_declaration_scope(variant_name, scope))
+		return -EEXIST;
+
+	g_hash_table_insert(scope->variant_declarations,
+			    (gpointer) (unsigned long) variant_name,
+			    variant_declaration);
+	declaration_ref(&variant_declaration->p);
+	return 0;
+}
+
+static
+struct declaration_enum *
+	lookup_enum_declaration_scope(GQuark enum_name,
+		struct declaration_scope *scope)
+{
+	return g_hash_table_lookup(scope->enum_declarations,
+				   (gconstpointer) (unsigned long) enum_name);
+}
+
+struct declaration_enum *
+	lookup_enum_declaration(GQuark enum_name,
+		struct declaration_scope *scope)
+{
+	struct declaration_enum *declaration;
+
+	while (scope) {
+		declaration = lookup_enum_declaration_scope(enum_name, scope);
+		if (declaration)
+			return declaration;
+		scope = scope->parent_scope;
+	}
+	return NULL;
+}
+
+int register_enum_declaration(GQuark enum_name,
+		struct declaration_enum *enum_declaration,
+		struct declaration_scope *scope)
+{
+	if (!enum_name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_enum_declaration_scope(enum_name, scope))
+		return -EEXIST;
+
+	g_hash_table_insert(scope->enum_declarations,
+			    (gpointer) (unsigned long) enum_name,
+			    enum_declaration);
+	declaration_ref(&enum_declaration->p);
+	return 0;
+}
+
+static struct definition_scope *
+	_new_definition_scope(struct definition_scope *parent_scope,
+			      int scope_path_len)
+{
+	struct definition_scope *scope = g_new(struct definition_scope, 1);
+
+	scope->definitions = g_hash_table_new_full(g_direct_hash,
+					g_direct_equal, NULL,
+					(GDestroyNotify) definition_unref);
+	scope->parent_scope = parent_scope;
+	scope->scope_path = g_array_sized_new(FALSE, TRUE, sizeof(GQuark),
+					      scope_path_len);
+	g_array_set_size(scope->scope_path, scope_path_len);
+	return scope;
+}
+
+struct definition_scope *
+	new_definition_scope(struct definition_scope *parent_scope,
+			     GQuark field_name)
+{
+	struct definition_scope *scope;
+	int scope_path_len = 1;
+
+	if (parent_scope)
+		scope_path_len += parent_scope->scope_path->len;
+	scope = _new_definition_scope(parent_scope, scope_path_len);
+	if (parent_scope)
+		memcpy(scope->scope_path, parent_scope->scope_path,
+		       sizeof(GQuark) * (scope_path_len - 1));
+	g_array_index(scope->scope_path, GQuark, scope_path_len - 1) =
+		field_name;
+	return scope;
+}
+
+void set_dynamic_definition_scope(struct definition_scope *scope,
+				  GQuark root_name)
+{
+	g_array_set_size(scope->scope_path, 1);
+	g_array_index(scope->scope_path, GQuark, 0) = root_name;
+}
+
+void free_definition_scope(struct definition_scope *scope)
+{
+	g_array_free(scope->scope_path, TRUE);
+	g_hash_table_destroy(scope->definitions);
 	g_free(scope);
 }