lib: remove internal stream destroy listener API

[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..87f3c848f7f1e7225dd5361071654ceaa895f308 100644 (file)
--- a/include/babeltrace/ctf-ir/stream-internal.h
+++ b/include/babeltrace/ctf-ir/stream-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_CTF_WRITER_STREAM_INTERNAL_H
-#define BABELTRACE_CTF_WRITER_STREAM_INTERNAL_H
+#ifndef BABELTRACE_CTF_IR_STREAM_INTERNAL_H
+#define BABELTRACE_CTF_IR_STREAM_INTERNAL_H
 
 /*
  * BabelTrace - CTF Writer: Stream internal
@@ -27,39 +27,69 @@
  * SOFTWARE.
  */
 
+#include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/assert-internal.h>
 #include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-writer/ref-internal.h>
-#include <babeltrace/ctf-writer/clock.h>
-#include <babeltrace/ctf-writer/event-fields.h>
-#include <babeltrace/ctf-writer/event-types.h>
+#include <babeltrace/ctf-ir/utils-internal.h>
+#include <babeltrace/object-internal.h>
+#include <babeltrace/object-pool-internal.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf/types.h>
 #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;
-       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_context;
+struct bt_stream_class;
+struct bt_stream_common;
+
+struct bt_stream_common {
+       struct bt_object base;
+       int64_t id;
+       struct bt_stream_class_common *stream_class;
+       GString *name;
+};
+
+struct bt_stream {
+       struct bt_stream_common common;
+
+       /* Pool of `struct bt_packet *` */
+       struct bt_object_pool packet_pool;
 };
 
-/* Stream class should be locked by the caller after creating a stream */
 BT_HIDDEN
-struct bt_ctf_stream *bt_ctf_stream_create(
-               struct bt_ctf_stream_class *stream_class,
-               struct bt_ctf_trace *trace);
+int bt_stream_common_initialize(
+               struct bt_stream_common *stream,
+               struct bt_stream_class_common *stream_class, const char *name,
+               uint64_t id, bt_object_release_func release_func);
 
 BT_HIDDEN
-int bt_ctf_stream_set_fd(struct bt_ctf_stream *stream, int fd);
+void bt_stream_common_finalize(struct bt_stream_common *stream);
+
+static inline
+struct bt_stream_class_common *bt_stream_common_borrow_class(
+               struct bt_stream_common *stream)
+{
+       BT_ASSERT(stream);
+       return stream->stream_class;
+}
+
+static inline
+const char *bt_stream_common_get_name(struct bt_stream_common *stream)
+{
+       BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+       return stream->name ? stream->name->str : NULL;
+}
+
+static inline
+int64_t bt_stream_common_get_id(struct bt_stream_common *stream)
+{
+       int64_t ret;
+
+       BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+       ret = stream->id;
+       if (ret < 0) {
+               BT_LOGV("Stream's ID is not set: addr=%p, name=\"%s\"",
+                       stream, bt_stream_common_get_name(stream));
+       }
+
+       return ret;
+}
 
-#endif /* BABELTRACE_CTF_WRITER_STREAM_INTERNAL_H */
+#endif /* BABELTRACE_CTF_IR_STREAM_INTERNAL_H */