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 */
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;
};
/* 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;
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;
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) \
(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 */