Fix: get rid of consumed flag

[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 bd5288a7088e079e47fc8ae01632350ccdcbd7a1..124eb7daefe4ede4e03d3f1de2b106cbc640277e 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_declaration;
-struct ctf_stream_definition;
 struct ctf_clock;
 
 struct ctf_stream_definition {
@@ -41,7 +39,6 @@ struct ctf_stream_definition {
        uint64_t event_id;                      /* Current event ID */
        int has_timestamp;
        uint64_t stream_id;
-       int consumed;                           /* Last packet used by caller */
 
        struct definition_struct *trace_packet_header;
        struct definition_struct *stream_packet_context;
@@ -54,12 +51,13 @@ struct ctf_stream_definition {
        struct ctf_clock *current_clock;
 
        /* Event discarded information */
-       uint32_t events_discarded;
-       uint64_t prev_timestamp;        /* Last event */
-       uint64_t prev_timestamp_end;    /* End-of-packet timestamp */
+       uint64_t events_discarded;
+       uint64_t prev_timestamp;        /* Start-of-last-packet timestamp */
+       uint64_t prev_timestamp_end;    /* End-of-last-packet timestamp */
 };
 
 struct ctf_event_definition {
+       struct ctf_stream_definition *stream;
        struct definition_struct *event_context;
        struct definition_struct *event_fields;
 };
@@ -141,6 +139,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;