X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=212d8d489ce35f04562ff7e10ddfb26a09c95d31;hp=4f79c4ab8642516df07dbd707a200fae30f560b0;hb=50052405724a3b901b258c00beb424751c579217;hpb=d11e9c4975d88591e2324b6b11f426a22995833f

diff --git a/types/integer.c b/types/integer.c
index 4f79c4ab..212d8d48 100644
--- a/types/integer.c
+++ b/types/integer.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Integer Type Converter
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: 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
@@ -19,12 +21,14 @@
 #include <babeltrace/compiler.h>
 #include <babeltrace/align.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <stdint.h>
 
 static
 struct definition *_integer_definition_new(struct declaration *declaration,
 			       struct definition_scope *parent_scope,
-			       GQuark field_name, int index);
+			       GQuark field_name, int index,
+			       const char *root_name);
 static
 void _integer_definition_free(struct definition *definition);
 
@@ -38,7 +42,9 @@ void _integer_declaration_free(struct declaration *declaration)
 
 struct declaration_integer *
 	integer_declaration_new(size_t len, int byte_order,
-			 int signedness, size_t alignment)
+			 int signedness, size_t alignment, int base,
+			 enum ctf_string_encoding encoding,
+			 struct ctf_clock *clock)
 {
 	struct declaration_integer *integer_declaration;
 
@@ -52,6 +58,9 @@ struct declaration_integer *
 	integer_declaration->len = len;
 	integer_declaration->byte_order = byte_order;
 	integer_declaration->signedness = signedness;
+	integer_declaration->base = base;
+	integer_declaration->encoding = encoding;
+	integer_declaration->clock = clock;
 	return integer_declaration;
 }
 
@@ -59,19 +68,32 @@ static
 struct definition *
 	_integer_definition_new(struct declaration *declaration,
 				struct definition_scope *parent_scope,
-				GQuark field_name, int index)
+				GQuark field_name, int index,
+				const char *root_name)
 {
 	struct declaration_integer *integer_declaration =
 		container_of(declaration, struct declaration_integer, p);
 	struct definition_integer *integer;
+	int ret;
 
 	integer = g_new(struct definition_integer, 1);
 	declaration_ref(&integer_declaration->p);
 	integer->p.declaration = declaration;
 	integer->declaration = integer_declaration;
 	integer->p.ref = 1;
-	integer->p.index = index;
+	/*
+	 * Use INT_MAX order to ensure that all fields of the parent
+	 * scope are seen as being prior to this scope.
+	 */
+	integer->p.index = root_name ? INT_MAX : index;
+	integer->p.name = field_name;
+	integer->p.path = new_definition_path(parent_scope, field_name,
+					root_name);
+	integer->p.scope = NULL;
 	integer->value._unsigned = 0;
+	ret = register_field_definition(field_name, &integer->p,
+					parent_scope);
+	assert(!ret);
 	return &integer->p;
 }
 
@@ -84,3 +106,90 @@ void _integer_definition_free(struct definition *definition)
 	declaration_unref(integer->p.declaration);
 	g_free(integer);
 }
+
+enum ctf_string_encoding get_int_encoding(const struct definition *field)
+{
+	struct definition_integer *integer_definition;
+	const struct declaration_integer *integer_declaration;
+
+	integer_definition = container_of(field, struct definition_integer, p);
+	integer_declaration = integer_definition->declaration;
+
+	return integer_declaration->encoding;
+}
+
+int get_int_base(const struct definition *field)
+{
+	struct definition_integer *integer_definition;
+	const struct declaration_integer *integer_declaration;
+
+	integer_definition = container_of(field, struct definition_integer, p);
+	integer_declaration = integer_definition->declaration;
+
+	return integer_declaration->base;
+}
+
+size_t get_int_len(const struct definition *field)
+{
+	struct definition_integer *integer_definition;
+	const struct declaration_integer *integer_declaration;
+
+	integer_definition = container_of(field, struct definition_integer, p);
+	integer_declaration = integer_definition->declaration;
+
+	return integer_declaration->len;
+}
+
+int get_int_byte_order(const struct definition *field)
+{
+	struct definition_integer *integer_definition;
+	const struct declaration_integer *integer_declaration;
+
+	integer_definition = container_of(field, struct definition_integer, p);
+	integer_declaration = integer_definition->declaration;
+
+	return integer_declaration->byte_order;
+}
+
+int get_int_signedness(const struct definition *field)
+{
+	struct definition_integer *integer_definition;
+	const struct declaration_integer *integer_declaration;
+
+	integer_definition = container_of(field, struct definition_integer, p);
+	integer_declaration = integer_definition->declaration;
+
+	return integer_declaration->signedness;
+}
+
+uint64_t get_unsigned_int(const struct definition *field)
+{
+	struct definition_integer *integer_definition;
+	const struct declaration_integer *integer_declaration;
+
+	integer_definition = container_of(field, struct definition_integer, p);
+	integer_declaration = integer_definition->declaration;
+
+	if (!integer_declaration->signedness) {
+		return integer_definition->value._unsigned;
+	}
+	fprintf(stderr, "[warning] Extracting unsigned value from a signed int (%s)\n",
+		g_quark_to_string(field->name));
+	return (uint64_t)integer_definition->value._signed;
+}
+
+int64_t get_signed_int(const struct definition *field)
+{
+	struct definition_integer *integer_definition;
+	const struct declaration_integer *integer_declaration;
+
+	integer_definition = container_of(field, struct definition_integer, p);
+	integer_declaration = integer_definition->declaration;
+
+	if (integer_declaration->signedness) {
+		return integer_definition->value._signed;
+	}
+	fprintf(stderr, "[warning] Extracting signed value from an unsigned int (%s)\n", 
+		g_quark_to_string(field->name));
+	return (int64_t)integer_definition->value._unsigned;
+}