X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ftypes.c;h=91d6b211d118acaafe50a0a9f29bc5f1b12de329;hp=28242d23c323201106dc49d93775b572b65f0372;hb=ccd7e1c86f36342b0b06651cc52df86bb663c271;hpb=d79865b92da224131f58ab311e75e49043b62c7a

diff --git a/types/types.c b/types/types.c
index 28242d23..91d6b211 100644
--- a/types/types.c
+++ b/types/types.c
@@ -1,74 +1,60 @@
 /*
+ * 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 <glib.h>
 #include <errno.h>
 
-struct type_class {
-	GQuark qname;
-	void (*read)();
-	size_t (*write)();
-};
-
-struct type {
-	struct type_class *class;
-	size_t alignment;	/* type alignment, in bits */
-	ssize_t len;		/* type length, in bits. -1 for dynamic size. */
-};
-
 /*
- * Type class hash table contains the registered type classes. Type class
- * registration is typically performed by a plugin.
- * TODO: support plugin unload (unregistration of type classes).
+ * 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;
+GHashTable *types;
 
-struct type_class *ctf_lookup_type_class(GQuark qname)
+struct type_class *ctf_lookup_type(GQuark qname)
 {
 	return g_hash_table_lookup(type_classes,
 				   (gconstpointer) (unsigned long) qname)
 }
 
-int ctf_register_type_class(const char *name,
-			    void (*read)(),
-			    void (*write)())
+static void free_type(struct type_class *type_class)
 {
-	struct type_class tc = g_new(struct type_class, 1);
-	GQuark qname = g_quark_from_string(name);
+	type_class->free(type_class);
+}
 
-	if (ctf_lookup_type_class(qname))
+int ctf_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) qname,
-			    tc);
+			    (gconstpointer) (unsigned long) type_class->name,
+			    type_class);
 	return 0;
 }
 
 int ctf_init_types(void)
 {
 	type_classes = g_hash_table_new_full(g_direct_hash, g_direct_equal,
-					     NULL, g_free);
+					     NULL, free_type);
 	if (!type_classes)
 		return -ENOMEM;
 	return 0;