Move clock 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 bc00015130b6ec0bdd57e938f3f63d9595051ea3..3d684fb661db86759b0080328bfe18597c5c660b 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>
@@ -66,6 +67,7 @@ struct ctf_stream_definition {
        uint64_t prev_real_timestamp_end;       /* End-of-last-packet timestamp in ns */
        uint64_t prev_cycles_timestamp;         /* Start-of-last-packet timestamp in cycles */
        uint64_t prev_cycles_timestamp_end;     /* End-of-last-packet timestamp in cycles */
+       char path[PATH_MAX];                    /* Path to stream. '\0' for mmap traces */
 };
 
 struct ctf_event_definition {
@@ -175,6 +177,7 @@ struct ctf_tracer_env {
 
 struct ctf_trace {
        struct bt_trace_descriptor parent;
+
        /* root scope */
        struct declaration_scope *root_declaration_scope;
 
@@ -183,10 +186,9 @@ struct ctf_trace {
        struct definition_scope *definition_scope;
        GPtrArray *streams;                     /* Array of struct ctf_stream_declaration pointers */
        struct ctf_stream_definition *metadata;
-       GHashTable *clocks;
+       char *metadata_string;
+       int metadata_packetized;
        GHashTable *callsites;
-       struct ctf_clock *single_clock;         /* currently supports only one clock */
-       struct trace_collection *collection;    /* Container of this trace */
        GPtrArray *event_declarations;          /* Array of all the struct bt_ctf_event_decl */
 
        struct declaration_struct *packet_header_decl;
@@ -209,13 +211,6 @@ struct ctf_trace {
        DIR *dir;
        int dirfd;
        int flags;              /* open flags */
-
-       /* 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)                                \