Get rid of clock-raw and use real clock

[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 f3e7b68ce01a817831b70d8b04bc13409a1a142f..85b0f2d5ef8637ff8a25d5efe50dcaa5b8f7719d 100644 (file)
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -30,18 +30,16 @@
 
 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 real_timestamp;                /* Current timestamp, in ns */
+       uint64_t cycles_timestamp;              /* Current timestamp, in cycles */
        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 +52,15 @@ struct ctf_stream {
        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_real_timestamp;           /* Start-of-last-packet timestamp in ns */
+       uint64_t prev_real_timestamp_end;       /* End-of-last-packet timestamp in ns */
+       uint64_t prev_cycles_timestamp;         /* Start-of-last-packet timestamp in cycles */
+       uint64_t prev_cycles_timestamp_end;     /* End-of-last-packet timestamp in cycles */
 };
 
 struct ctf_event_definition {
+       struct ctf_stream_definition *stream;
        struct definition_struct *event_context;
        struct definition_struct *event_fields;
 };
@@ -137,10 +138,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 +193,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 +206,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 +223,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 */