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

diff --git a/types/types.c b/types/types.c
index 6fb3e598..e001dd02 100644
--- a/types/types.c
+++ b/types/types.c
@@ -5,7 +5,7 @@
  *
  * 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,122 @@
 #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;
-
-struct type_class *lookup_type(GQuark qname)
+static
+struct type *
+	lookup_type_scope(GQuark type_name, struct declaration_scope *scope)
 {
-	return g_hash_table_lookup(type_classes,
-				   (gconstpointer) (unsigned long) qname);
+	return g_hash_table_lookup(scope->types,
+				   (gconstpointer) (unsigned long) type_name);
 }
 
-static void free_type(struct type_class *type_class)
+struct type *lookup_type(GQuark type_name, struct declaration_scope *scope)
 {
-	type_class->free(type_class);
+	struct type *type;
+
+	while (scope) {
+		type = lookup_type_scope(type_name, scope);
+		if (type)
+			return type;
+		scope = scope->parent_scope;
+	}
+	return NULL;
 }
 
-int register_type(struct type_class *type_class)
+int register_type(struct type *type, struct declaration_scope *scope)
 {
-	if (lookup_type(type_class->name))
+	if (!type->name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_type_scope(type->name, scope))
 		return -EEXIST;
 
-	g_hash_table_insert(type_classes,
-			    (gpointer) (unsigned long) type_class->name,
-			    type_class);
+	g_hash_table_insert(scope->types,
+			    (gpointer) (unsigned long) type->name,
+			    type);
+	type_ref(type);
 	return 0;
 }
 
-void type_ref(struct type_class *type_class)
+static
+struct declaration *
+	lookup_declaration_scope(GQuark field_name, struct declaration_scope *scope)
 {
-	type_class->ref++;
+	return g_hash_table_lookup(scope->declarations,
+				   (gconstpointer) (unsigned long) field_name);
 }
 
-void type_unref(struct type_class *type_class)
+struct declaration *
+	lookup_declaration(GQuark field_name, struct declaration_scope *scope)
 {
-	if (!--type_class->ref)
-		free_type(type_class);
+	struct declaration *declaration;
+
+	while (scope) {
+		declaration = lookup_declaration_scope(field_name, scope);
+		if (declaration)
+			return declaration;
+		scope = scope->parent_scope;
+	}
+	return NULL;
 }
 
-int init_types(void)
+int register_declaration(GQuark field_name, struct declaration *declaration,
+			 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;
+	if (!field_name)
+		return -EPERM;
+
+	/* Only lookup in local scope */
+	if (lookup_declaration_scope(field_name, scope))
+		return -EEXIST;
+
+	g_hash_table_insert(scope->declarations,
+			    (gpointer) (unsigned long) field_name,
+			    declaration);
+	declaration_ref(declaration);
 	return 0;
 }
 
-int finalize_types(void)
+void type_ref(struct type *type)
 {
-	g_hash_table_destroy(type_classes);
-	return 0;
+	type->ref++;
+}
+
+void type_unref(struct type *type)
+{
+	if (!--type->ref)
+		type->type_free(type);
+}
+
+void declaration_ref(struct declaration *declaration)
+{
+	declaration->ref++;
+}
+
+void declaration_unref(struct declaration *declaration)
+{
+	if (!--declaration->ref)
+		declaration->type->declaration_free(declaration);
+}
+
+struct declaration_scope *
+	new_declaration_scope(struct declaration_scope *parent_scope)
+{
+	struct declaration_scope *scope = g_new(struct declaration_scope, 1);
+
+	scope->types = g_hash_table_new_full(g_direct_hash,
+					g_direct_equal, NULL,
+					(GDestroyNotify) type_unref);
+	scope->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->declarations);
+	g_hash_table_destroy(scope->types);
+	g_free(scope);
 }