Remove unneeded declaration "name", work in progress for gen io struct

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

diff --git a/include/babeltrace/ctf/metadata.h b/include/babeltrace/ctf/metadata.h
index e9ab83dde971faf91dd330ec437a9ebba4f01ba2..6c17b4102ad046424490d92e3534ec38841d648b 100644 (file)
--- a/include/babeltrace/ctf/metadata.h
+++ b/include/babeltrace/ctf/metadata.h
@@ -45,12 +45,9 @@ struct ctf_event;
 
 
 struct ctf_trace {
-       /* root scope */
-       struct type_scope *root_type_scope;
        /* 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*/
 
@@ -58,6 +55,7 @@ struct ctf_trace {
        uint64_t minor;
        uuid_t uuid;
        uint64_t word_size;
+       int byte_order;
 
        enum {                                  /* Fields populated mask */
                CTF_TRACE_major =       (1U << 0),
@@ -85,15 +83,21 @@ struct ctf_trace {
 struct ctf_stream {
        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;
 
@@ -120,11 +124,15 @@ struct ctf_event {
        /* stream mapped by stream_id */
        struct ctf_stream *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 */