add ctf_event_definition pointer to ctf_stream_definition

[babeltrace.git] / formats / ctf / ctf.c

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 494ba990b09a835b51c107e2797c4621e91ace79..65b4cf7643518b3b4362c8c314a0c43803bec837 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -125,7 +125,7 @@ struct format ctf_format = {
  * Update stream current timestamp, keep at clock frequency.
  */
 static
-void ctf_update_timestamp(struct ctf_stream *stream,
+void ctf_update_timestamp(struct ctf_stream_definition *stream,
                          struct definition_integer *integer_definition)
 {
        struct declaration_integer *integer_declaration =
@@ -156,7 +156,7 @@ void ctf_update_timestamp(struct ctf_stream *stream,
  * applying offsets as needed (unix time).
  */
 void ctf_print_timestamp(FILE *fp,
-                       struct ctf_stream *stream,
+                       struct ctf_stream_definition *stream,
                        uint64_t timestamp)
 {
        uint64_t ts_sec = 0, ts_nsec;
@@ -221,12 +221,12 @@ end:
 }
 
 static
-int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
+int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream)
 {
        struct ctf_stream_pos *pos =
                container_of(ppos, struct ctf_stream_pos, parent);
        struct ctf_stream_declaration *stream_class = stream->stream_class;
-       struct ctf_stream_event *event;
+       struct ctf_event_definition *event;
        uint64_t id = 0;
        int ret;
 
@@ -335,10 +335,10 @@ error:
 }
 
 static
-int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
+int ctf_write_event(struct stream_pos *pos, struct ctf_stream_definition *stream)
 {
        struct ctf_stream_declaration *stream_class = stream->stream_class;
-       struct ctf_stream_event *event;
+       struct ctf_event_definition *event;
        uint64_t id;
        int ret;
 
@@ -898,11 +898,11 @@ end_stream:
 }
 
 static
-struct ctf_stream_event *create_event_definitions(struct ctf_trace *td,
-                                                 struct ctf_stream *stream,
-                                                 struct ctf_event *event)
+struct ctf_event_definition *create_event_definitions(struct ctf_trace *td,
+                                                 struct ctf_stream_definition *stream,
+                                                 struct ctf_event_declaration *event)
 {
-       struct ctf_stream_event *stream_event = g_new0(struct ctf_stream_event, 1);
+       struct ctf_event_definition *stream_event = g_new0(struct ctf_event_definition, 1);
 
        if (event->context_decl) {
                struct definition *definition =
@@ -926,6 +926,7 @@ struct ctf_stream_event *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:
@@ -937,7 +938,7 @@ error:
 }
 
 static
-int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream)
+int create_stream_definitions(struct ctf_trace *td, struct ctf_stream_definition *stream)
 {
        struct ctf_stream_declaration *stream_class;
        int ret;
@@ -987,8 +988,8 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream)
        stream->events_by_id = g_ptr_array_new();
        g_ptr_array_set_size(stream->events_by_id, stream_class->events_by_id->len);
        for (i = 0; i < stream->events_by_id->len; i++) {
-               struct ctf_event *event = g_ptr_array_index(stream_class->events_by_id, i);
-               struct ctf_stream_event *stream_event;
+               struct ctf_event_declaration *event = g_ptr_array_index(stream_class->events_by_id, i);
+               struct ctf_event_definition *stream_event;
 
                if (!event)
                        continue;
@@ -1001,7 +1002,7 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream)
 
 error_event:
        for (i = 0; i < stream->events_by_id->len; i++) {
-               struct ctf_stream_event *stream_event = g_ptr_array_index(stream->events_by_id, i);
+               struct ctf_event_definition *stream_event = g_ptr_array_index(stream->events_by_id, i);
                if (stream_event)
                        g_free(stream_event);
        }
@@ -1236,7 +1237,7 @@ int create_stream_packet_index(struct ctf_trace *td,
 }
 
 static
-int create_trace_definitions(struct ctf_trace *td, struct ctf_stream *stream)
+int create_trace_definitions(struct ctf_trace *td, struct ctf_stream_definition *stream)
 {
        int ret;