X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Ftrace-ir%2Fstream.c;h=c1352400b3bcfcfcb861a4756bd8ef089e046036;hp=c90728daf91ac820198b2fa6706042b35f247c6b;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hpb=05e2128659970c32648a01255ed870449f05d518

diff --git a/lib/trace-ir/stream.c b/lib/trace-ir/stream.c
index c90728da..c1352400 100644
--- a/lib/trace-ir/stream.c
+++ b/lib/trace-ir/stream.c
@@ -26,7 +26,7 @@
 #include <babeltrace/lib-logging-internal.h>
 
 #include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/trace-ir/private-stream.h>
+#include <babeltrace/trace-ir/stream-const.h>
 #include <babeltrace/trace-ir/stream.h>
 #include <babeltrace/trace-ir/stream-internal.h>
 #include <babeltrace/trace-ir/stream-class.h>
@@ -145,10 +145,8 @@ end:
 	return stream;
 }
 
-struct bt_private_stream *bt_private_stream_create(
-		struct bt_private_stream_class *priv_stream_class)
+struct bt_stream *bt_stream_create(struct bt_stream_class *stream_class)
 {
-	struct bt_stream_class *stream_class = (void *) priv_stream_class;
 	uint64_t id;
 
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
@@ -158,19 +156,16 @@ struct bt_private_stream *bt_private_stream_create(
 	id = bt_trace_get_automatic_stream_id(
 			bt_stream_class_borrow_trace_inline(stream_class),
 			stream_class);
-	return (void *) create_stream_with_id(stream_class, id);
+	return create_stream_with_id(stream_class, id);
 }
 
-struct bt_private_stream *bt_private_stream_create_with_id(
-		struct bt_private_stream_class *priv_stream_class,
+struct bt_stream *bt_stream_create_with_id(struct bt_stream_class *stream_class,
 		uint64_t id)
 {
-	struct bt_stream_class *stream_class = (void *) priv_stream_class;
-
 	BT_ASSERT_PRE(!stream_class->assigns_automatic_stream_id,
 		"Stream class automatically assigns stream IDs: "
 		"%![sc-]+S", stream_class);
-	return (void *) create_stream_with_id(stream_class, id);
+	return create_stream_with_id(stream_class, id);
 }
 
 struct bt_stream_class *bt_stream_borrow_class(struct bt_stream *stream)
@@ -179,23 +174,20 @@ struct bt_stream_class *bt_stream_borrow_class(struct bt_stream *stream)
 	return stream->class;
 }
 
-struct bt_private_stream_class *bt_private_stream_borrow_class(
-		struct bt_private_stream *priv_stream)
+const struct bt_stream_class *bt_stream_borrow_class_const(
+		const struct bt_stream *stream)
 {
-	return (void *) bt_stream_borrow_class((void *) priv_stream);
+	return bt_stream_borrow_class((void *) stream);
 }
 
-const char *bt_stream_get_name(struct bt_stream *stream)
+const char *bt_stream_get_name(const struct bt_stream *stream)
 {
 	BT_ASSERT_PRE_NON_NULL(stream, "Stream class");
 	return stream->name.value;
 }
 
-int bt_private_stream_set_name(struct bt_private_stream *priv_stream,
-		const char *name)
+int bt_stream_set_name(struct bt_stream *stream, const char *name)
 {
-	struct bt_stream *stream = (void *) priv_stream;
-
 	BT_ASSERT_PRE_NON_NULL(stream, "Clock class");
 	BT_ASSERT_PRE_NON_NULL(name, "Name");
 	BT_ASSERT_PRE_STREAM_HOT(stream);
@@ -205,17 +197,17 @@ int bt_private_stream_set_name(struct bt_private_stream *priv_stream,
 	return 0;
 }
 
-uint64_t bt_stream_get_id(struct bt_stream *stream)
+uint64_t bt_stream_get_id(const struct bt_stream *stream)
 {
 	BT_ASSERT_PRE_NON_NULL(stream, "Stream class");
 	return stream->id;
 }
 
 BT_HIDDEN
-void _bt_stream_freeze(struct bt_stream *stream)
+void _bt_stream_freeze(const struct bt_stream *stream)
 {
 	/* The field classes and default clock class are already frozen */
 	BT_ASSERT(stream);
 	BT_LIB_LOGD("Freezing stream: %!+s", stream);
-	stream->frozen = true;
+	((struct bt_stream *) stream)->frozen = true;
 }