X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=b8835ec2d8b17bc29f99f35e48e17c3a6c9a2323;hb=de913cfdf87242ec3ff54c72a318ebb8714e5465;hp=bf83aee51f826e6dea28579b2e8a9da16566e232;hpb=661c4ce8ecca0a2a33c257cf26e47961728fe1c7;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index bf83aee5..b8835ec2 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -36,6 +36,8 @@ struct ctf_event;
 struct ctf_stream {
 	struct ctf_stream_class *stream_class;
 	uint64_t timestamp;			/* Current timestamp, in ns */
+	uint64_t event_id;			/* Current event ID */
+	int has_timestamp;
 	uint64_t stream_id;
 
 	struct definition_struct *trace_packet_header;
@@ -52,11 +54,6 @@ struct ctf_stream_event {
 	struct definition_struct *event_fields;
 };
 
-struct ctf_file_stream {
-	struct ctf_stream stream;
-	struct ctf_stream_pos pos;	/* current stream position */
-};
-
 #define CTF_TRACE_SET_FIELD(ctf_trace, field)				\
 	do {								\
 		(ctf_trace)->field_mask |= CTF_TRACE_ ## field;		\
@@ -81,9 +78,8 @@ 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_class pointers */
-	struct ctf_file_stream metadata;
+	struct ctf_stream *metadata;
 
-	/* Declarations only used when parsing */
 	struct declaration_struct *packet_header_decl;
 
 	uint64_t major;
@@ -131,7 +127,6 @@ struct ctf_stream_class {
 	GPtrArray *events_by_id;		/* Array of struct ctf_event pointers indexed by id */
 	GHashTable *event_quark_to_id;		/* GQuark to numeric id */
 
-	/* Declarations only used when parsing */
 	struct declaration_struct *packet_context_decl;
 	struct declaration_struct *event_header_decl;
 	struct declaration_struct *event_context_decl;
@@ -142,7 +137,7 @@ struct ctf_stream_class {
 		CTF_STREAM_stream_id =	(1 << 0),
 	} field_mask;
 
-	GPtrArray *files;			/* Array of struct ctf_file_stream pointers */
+	GPtrArray *streams;	/* Array of struct ctf_stream pointers */
 };
 
 #define CTF_EVENT_SET_FIELD(ctf_event, field)				\
@@ -165,7 +160,6 @@ struct ctf_event {
 	/* parent is lexical scope conaining the event scope */
 	struct declaration_scope *declaration_scope;
 
-	/* Declarations only used when parsing */
 	struct declaration_struct *context_decl;
 	struct declaration_struct *fields_decl;