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 75697396a2c2d1d437c8595f234d1fda64bbe029..c18749f708906b84f6b01dde9f193d38322edec5 100644 (file)
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -30,12 +30,10 @@
 
 struct ctf_trace;
 struct ctf_stream_declaration;
-struct ctf_stream;
-struct ctf_event;
-struct ctf_stream;
+struct ctf_event_declaration;
 struct ctf_clock;
 
-struct ctf_stream {
+struct ctf_stream_definition {
        struct ctf_stream_declaration *stream_class;
        uint64_t timestamp;                     /* Current timestamp, in ns */
        uint64_t event_id;                      /* Current event ID */
@@ -47,7 +45,7 @@ struct ctf_stream {
        struct definition_struct *stream_packet_context;
        struct definition_struct *stream_event_header;
        struct definition_struct *stream_event_context;
-       GPtrArray *events_by_id;                /* Array of struct ctf_stream_event pointers indexed by id */
+       GPtrArray *events_by_id;                /* Array of struct ctf_event_definition pointers indexed by id */
        struct definition_scope *parent_def_scope;      /* for initialization */
        int stream_definitions_created;
 
@@ -59,7 +57,8 @@ struct ctf_stream {
        uint64_t prev_timestamp_end;    /* End-of-packet timestamp */
 };
 
-struct ctf_stream_event {
+struct ctf_event_definition {
+       struct ctf_stream_definition *stream;
        struct definition_struct *event_context;
        struct definition_struct *event_fields;
 };
@@ -137,10 +136,11 @@ struct ctf_trace {
        /* innermost definition scope. to be used as parent of stream. */
        struct definition_scope *definition_scope;
        GPtrArray *streams;                     /* Array of struct ctf_stream_declaration pointers */
-       struct ctf_stream *metadata;
+       struct ctf_stream_definition *metadata;
        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;
@@ -204,7 +204,7 @@ struct ctf_stream_declaration {
                CTF_STREAM_stream_id =  (1 << 0),
        } field_mask;
 
-       GPtrArray *streams;     /* Array of struct ctf_stream pointers */
+       GPtrArray *streams;     /* Array of struct ctf_stream_definition pointers */
 };
 
 #define CTF_EVENT_SET_FIELD(ctf_event, field)                          \
@@ -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 */