Fix missing uuid wrapper change

[babeltrace.git] / include / babeltrace / ctf-ir / metadata.h

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index d445a011c0bc2740a337e721b2e1873a190515d6..593be445cafd8b455f23ac64a84ed3215104010f 100644 (file)
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -24,7 +24,7 @@
 #include <babeltrace/ctf/types.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <uuid/uuid.h>
+#include <babeltrace/uuid.h>
 #include <assert.h>
 #include <glib.h>
 
@@ -32,6 +32,8 @@ struct ctf_trace;
 struct ctf_stream_class;
 struct ctf_stream;
 struct ctf_event;
+struct ctf_stream;
+struct ctf_clock;
 
 struct ctf_stream {
        struct ctf_stream_class *stream_class;
@@ -39,6 +41,7 @@ struct ctf_stream {
        uint64_t event_id;                      /* Current event ID */
        int has_timestamp;
        uint64_t stream_id;
+       int consumed;                           /* Last packet used by caller */
 
        struct definition_struct *trace_packet_header;
        struct definition_struct *stream_packet_context;
@@ -48,6 +51,8 @@ struct ctf_stream {
        struct definition_scope *parent_def_scope;      /* for initialization */
        int stream_definitions_created;
 
+       struct ctf_clock *current_clock;
+
        /* Event discarded information */
        uint32_t events_discarded;
        uint64_t prev_timestamp;        /* Last event */
@@ -91,6 +96,7 @@ struct ctf_clock {
 
        enum {                                  /* Fields populated mask */
                CTF_CLOCK_name          =       (1U << 0),
+               CTF_CLOCK_freq          =       (1U << 1),
        } field_mask;
 };
 
@@ -133,13 +139,14 @@ struct ctf_trace {
        GPtrArray *streams;                     /* Array of struct ctf_stream_class pointers */
        struct ctf_stream *metadata;
        GHashTable *clocks;
+       struct ctf_clock *single_clock;         /* currently supports only one clock */
        struct trace_collection *collection;    /* Container of this trace */
 
        struct declaration_struct *packet_header_decl;
 
        uint64_t major;
        uint64_t minor;
-       uuid_t uuid;
+       unsigned char * uuid;
        int byte_order;         /* trace BYTE_ORDER. 0 if unset. */
        struct ctf_tracer_env env;