ir: move the stream event ctx field to the event

[babeltrace.git] / include / babeltrace / ctf-ir / stream-internal.h

diff --git a/include/babeltrace/ctf-ir/stream-internal.h b/include/babeltrace/ctf-ir/stream-internal.h
index db5eeaf6896bcffaa67cf5d0425dfdaad83bf961..7461d321f0fe34c85c67a9898dd04fd29a25da8a 100644 (file)
--- a/include/babeltrace/ctf-ir/stream-internal.h
+++ b/include/babeltrace/ctf-ir/stream-internal.h
@@ -28,7 +28,7 @@
  */
 
 #include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-writer/ref-internal.h>
+#include <babeltrace/object-internal.h>
 #include <babeltrace/ctf-writer/clock.h>
 #include <babeltrace/ctf-writer/event-fields.h>
 #include <babeltrace/ctf-writer/event-types.h>
@@ -37,23 +37,20 @@
 #include <glib.h>
 
 struct bt_ctf_stream {
-       struct bt_ctf_ref ref_count;
-       /* Trace owning this stream. A stream does not own a trace. */
-       struct bt_ctf_trace *trace;
+       struct bt_object base;
        uint32_t id;
        struct bt_ctf_stream_class *stream_class;
        /* Array of pointers to bt_ctf_event for the current packet */
        GPtrArray *events;
-       /* Array of pointers to bt_ctf_field associated with each event*/
-       GPtrArray *event_contexts;
        struct ctf_stream_pos pos;
        unsigned int flushed_packet_count;
        struct bt_ctf_field *packet_header;
        struct bt_ctf_field *packet_context;
+       struct bt_ctf_field *event_header;
        struct bt_ctf_field *event_context;
 };
 
-/* Stream class should be locked by the caller after creating a stream */
+/* Stream class should be frozen by the caller after creating a stream */
 BT_HIDDEN
 struct bt_ctf_stream *bt_ctf_stream_create(
                struct bt_ctf_stream_class *stream_class,