X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Fmetadata.h;fp=include%2Fbabeltrace%2Fctf%2Fmetadata.h;h=56b0aa22e6f913466de2422a6e65ba45db35caef;hp=453c9f7085276de0b4ba5eb6798b475f5d6d7363;hb=e28d4618a97ed5c6da7cda25af9d1121808664cf;hpb=557255e5f0e500f06bd014021a361ee374dab2e7

diff --git a/include/babeltrace/ctf/metadata.h b/include/babeltrace/ctf/metadata.h
index 453c9f70..56b0aa22 100644
--- a/include/babeltrace/ctf/metadata.h
+++ b/include/babeltrace/ctf/metadata.h
@@ -39,6 +39,19 @@ struct ctf_event;
 struct ctf_stream {
 	struct ctf_stream_class *stream_class;
 	uint64_t timestamp;			/* Current timestamp, in ns */
+
+	struct definition_struct *trace_packet_header;
+	struct definition_struct *stream_packet_context;
+	struct definition_struct *stream_event_header;
+	struct definition_struct *stream_event_context;
+	GPtrArray *events_by_id;		/* Array of struct ctf_file_event pointers indexed by id */
+	struct definition_scope *parent_def_scope;	/* for initialization */
+	int stream_definitions_created;
+};
+
+struct ctf_file_event {
+	struct definition_struct *event_context;
+	struct definition_struct *event_fields;
 };
 
 struct ctf_file_stream {
@@ -76,9 +89,6 @@ struct ctf_trace {
 	/* Declarations only used when parsing */
 	struct declaration_struct *packet_header_decl;
 
-	/* Definitions used afterward */
-	struct definition_struct *packet_header;
-
 	uint64_t major;
 	uint64_t minor;
 	uuid_t uuid;
@@ -129,11 +139,6 @@ struct ctf_stream_class {
 	struct declaration_struct *event_header_decl;
 	struct declaration_struct *event_context_decl;
 
-	/* Definitions used afterward */
-	struct definition_struct *packet_context;
-	struct definition_struct *event_header;
-	struct definition_struct *event_context;
-
 	uint64_t stream_id;
 
 	enum {					/* Fields populated mask */
@@ -167,10 +172,6 @@ struct ctf_event {
 	struct declaration_struct *context_decl;
 	struct declaration_struct *fields_decl;
 
-	/* Definitions used afterward */
-	struct definition_struct *context;
-	struct definition_struct *fields;
-
 	GQuark name;
 	uint64_t id;		/* Numeric identifier within the stream */
 	uint64_t stream_id;