X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fstream-internal.h;h=7461d321f0fe34c85c67a9898dd04fd29a25da8a;hb=5fd2e9fda6185e989583e6e61b9312683149747e;hp=afbb9ff51bea6ff68168f12fde1f7b3555e5d8fe;hpb=bc37ae52aa6face901440bf7eb2171104b5343d8;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/stream-internal.h b/include/babeltrace/ctf-ir/stream-internal.h
index afbb9ff5..7461d321 100644
--- 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>
@@ -36,32 +36,25 @@
 #include <babeltrace/ctf/types.h>
 #include <glib.h>
 
-typedef void(*flush_func)(struct bt_ctf_stream *, void *);
-
-struct flush_callback {
-	flush_func func;
-	void *data;
-};
-
 struct bt_ctf_stream {
-	struct bt_ctf_ref ref_count;
+	struct bt_object base;
 	uint32_t id;
 	struct bt_ctf_stream_class *stream_class;
-	struct flush_callback flush;
 	/* Array of pointers to bt_ctf_event for the current packet */
 	GPtrArray *events;
 	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 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);
-
-BT_HIDDEN
-int bt_ctf_stream_set_flush_callback(struct bt_ctf_stream *stream,
-		flush_func callback, void *data);
+		struct bt_ctf_stream_class *stream_class,
+		struct bt_ctf_trace *trace);
 
 BT_HIDDEN
 int bt_ctf_stream_set_fd(struct bt_ctf_stream *stream, int fd);