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 e9ab83dde971faf91dd330ec437a9ebba4f01ba2..de1a70d101b921975a5f10fb23b183ff9e558adb 100644 (file)
--- a/include/babeltrace/ctf/metadata.h
+++ b/include/babeltrace/ctf/metadata.h
@@ -20,17 +20,28 @@
  */
 
 #include <babeltrace/types.h>
+#include <babeltrace/format.h>
+#include <babeltrace/ctf/types.h>
+#include <sys/types.h>
+#include <dirent.h>
 #include <uuid/uuid.h>
 #include <assert.h>
 #include <glib.h>
 
+#define CTF_MAGIC      0xC1FC1FC1
+
 struct ctf_trace;
-struct ctf_stream;
+struct ctf_stream_class;
 struct ctf_event;
 
-#define CTF_TRACE_SET_FIELD(ctf_trace, field, value)                   \
+struct ctf_file_stream {
+       uint64_t stream_id;
+       struct ctf_stream_class *stream;
+       struct ctf_stream_pos pos;      /* current stream position */
+};
+
+#define CTF_TRACE_SET_FIELD(ctf_trace, field)                          \
        do {                                                            \
-               (ctf_trace)->(field) = (value);                         \
                (ctf_trace)->field_mask |= CTF_TRACE_ ## field;         \
        } while (0)
 
@@ -45,31 +56,43 @@ struct ctf_event;
 
 
 struct ctf_trace {
-       /* root scope */
-       struct type_scope *root_type_scope;
+       struct trace_descriptor parent;
        /* root scope */
        struct declaration_scope *root_declaration_scope;
 
-       struct type_scope *type_scope;
        struct declaration_scope *declaration_scope;
-       GPtrArray *streams;                     /* Array of struct ctf_stream pointers*/
+       /* innermost definition scope. to be used as parent of stream. */
+       struct definition_scope *definition_scope;
+       GPtrArray *streams;                     /* Array of struct ctf_stream_class pointers */
+       struct ctf_file_stream metadata;
+
+       /* Declarations only used when parsing */
+       struct declaration_struct *packet_header_decl;
+
+       /* Definitions used afterward */
+       struct definition_struct *packet_header;
 
        uint64_t major;
        uint64_t minor;
        uuid_t uuid;
-       uint64_t word_size;
+       int byte_order;         /* trace BYTE_ORDER. 0 if unset. */
 
        enum {                                  /* Fields populated mask */
-               CTF_TRACE_major =       (1U << 0),
-               CTF_TRACE_minor =       (1U << 1),
-               CTF_TRACE_uuid  =       (1U << 2),
-               CTF_TRACE_word_size =   (1U << 3),
+               CTF_TRACE_major         =       (1U << 0),
+               CTF_TRACE_minor         =       (1U << 1),
+               CTF_TRACE_uuid          =       (1U << 2),
+               CTF_TRACE_byte_order    =       (1U << 3),
+               CTF_TRACE_packet_header =       (1U << 4),
        } field_mask;
+
+       /* Information about trace backing directory and files */
+       DIR *dir;
+       int dirfd;
+       int flags;              /* open flags */
 };
 
-#define CTF_STREAM_SET_FIELD(ctf_stream, field, value)                 \
+#define CTF_STREAM_SET_FIELD(ctf_stream, field)                                \
        do {                                                            \
-               (ctf_stream)->(field) = (value);                        \
                (ctf_stream)->field_mask |= CTF_STREAM_ ## field;       \
        } while (0)
 
@@ -82,24 +105,32 @@ 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 type_scope *type_scope;
-       /* parent is trace scope */
        struct declaration_scope *declaration_scope;
+       /* innermost definition scope. to be used as parent of event. */
+       struct definition_scope *definition_scope;
        GPtrArray *events_by_id;                /* Array of struct ctf_event pointers indexed by id */
        GHashTable *event_quark_to_id;          /* GQuark to numeric id */
 
-       struct declaration_struct *event_header;
-       struct declaration_struct *event_context;
-       struct declaration_struct *packet_context;
+       /* Declarations only used when parsing */
+       struct declaration_struct *packet_context_decl;
+       struct declaration_struct *event_header_decl;
+       struct declaration_struct *event_context_decl;
+
+       /* Definitions used afterward */
+       struct definition_struct *packet_context;
+       struct definition_struct *event_header;
+       struct definition_struct *event_context;
 
        uint64_t stream_id;
 
        enum {                                  /* Fields populated mask */
                CTF_STREAM_stream_id =  (1 << 0),
        } field_mask;
+
+       GPtrArray *files;                       /* Array of struct ctf_file_stream pointers */
 };
 
 #define CTF_EVENT_SET_FIELD(ctf_event, field)                          \
@@ -118,13 +149,17 @@ 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 type_scope *type_scope;
-       /* parent is stream scope */
        struct declaration_scope *declaration_scope;
-       struct declaration_struct *context;
-       struct declaration_struct *fields;
+
+       /* Declarations only used when parsing */
+       struct declaration_struct *context_decl;
+       struct declaration_struct *fields_decl;
+
+       /* Definitions used afterward */
+       struct definition_struct *context;
+       struct definition_struct *fields;
 
        GQuark name;
        uint64_t id;            /* Numeric identifier within the stream */