X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ftypes.c;h=675567f8f1819fcb28beb7c52ff911a54606482d;hp=f4843e6a87384c2cd29bf633f480329bb2f11e55;hb=90b676d73fc6f817958083c0f159028a2f0b40ca;hpb=ceb811dc38fe93065f7c1119b9509f9f29a45d76

diff --git a/types/types.c b/types/types.c
index f4843e6a..675567f8 100644
--- a/types/types.c
+++ b/types/types.c
@@ -1,5 +1,5 @@
 /*
- * Common Trace Format - Converter
+ * BabelTrace - Converter
  *
  * Types registry.
  *
@@ -24,51 +24,39 @@
 #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;