X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=ea292900ce80886141bf21a171ec3b76d2573db8;hp=7b2a3a97437f4053a3c70aad8a95d5601b89f060;hb=96354dac0b8b6a3e433fa86d3249c510f90c3e7d;hpb=bed864a75d2315c344a6e625db66ae9bfbc51e27

diff --git a/types/integer.c b/types/integer.c
index 7b2a3a97..ea292900 100644
--- a/types/integer.c
+++ b/types/integer.c
@@ -1,64 +1,64 @@
 /*
- * BabelTrace - Integer Type Converter
+ * integer.c
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * BabelTrace - Integer Type Converter
  *
- * 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, 2011 - 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 <babeltrace/compiler.h>
 #include <babeltrace/align.h>
-#include <babeltrace/types.h>
+#include <babeltrace/format.h>
 #include <stdint.h>
 
-size_t integer_copy(unsigned char *dest, const struct format *fdest, 
-		    const unsigned char *src, const struct format *fsrc,
-		    const struct type_class *type_class)
+static
+struct type *_integer_type_new(struct type_class *type_class,
+			       struct declaration_scope *parent_scope);
+static
+void _integer_type_free(struct type *type);
+
+void integer_copy(struct stream_pos *dest, const struct format *fdest, 
+		  struct stream_pos *src, const struct format *fsrc,
+		  struct type *type)
 {
-	struct type_class_integer *int_class =
-		container_of(type_class, struct type_class_integer, p);
+	struct type_integer *integer = container_of(type, struct type_integer,
+						    p);
+	struct type_class_integer *int_class = integer->_class;
 
 	if (!int_class->signedness) {
 		uint64_t v;
 
 		v = fsrc->uint_read(src, int_class);
-		return fdest->uint_write(dest, int_class, v);
+		fdest->uint_write(dest, int_class, v);
 	} else {
 		int64_t v;
 
 		v = fsrc->int_read(src, int_class);
-		return fdest->int_write(dest, int_class, v);
+		fdest->int_write(dest, int_class, v);
 	}
 }
 
-void integer_type_free(struct type_class_integer *int_class)
+static
+void _integer_type_class_free(struct type_class *type_class)
 {
-	g_free(int_class);
-}
-
-static void _integer_type_free(struct type_class *type_class)
-{
-	struct type_class_integer *int_class =
+	struct type_class_integer *integer_class =
 		container_of(type_class, struct type_class_integer, p);
-	integer_type_free(int_class);
+	g_free(integer_class);
 }
 
-struct type_class_integer *integer_type_new(const char *name,
-					    size_t len, int byte_order,
-					    int signedness,
-					    size_t alignment)
+struct type_class_integer *
+integer_type_class_new(const char *name, size_t len, int byte_order,
+		       int signedness, size_t alignment)
 {
 	struct type_class_integer *int_class;
 	int ret;
@@ -67,12 +67,15 @@ struct type_class_integer *integer_type_new(const char *name,
 	int_class->p.name = g_quark_from_string(name);
 	int_class->p.alignment = alignment;
 	int_class->p.copy = integer_copy;
-	int_class->p.free = _integer_type_free;
+	int_class->p.class_free = _integer_type_class_free;
+	int_class->p.type_free = _integer_type_free;
+	int_class->p.type_new = _integer_type_new;
+	int_class->p.ref = 1;
 	int_class->len = len;
 	int_class->byte_order = byte_order;
 	int_class->signedness = signedness;
 	if (int_class->p.name) {
-		ret = ctf_register_type(&int_class->p);
+		ret = register_type(&int_class->p);
 		if (ret) {
 			g_free(int_class);
 			return NULL;
@@ -80,3 +83,29 @@ struct type_class_integer *integer_type_new(const char *name,
 	}
 	return int_class;
 }
+
+static
+struct type_integer *_integer_type_new(struct type_class *type_class,
+				       struct declaration_scope *parent_scope)
+{
+	struct type_class_integer *integer_class =
+		container_of(type_class, struct type_class_integer, p);
+	struct type_integer *integer;
+
+	integer = g_new(struct type_integer, 1);
+	type_class_ref(&integer_class->p);
+	integer->p._class = integer_class;
+	integer->p.ref = 1;
+	integer->value._unsigned = 0;
+	return &integer->p;
+}
+
+static
+void _integer_type_free(struct type *type)
+{
+	struct type_integer *integer =
+		container_of(type, struct type_integer, p);
+
+	type_class_unref(integer->p._class);
+	g_free(integer);
+}