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 c2a1e17d03a3c513850c8ca4baf5fc13c97c862b..65b4cf7643518b3b4362c8c314a0c43803bec837 100644 (file)
--- 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;
        }
                                        struct definition_struct, p);
                stream->parent_def_scope = stream_event->event_fields->p.scope;
        }

+       stream_event->stream = stream;

        return stream_event;
 
 error:
        return stream_event;
 
 error:

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index bd5288a7088e079e47fc8ae01632350ccdcbd7a1..7f2b06d6f75ebee5af0cad2f65ff7467174b4367 100644 (file)
--- 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_trace;
 struct ctf_stream_declaration;

-struct ctf_stream_definition;

 struct ctf_event_declaration;
 struct ctf_event_declaration;

-struct ctf_stream_definition;

 struct ctf_clock;
 
 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_event_definition {

+       struct ctf_stream_definition *stream;

        struct definition_struct *event_context;
        struct definition_struct *event_fields;
 };
        struct definition_struct *event_context;
        struct definition_struct *event_fields;
 };