Dynamic definition scope hierarchy

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

diff --git a/include/babeltrace/ctf/metadata.h b/include/babeltrace/ctf/metadata.h
index 85ff1cb8145922ec31ef59443907218114de5a02..a60f17763c239e4bac7023d51c8d436b622542ce 100644 (file)
--- a/include/babeltrace/ctf/metadata.h
+++ b/include/babeltrace/ctf/metadata.h
@@ -91,9 +91,15 @@ struct ctf_stream {
        GPtrArray *events_by_id;                /* Array of struct ctf_event pointers indexed by id */
        GHashTable *event_quark_to_id;          /* GQuark to numeric id */
 
        GPtrArray *events_by_id;                /* Array of struct ctf_event pointers indexed by id */
        GHashTable *event_quark_to_id;          /* GQuark to numeric id */
 

+       /* 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;
        struct definition_struct *event_header;
        struct definition_struct *event_context;

-       struct definition_struct *packet_context;

 
        uint64_t stream_id;
 
 
        uint64_t stream_id;
 


@@ -123,6 +129,12 @@ struct ctf_event {
        struct declaration_scope *declaration_scope;
        /* parent is stream scope */
        struct definition_scope *definition_scope;
        struct declaration_scope *declaration_scope;
        /* parent is stream scope */
        struct definition_scope *definition_scope;

+
+       /* 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;
 
        struct definition_struct *context;
        struct definition_struct *fields;