move struct ctf_stream -> struct ctf_stream_class

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

diff --git a/include/babeltrace/ctf/metadata.h b/include/babeltrace/ctf/metadata.h
index 330238ba0dc5f0a2e63c5d381c4aeda693fcdb9c..de1a70d101b921975a5f10fb23b183ff9e558adb 100644 (file)
--- a/include/babeltrace/ctf/metadata.h
+++ b/include/babeltrace/ctf/metadata.h
@@ -20,6 +20,7 @@
  */
 
 #include <babeltrace/types.h>
+#include <babeltrace/format.h>
 #include <babeltrace/ctf/types.h>
 #include <sys/types.h>
 #include <dirent.h>
@@ -30,13 +31,13 @@
 #define CTF_MAGIC      0xC1FC1FC1
 
 struct ctf_trace;
-struct ctf_stream;
+struct ctf_stream_class;
 struct ctf_event;
 
 struct ctf_file_stream {
        uint64_t stream_id;
-       struct ctf_stream *stream;
-       struct stream_pos pos;                  /* current stream position */
+       struct ctf_stream_class *stream;
+       struct ctf_stream_pos pos;      /* current stream position */
 };
 
 #define CTF_TRACE_SET_FIELD(ctf_trace, field)                          \
@@ -55,13 +56,14 @@ struct ctf_file_stream {
 
 
 struct ctf_trace {
+       struct trace_descriptor parent;
        /* root scope */
        struct declaration_scope *root_declaration_scope;
 
        struct declaration_scope *declaration_scope;
        /* innermost definition scope. to be used as parent of stream. */
        struct definition_scope *definition_scope;
-       GPtrArray *streams;                     /* Array of struct ctf_stream pointers */
+       GPtrArray *streams;                     /* Array of struct ctf_stream_class pointers */
        struct ctf_file_stream metadata;
 
        /* Declarations only used when parsing */
@@ -103,7 +105,7 @@ struct ctf_trace {
                (ctf_stream)->(field);                                  \
        })
 
-struct ctf_stream {
+struct ctf_stream_class {
        struct ctf_trace *trace;
        /* parent is lexical scope conaining the stream scope */
        struct declaration_scope *declaration_scope;
@@ -147,7 +149,7 @@ struct ctf_stream {
 
 struct ctf_event {
        /* stream mapped by stream_id */
-       struct ctf_stream *stream;
+       struct ctf_stream_class *stream;
        /* parent is lexical scope conaining the event scope */
        struct declaration_scope *declaration_scope;