Make API CTF-agnostic

[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 87f3c848f7f1e7225dd5361071654ceaa895f308..0cbd18b561539217621099ac837370d2f625dc74 100644 (file)
--- a/include/babeltrace/ctf-ir/stream-internal.h
+++ b/include/babeltrace/ctf-ir/stream-internal.h
@@ -27,8 +27,6 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/assert-internal.h>
 #include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/utils-internal.h>
 #include <babeltrace/object-internal.h>
@@ -37,59 +35,36 @@
 #include <glib.h>
 
 struct bt_stream_class;
-struct bt_stream_common;
+struct bt_stream;
 
-struct bt_stream_common {
+struct bt_stream {
        struct bt_object base;
-       int64_t id;
-       struct bt_stream_class_common *stream_class;
-       GString *name;
-};
 
-struct bt_stream {
-       struct bt_stream_common common;
+       /* Weak: parent is this class's trace */
+       struct bt_stream_class *class;
 
-       /* Pool of `struct bt_packet *` */
-       struct bt_object_pool packet_pool;
-};
+       struct {
+               GString *str;
 
-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);
+               /* NULL or `str->str` above */
+               const char *value;
+       } name;
 
-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;
-}
+       uint64_t id;
 
-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;
-}
+       /* Pool of `struct bt_packet *` */
+       struct bt_object_pool packet_pool;
 
-static inline
-int64_t bt_stream_common_get_id(struct bt_stream_common *stream)
-{
-       int64_t ret;
+       bool frozen;
+};
 
-       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));
-       }
+BT_HIDDEN
+void _bt_stream_freeze(struct bt_stream *stream);
 
-       return ret;
-}
+#ifdef BT_DEV_MODE
+# define bt_stream_freeze              _bt_stream_freeze
+#else
+# define bt_stream_freeze(_stream)
+#endif
 
 #endif /* BABELTRACE_CTF_IR_STREAM_INTERNAL_H */