lib: merge common CTF IR part with the remaining implementation

[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 14765f490d27c6c0d4fb007c936faef9ddc1d0fb..19cd8c2f8658e92ae80d50577ec2bb6f57c8a99d 100644 (file)
--- a/include/babeltrace/ctf-ir/stream-internal.h
+++ b/include/babeltrace/ctf-ir/stream-internal.h
@@ -32,93 +32,21 @@
 #include <babeltrace/ctf-ir/stream.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 <glib.h>
 
 struct bt_stream_class;
-struct bt_stream_common;
+struct bt_stream;
 
-typedef void (*bt_stream_common_destroy_listener_func)(
-               struct bt_stream_common *stream, void *data);
-
-struct bt_stream_common_destroy_listener {
-       bt_stream_common_destroy_listener_func func;
-       void *data;
-};
-
-struct bt_stream_common {
+struct bt_stream {
        struct bt_object base;
        int64_t id;
-       struct bt_stream_class_common *stream_class;
+       struct bt_stream_class *stream_class;
        GString *name;
 
-       /* Array of struct bt_stream_common_destroy_listener */
-       GArray *destroy_listeners;
+       /* Pool of `struct bt_packet *` */
+       struct bt_object_pool packet_pool;
 };
 
-struct bt_stream {
-       struct bt_stream_common common;
-};
-
-BT_HIDDEN
-void bt_stream_common_add_destroy_listener(struct bt_stream_common *stream,
-               bt_stream_common_destroy_listener_func func, void *data);
-
-BT_HIDDEN
-void bt_stream_common_remove_destroy_listener(struct bt_stream_common *stream,
-               bt_stream_common_destroy_listener_func func, void *data);
-
-BT_HIDDEN
-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
-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
-struct bt_stream_class *bt_stream_borrow_class(struct bt_stream *stream)
-{
-       BT_ASSERT(stream);
-       return BT_FROM_COMMON(bt_stream_common_borrow_class(BT_TO_COMMON(stream)));
-}
-
-static inline
-struct bt_stream_class_common *bt_stream_common_get_class(
-               struct bt_stream_common *stream)
-{
-       return bt_get(bt_stream_common_borrow_class(stream));
-}
-
-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_IR_STREAM_INTERNAL_H */