X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=85b0f2d5ef8637ff8a25d5efe50dcaa5b8f7719d;hp=7f2b06d6f75ebee5af0cad2f65ff7467174b4367;hb=03798a93f959f6c694fe98f5647481947607c604;hpb=d3ded99df05c7602749aa50530a1dc69db4cc066

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 7f2b06d6..85b0f2d5 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -35,11 +35,11 @@ struct ctf_clock;
 
 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;
@@ -52,9 +52,11 @@ 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_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 {
@@ -140,6 +142,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;