X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=types%2Ftypes.c;h=90720e2bed988b69be1bb820201fa60cf11bc06a;hb=d20f5e59af1c0db93913661a3daa92c087860e6e;hp=6fb3e5989269e11b029f7494d0d53a2d08e7ff76;hpb=be85c1c7633af07e35db7b415d6ee8447c30e80a;p=babeltrace.git

diff --git a/types/types.c b/types/types.c
index 6fb3e598..90720e2b 100644
--- a/types/types.c
+++ b/types/types.c
@@ -1,11 +1,11 @@
 /*
- * types.c
+ * declarations.c
  *
  * BabelTrace - Converter
  *
  * Types registry.
  *
- * 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
@@ -22,57 +22,278 @@
 #include <glib.h>
 #include <errno.h>
 
-/*
- * Type hash table contains the registered types. Type registration is typically
- * performed by a type plugin.
- * TODO: support plugin unload (unregistration of types).
- */
-GHashTable *type_classes;
+static
+struct definition *
+	lookup_typedef_declaration_scope(GQuark declaration_name,
+		struct declaration_scope *scope)
+{
+	return g_hash_table_lookup(scope->typedef_declarations,
+				   (gconstpointer) (unsigned long) declaration_name);
+}
+
+struct definition *lookup_typedef_declaration(GQuark declaration_name,
+		struct declaration_scope *scope)
+{
+	struct definition *definition;
+
+	while (scope) {
+		definition = lookup_typedef_declaration_scope(declaration_name,
+							      scope);
+		if (definition)
+			return definition;
+		scope = scope->parent_scope;
+	}
+	return NULL;
+}
+
+int register_typedef_declaration(GQuark name, struct declaration *declaration,
+		struct declaration_scope *scope)
+{
+	if (!name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_typedef_declaration_scope(name, scope))
+		return -EEXIST;
 
-struct type_class *lookup_type(GQuark qname)
+	g_hash_table_insert(scope->typedef_declarations,
+			    (gpointer) (unsigned long) name,
+			    declaration);
+	declaration_ref(declaration);
+	return 0;
+}
+
+static
+struct definition *
+	lookup_field_definition_scope(GQuark field_name,
+		struct definition_scope *scope)
 {
-	return g_hash_table_lookup(type_classes,
-				   (gconstpointer) (unsigned long) qname);
+	return g_hash_table_lookup(scope->definitions,
+				   (gconstpointer) (unsigned long) field_name);
 }
 
-static void free_type(struct type_class *type_class)
+struct definition *
+	lookup_field_definition(GQuark field_name,
+		struct definition_scope *scope)
 {
-	type_class->free(type_class);
+	struct definition *definition;
+
+	while (scope) {
+		definition = lookup_field_definition_scope(field_name, scope);
+		if (definition)
+			return definition;
+		scope = scope->parent_scope;
+	}
+	return NULL;
 }
 
-int register_type(struct type_class *type_class)
+int register_field_definition(GQuark field_name, struct definition *definition,
+		struct definition_scope *scope)
 {
-	if (lookup_type(type_class->name))
+	if (!field_name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_field_definition_scope(field_name, scope))
 		return -EEXIST;
 
-	g_hash_table_insert(type_classes,
-			    (gpointer) (unsigned long) type_class->name,
-			    type_class);
+	g_hash_table_insert(scope->definitions,
+			    (gpointer) (unsigned long) field_name,
+			    definition);
+	definition_ref(definition);
 	return 0;
 }
 
-void type_ref(struct type_class *type_class)
+void declaration_ref(struct declaration *declaration)
+{
+	declaration->ref++;
+}
+
+void declaration_unref(struct declaration *declaration)
+{
+	if (!--declaration->ref)
+		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 *
+	new_declaration_scope(struct declaration_scope *parent_scope)
 {
-	type_class->ref++;
+	struct declaration_scope *scope = g_new(struct declaration_scope, 1);
+
+	scope->typedef_declarations = g_hash_table_new_full(g_direct_hash,
+					g_direct_equal, NULL,
+					(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 type_unref(struct type_class *type_class)
+void free_declaration_scope(struct declaration_scope *scope)
 {
-	if (!--type_class->ref)
-		free_type(type_class);
+	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);
 }
 
-int init_types(void)
+static
+struct declaration_struct *lookup_struct_declaration_scope(GQuark struct_name,
+					     struct declaration_scope *scope)
 {
-	type_classes = g_hash_table_new_full(g_direct_hash, g_direct_equal,
-					     NULL, (GDestroyNotify) free_type);
-	if (!type_classes)
-		return -ENOMEM;
+	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;
 }
 
-int finalize_types(void)
+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)
 {
-	g_hash_table_destroy(type_classes);
+	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;
+}
+
+struct definition_scope *
+	new_definition_scope(struct definition_scope *parent_scope)
+{
+	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;
+	return scope;
+}
+
+void free_definition_scope(struct definition_scope *scope)
+{
+	g_hash_table_destroy(scope->definitions);
+	g_free(scope);
+}