Cleanup: Remove unneeded local variables from function

[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 79af77a768c0dda06e02023ba25850a8bde41dac..024b50f1c4daed84e7d0cfe3c06822488dd365c3 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>
 
@@ -41,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;
@@ -95,6 +96,7 @@ struct ctf_clock {
 
        enum {                                  /* Fields populated mask */
                CTF_CLOCK_name          =       (1U << 0),
+               CTF_CLOCK_freq          =       (1U << 1),
        } field_mask;
 };
 
@@ -144,7 +146,7 @@ struct ctf_trace {
 
        uint64_t major;
        uint64_t minor;
-       uuid_t uuid;
+       unsigned char uuid[BABELTRACE_UUID_LEN];
        int byte_order;         /* trace BYTE_ORDER. 0 if unset. */
        struct ctf_tracer_env env;
 
@@ -164,6 +166,9 @@ struct ctf_trace {
        /* Heap of streams, ordered to always get the lowest timestam */
        struct ptr_heap *stream_heap;
        char path[PATH_MAX];
+
+       struct bt_context *ctx;
+       struct bt_trace_handle *handle;
 };
 
 #define CTF_STREAM_SET_FIELD(ctf_stream, field)                                \