Move bt_handle to bt_trace_descriptor

[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 91df0362de445d9bd50bff82c08d1d2a9abb3694..4fa5c0bee03548e9f453787edceff9d4bdbb1dc5 100644 (file)
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -29,6 +29,7 @@
 
 #include <babeltrace/types.h>
 #include <babeltrace/format.h>
+#include <babeltrace/format-internal.h>
 #include <babeltrace/ctf/types.h>
 #include <sys/types.h>
 #include <dirent.h>
@@ -176,6 +177,7 @@ struct ctf_tracer_env {
 
 struct ctf_trace {
        struct bt_trace_descriptor parent;
+
        /* root scope */
        struct declaration_scope *root_declaration_scope;
 
@@ -184,6 +186,8 @@ struct ctf_trace {
        struct definition_scope *definition_scope;
        GPtrArray *streams;                     /* Array of struct ctf_stream_declaration pointers */
        struct ctf_stream_definition *metadata;
+       char *metadata_string;
+       int metadata_packetized;
        GHashTable *clocks;
        GHashTable *callsites;
        struct ctf_clock *single_clock;         /* currently supports only one clock */
@@ -213,10 +217,6 @@ struct ctf_trace {
 
        /* Heap of streams, ordered to always get the lowest timestamp */
        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)                                \