API : list of events in the trace

[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 fb78439b5491e0c2d907775899fa5ebea253f5ec..c18749f708906b84f6b01dde9f193d38322edec5 100644 (file)
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -30,9 +30,7 @@
 
 struct ctf_trace;
 struct ctf_stream_declaration;
-struct ctf_stream_definition;
-struct ctf_event;
-struct ctf_stream_definition;
+struct ctf_event_declaration;
 struct ctf_clock;
 
 struct ctf_stream_definition {
@@ -60,6 +58,7 @@ struct ctf_stream_definition {
 };
 
 struct ctf_event_definition {
+       struct ctf_stream_definition *stream;
        struct definition_struct *event_context;
        struct definition_struct *event_fields;
 };
@@ -141,6 +140,7 @@ struct ctf_trace {
        GHashTable *clocks;
        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;
 
@@ -191,7 +191,7 @@ struct ctf_stream_declaration {
        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 */
+       GPtrArray *events_by_id;                /* Array of struct ctf_event_declaration pointers indexed by id */
        GHashTable *event_quark_to_id;          /* GQuark to numeric id */
 
        struct declaration_struct *packet_context_decl;
@@ -221,7 +221,7 @@ struct ctf_stream_declaration {
                (ctf_event)->(field);                                   \
        })
 
-struct ctf_event {
+struct ctf_event_declaration {
        /* stream mapped by stream_id */
        struct ctf_stream_declaration *stream;
        /* parent is lexical scope conaining the event scope */