X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Fmetadata.h;h=a60f17763c239e4bac7023d51c8d436b622542ce;hp=e9ab83dde971faf91dd330ec437a9ebba4f01ba2;hb=9e29e16ee50d03cf4fdc0cea0220832323939dc3;hpb=05628561ca57ff5d269571a72a12cb86854c5f70

diff --git a/include/babeltrace/ctf/metadata.h b/include/babeltrace/ctf/metadata.h
index e9ab83dd..a60f1776 100644
--- a/include/babeltrace/ctf/metadata.h
+++ b/include/babeltrace/ctf/metadata.h
@@ -45,13 +45,13 @@ struct ctf_event;
 
 
 struct ctf_trace {
-	/* root scope */
-	struct type_scope *root_type_scope;
 	/* root scope */
 	struct declaration_scope *root_declaration_scope;
+	/* root scope */
+	struct definition_scope *root_definition_scope;
 
-	struct type_scope *type_scope;
 	struct declaration_scope *declaration_scope;
+	struct definition_scope *definition_scope;
 	GPtrArray *streams;			/* Array of struct ctf_stream pointers*/
 
 	uint64_t major;
@@ -85,15 +85,21 @@ struct ctf_trace {
 struct ctf_stream {
 	struct ctf_trace *trace;
 	/* parent is lexical scope conaining the stream scope */
-	struct type_scope *type_scope;
-	/* parent is trace scope */
 	struct declaration_scope *declaration_scope;
+	/* parent is trace scope */
+	struct definition_scope *definition_scope;
 	GPtrArray *events_by_id;		/* Array of struct ctf_event pointers indexed by id */
 	GHashTable *event_quark_to_id;		/* GQuark to numeric id */
 
-	struct declaration_struct *event_header;
-	struct declaration_struct *event_context;
-	struct declaration_struct *packet_context;
+	/* Declarations only used when parsing */
+	struct declaration_struct *packet_context_decl;
+	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;
 
@@ -120,11 +126,17 @@ struct ctf_event {
 	/* stream mapped by stream_id */
 	struct ctf_stream *stream;
 	/* parent is lexical scope conaining the event scope */
-	struct type_scope *type_scope;
-	/* parent is stream scope */
 	struct declaration_scope *declaration_scope;
-	struct declaration_struct *context;
-	struct declaration_struct *fields;
+	/* parent is stream scope */
+	struct definition_scope *definition_scope;
+
+	/* Declarations only used when parsing */
+	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 */