lib: make graph API const-correct

[babeltrace.git] / lib / graph / notification / stream.c

diff --git a/lib/graph/notification/stream.c b/lib/graph/notification/stream.c
index f24194d81efea23f84488ca9f66cf02dd2d0868f..92336b27318c99572cae8d59a8f4cf1bcb41a8a0 100644 (file)
--- a/lib/graph/notification/stream.c
+++ b/lib/graph/notification/stream.c
@@ -30,7 +30,8 @@
 #include <babeltrace/trace-ir/stream-internal.h>
 #include <babeltrace/trace-ir/stream-class.h>
 #include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/graph/private-notification-stream.h>
+#include <babeltrace/graph/notification-stream.h>
+#include <babeltrace/graph/notification-stream-const.h>
 #include <babeltrace/graph/notification-stream-internal.h>
 #include <babeltrace/assert-internal.h>
 #include <babeltrace/object.h>
@@ -55,11 +56,10 @@ void bt_notification_stream_end_destroy(struct bt_object *obj)
        g_free(notification);
 }
 
-struct bt_private_notification *bt_private_notification_stream_end_create(
+struct bt_notification *bt_notification_stream_end_create(
                struct bt_self_notification_iterator *self_notif_iter,
-               struct bt_private_stream *priv_stream)
+               struct bt_stream *stream)
 {
-       struct bt_stream *stream = (void *) priv_stream;
        struct bt_notification_stream_end *notification;
        struct bt_stream_class *stream_class;
 
@@ -78,7 +78,8 @@ struct bt_private_notification *bt_private_notification_stream_end_create(
        bt_notification_init(&notification->parent,
                        BT_NOTIFICATION_TYPE_STREAM_END,
                        bt_notification_stream_end_destroy, NULL);
-       notification->stream = bt_object_get_ref(stream);
+       notification->stream = stream;
+       bt_object_get_no_null_check(notification->stream);
        BT_LIB_LOGD("Created stream end notification object: "
                "%![notif-]+n, %![stream-]+s, %![sc-]+S", notification,
                stream, stream_class);
@@ -96,23 +97,20 @@ struct bt_stream *bt_notification_stream_end_borrow_stream(
        BT_ASSERT_PRE_NON_NULL(notification, "Notification");
        BT_ASSERT_PRE_NOTIF_IS_TYPE(notification,
                BT_NOTIFICATION_TYPE_STREAM_END);
-       stream_end = container_of(notification,
-                       struct bt_notification_stream_end, parent);
+       stream_end = (void *) notification;
        return stream_end->stream;
 }
 
-struct bt_private_stream *bt_private_notification_stream_end_borrow_stream(
-               struct bt_private_notification *notification)
+const struct bt_stream *bt_notification_stream_end_borrow_stream_const(
+               const struct bt_notification *notification)
 {
-       return (void *) bt_notification_stream_end_borrow_stream(
+       return bt_notification_stream_end_borrow_stream(
                (void *) notification);
 }
 
-void bt_private_notification_stream_end_set_default_clock_value(
-               struct bt_private_notification *priv_notif,
-               uint64_t value_cycles)
+void bt_notification_stream_end_set_default_clock_value(
+               struct bt_notification *notif, uint64_t value_cycles)
 {
-       struct bt_notification *notif = (void *) priv_notif;
        struct bt_notification_stream_end *se_notif = (void *) notif;
 
        BT_ASSERT_PRE_NON_NULL(notif, "Notification");
@@ -160,11 +158,10 @@ void bt_notification_stream_begin_destroy(struct bt_object *obj)
        g_free(notification);
 }
 
-struct bt_private_notification *bt_private_notification_stream_begin_create(
+struct bt_notification *bt_notification_stream_begin_create(
                struct bt_self_notification_iterator *self_notif_iter,
-               struct bt_private_stream *priv_stream)
+               struct bt_stream *stream)
 {
-       struct bt_stream *stream = (void *) priv_stream;
        struct bt_notification_stream_begin *notification;
        struct bt_stream_class *stream_class;
 
@@ -183,7 +180,8 @@ struct bt_private_notification *bt_private_notification_stream_begin_create(
        bt_notification_init(&notification->parent,
                        BT_NOTIFICATION_TYPE_STREAM_BEGIN,
                        bt_notification_stream_begin_destroy, NULL);
-       notification->stream = bt_object_get_ref(stream);
+       notification->stream = stream;
+       bt_object_get_no_null_check(notification->stream);
        BT_LIB_LOGD("Created stream beginning notification object: "
                "%![notif-]+n, %![stream-]+s, %![sc-]+S", notification,
                stream, stream_class);
@@ -200,23 +198,21 @@ struct bt_stream *bt_notification_stream_begin_borrow_stream(
        BT_ASSERT_PRE_NON_NULL(notification, "Notification");
        BT_ASSERT_PRE_NOTIF_IS_TYPE(notification,
                BT_NOTIFICATION_TYPE_STREAM_BEGIN);
-       stream_begin = container_of(notification,
-                       struct bt_notification_stream_begin, parent);
+       stream_begin = (void *) notification;
        return stream_begin->stream;
 }
 
-struct bt_private_stream *bt_private_notification_stream_begin_borrow_stream(
-               struct bt_private_notification *notification)
+const struct bt_stream *bt_notification_stream_begin_borrow_stream_const(
+               const struct bt_notification *notification)
 {
-       return (void *) bt_notification_stream_begin_borrow_stream(
+       return bt_notification_stream_begin_borrow_stream(
                (void *) notification);
 }
 
-void bt_private_notification_stream_begin_set_default_clock_value(
-               struct bt_private_notification *priv_notif,
+void bt_notification_stream_begin_set_default_clock_value(
+               struct bt_notification *notif,
                uint64_t value_cycles)
 {
-       struct bt_notification *notif = (void *) priv_notif;
        struct bt_notification_stream_begin *sb_notif = (void *) notif;
 
        BT_ASSERT_PRE_NON_NULL(notif, "Notification");