Build fixes.

[babeltrace.git] / types / types.c

diff --git a/types/types.c b/types/types.c
index 6fb3e5989269e11b029f7494d0d53a2d08e7ff76..8272b8147db08fdc822a153d44050beabd9fb19c 100644 (file)
--- 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,87 @@
 #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 qname, struct declaration_scope *scope)
 {
-       return g_hash_table_lookup(type_classes,
+       return g_hash_table_lookup(scope->types,
                                   (gconstpointer) (unsigned long) qname);
 }
 
-static void free_type(struct type_class *type_class)
+struct type *lookup_type(GQuark qname, struct declaration_scope *scope)
+{
+       struct type *type;
+
+       while (scope) {
+               type = lookup_type_scope(qname, scope);
+               if (type)
+                       return type;
+               scope = scope->parent_scope;
+       }
+       return NULL;
+}
+
+static void free_type(struct type *type)
+{
+       type->type_free(type);
+}
+
+static void free_declaration(struct declaration *declaration)
 {
-       type_class->free(type_class);
+       declaration->type->declaration_free(declaration);
 }
 
-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);
        return 0;
 }
 
-void type_ref(struct type_class *type_class)
+void type_ref(struct type *type)
 {
-       type_class->ref++;
+       type->ref++;
 }
 
-void type_unref(struct type_class *type_class)
+void type_unref(struct type *type)
 {
-       if (!--type_class->ref)
-               free_type(type_class);
+       if (!--type->ref)
+               free_type(type);
 }
 
-int init_types(void)
+void declaration_ref(struct declaration *declaration)
 {
-       type_classes = g_hash_table_new_full(g_direct_hash, g_direct_equal,
-                                            NULL, (GDestroyNotify) free_type);
-       if (!type_classes)
-               return -ENOMEM;
-       return 0;
+       declaration->ref++;
 }
 
-int finalize_types(void)
+void declaration_unref(struct declaration *declaration)
 {
-       g_hash_table_destroy(type_classes);
-       return 0;
+       if (!--declaration->ref)
+               free_declaration(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->parent_scope = parent_scope;
+       return scope;
+}
+
+void free_declaration_scope(struct declaration_scope *scope)
+{
+       g_hash_table_destroy(scope->types);
+       g_free(scope);
 }