Build fix

[babeltrace.git] / types / types.c

diff --git a/types/types.c b/types/types.c
index 675567f8f1819fcb28beb7c52ff911a54606482d..fbd1ed50bb26b621ce06c852bef68a8f6bcf434a 100644 (file)
--- a/types/types.c
+++ b/types/types.c
@@ -1,26 +1,24 @@
 /*
+ * types.c
+ *
  * BabelTrace - Converter
  *
  * Types registry.
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
-#include <ctf/ctf-types.h>
+#include <babeltrace/format.h>
 #include <glib.h>
 #include <errno.h>
 
@@ -29,12 +27,12 @@
  * performed by a type plugin.
  * TODO: support plugin unload (unregistration of types).
  */
-GHashTable *types;
+GHashTable *type_classes;
 
-struct type_class *ctf_lookup_type(GQuark qname)
+struct type_class *lookup_type(GQuark qname)
 {
        return g_hash_table_lookup(type_classes,
-                                  (gconstpointer) (unsigned long) qname)
+                                  (gconstpointer) (unsigned long) qname);
 }
 
 static void free_type(struct type_class *type_class)
@@ -42,27 +40,38 @@ static void free_type(struct type_class *type_class)
        type_class->free(type_class);
 }
 
-int ctf_register_type(struct type_class *type_class)
+int register_type(struct type_class *type_class)
 {
        if (ctf_lookup_type_class(type_class->name))
                return -EEXIST;
 
        g_hash_table_insert(type_classes,
-                           (gconstpointer) (unsigned long) type_class->name,
+                           (gpointer) (unsigned long) type_class->name,
                            type_class);
        return 0;
 }
 
-int ctf_init_types(void)
+void type_ref(struct type_class *type_class)
+{
+       type_class->ref++;
+}
+
+void type_unref(struct type_class *type_class)
+{
+       if (!--type_class->ref)
+               free_type(type_class);
+}
+
+int init_types(void)
 {
        type_classes = g_hash_table_new_full(g_direct_hash, g_direct_equal,
-                                            NULL, free_type);
+                                            NULL, (GDestroyNotify) free_type);
        if (!type_classes)
                return -ENOMEM;
        return 0;
 }
 
-int ctf_finalize_types(void)
+int finalize_types(void)
 {
        g_hash_table_destroy(type_classes);
 }