Fix: --clock-force-correlate to handle trace collections gathered from various nodes

[babeltrace.git] / types / integer.c

diff --git a/types/integer.c b/types/integer.c
index 9e6df588f9764537a9969a0937274b941fa70aa8..212d8d489ce35f04562ff7e10ddfb26a09c95d31 100644 (file)
--- a/types/integer.c
+++ b/types/integer.c
@@ -21,6 +21,7 @@
 #include <babeltrace/compiler.h>
 #include <babeltrace/align.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <stdint.h>
 
 static
@@ -42,7 +43,8 @@ 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 base,
-                        enum ctf_string_encoding encoding)
+                        enum ctf_string_encoding encoding,
+                        struct ctf_clock *clock)
 {
        struct declaration_integer *integer_declaration;
 
@@ -58,6 +60,7 @@ struct declaration_integer *
        integer_declaration->signedness = signedness;
        integer_declaration->base = base;
        integer_declaration->encoding = encoding;
+       integer_declaration->clock = clock;
        return integer_declaration;
 }
 
@@ -104,7 +107,62 @@ void _integer_definition_free(struct definition *definition)
        g_free(integer);
 }
 
-uint64_t get_unsigned_int(struct definition *field)
+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;
@@ -115,11 +173,12 @@ uint64_t get_unsigned_int(struct definition *field)
        if (!integer_declaration->signedness) {
                return integer_definition->value._unsigned;
        }
-       fprintf(stderr, "[warning] Extracting unsigned value in a signed int\n");
+       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(struct definition *field)
+int64_t get_signed_int(const struct definition *field)
 {
        struct definition_integer *integer_definition;
        const struct declaration_integer *integer_declaration;
@@ -130,6 +189,7 @@ int64_t get_signed_int(struct definition *field)
        if (integer_declaration->signedness) {
                return integer_definition->value._signed;
        }
-       fprintf(stderr, "[warning] Extracting signed value in an unsigned int\n");
+       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;
 }