From: Julien Desfossez <julien.desfossez@efficios.com>
Date: Fri, 30 Mar 2012 19:49:01 +0000 (-0400)
Subject: add ctf_event_definition pointer to ctf_stream_definition
X-Git-Tag: v1.0.0-rc1~17
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=d3ded99df05c7602749aa50530a1dc69db4cc066;ds=sidebyside

add ctf_event_definition pointer to ctf_stream_definition

also remove two unnecessary forward declarations of
ctf_stream_definition.

Signed-off-by: Julien Desfossez <julien.desfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index c2a1e17d..65b4cf76 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -926,6 +926,7 @@ struct ctf_event_definition *create_event_definitions(struct ctf_trace *td,
 					struct definition_struct, p);
 		stream->parent_def_scope = stream_event->event_fields->p.scope;
 	}
+	stream_event->stream = stream;
 	return stream_event;
 
 error:
diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index bd5288a7..7f2b06d6 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -30,9 +30,7 @@
 
 struct ctf_trace;
 struct ctf_stream_declaration;
-struct ctf_stream_definition;
 struct ctf_event_declaration;
-struct ctf_stream_definition;
 struct ctf_clock;
 
 struct ctf_stream_definition {
@@ -60,6 +58,7 @@ struct ctf_stream_definition {
 };
 
 struct ctf_event_definition {
+	struct ctf_stream_definition *stream;
 	struct definition_struct *event_context;
 	struct definition_struct *event_fields;
 };