Merge branch 'master' of ssh://efficios.com/home/efficios/git/babeltrace

[babeltrace.git] / types / integer.c

diff --git a/types/integer.c b/types/integer.c
index 7b7d22c8d4b1b48ebe12ed6c80550c1c8fd222dd..e55c03e8a3cb353a96aff3019d700e573584f278 100644 (file)
--- 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
@@ -24,31 +26,11 @@
 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);
 
-void integer_copy(struct stream_pos *dest, const struct format *fdest, 
-                 struct stream_pos *src, const struct format *fsrc,
-                 struct definition *definition)
-{
-       struct definition_integer *integer =
-               container_of(definition, struct definition_integer, p);
-       struct declaration_integer *integer_declaration = integer->declaration;
-
-       if (!integer_declaration->signedness) {
-               uint64_t v;
-
-               v = fsrc->uint_read(src, integer_declaration);
-               fdest->uint_write(dest, integer_declaration, v);
-       } else {
-               int64_t v;
-
-               v = fsrc->int_read(src, integer_declaration);
-               fdest->int_write(dest, integer_declaration, v);
-       }
-}
-
 static
 void _integer_declaration_free(struct declaration *declaration)
 {
@@ -59,14 +41,14 @@ 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 declaration_integer *integer_declaration;
 
        integer_declaration = g_new(struct declaration_integer, 1);
        integer_declaration->p.id = CTF_TYPE_INTEGER;
        integer_declaration->p.alignment = alignment;
-       integer_declaration->p.copy = integer_copy;
        integer_declaration->p.declaration_free = _integer_declaration_free;
        integer_declaration->p.definition_free = _integer_definition_free;
        integer_declaration->p.definition_new = _integer_definition_new;
@@ -74,6 +56,8 @@ 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;
        return integer_declaration;
 }
 
@@ -81,19 +65,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;
 }