lib: make trace IR 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 0e3a13d3c8cb6ec84b4c9bd3d044f8c5ad8d99d6..9c90311286699bb33e3fa2ebe5bd109213ee187f 100644 (file)
--- a/lib/graph/notification/stream.c
+++ b/lib/graph/notification/stream.c
@@ -57,9 +57,8 @@ void bt_notification_stream_end_destroy(struct bt_object *obj)
 
 struct bt_private_notification *bt_private_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 +77,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);
@@ -88,31 +88,29 @@ error:
        return NULL;
 }
 
-struct bt_stream *bt_notification_stream_end_borrow_stream(
-               struct bt_notification *notification)
+struct bt_stream *bt_private_notification_stream_end_borrow_stream(
+               struct bt_private_notification *notification)
 {
        struct bt_notification_stream_end *stream_end;
 
        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(
+               struct bt_notification *notification)
 {
-       return (void *) bt_notification_stream_end_borrow_stream(
+       return bt_private_notification_stream_end_borrow_stream(
                (void *) notification);
 }
 
-int bt_private_notification_stream_end_set_default_clock_value(
+void bt_private_notification_stream_end_set_default_clock_value(
                struct bt_private_notification *priv_notif,
                uint64_t value_cycles)
 {
-       int ret = 0;
        struct bt_notification *notif = (void *) priv_notif;
        struct bt_notification_stream_end *se_notif = (void *) notif;
 
@@ -123,21 +121,13 @@ int bt_private_notification_stream_end_set_default_clock_value(
                "Notification's stream class has no default clock class: "
                "%![notif-]+n, %![sc-]+S", notif, se_notif->stream->class);
 
-       if (!se_notif->default_cv) {
-               se_notif->default_cv = bt_clock_value_create(
-                       se_notif->stream->class->default_clock_class);
-               if (!se_notif->default_cv) {
-                       ret = -1;
-                       goto end;
-               }
-       }
-
+       /* TODO: have the object already created */
+       se_notif->default_cv = bt_clock_value_create(
+               se_notif->stream->class->default_clock_class);
+       BT_ASSERT(se_notif->default_cv);
        bt_clock_value_set_value_inline(se_notif->default_cv, value_cycles);
        BT_LIB_LOGV("Set notification's default clock value: %![notif-]+n, "
                "value=%" PRIu64, value_cycles);
-
-end:
-       return ret;
 }
 
 struct bt_clock_value *bt_notification_stream_end_borrow_default_clock_value(
@@ -171,9 +161,8 @@ void bt_notification_stream_begin_destroy(struct bt_object *obj)
 
 struct bt_private_notification *bt_private_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;
 
@@ -192,7 +181,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);
@@ -201,31 +191,29 @@ error:
        return NULL;
 }
 
-struct bt_stream *bt_notification_stream_begin_borrow_stream(
-               struct bt_notification *notification)
+struct bt_stream *bt_private_notification_stream_begin_borrow_stream(
+               struct bt_private_notification *notification)
 {
        struct bt_notification_stream_begin *stream_begin;
 
        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(
+               struct bt_notification *notification)
 {
-       return (void *) bt_notification_stream_begin_borrow_stream(
+       return bt_private_notification_stream_begin_borrow_stream(
                (void *) notification);
 }
 
-int bt_private_notification_stream_begin_set_default_clock_value(
+void bt_private_notification_stream_begin_set_default_clock_value(
                struct bt_private_notification *priv_notif,
                uint64_t value_cycles)
 {
-       int ret = 0;
        struct bt_notification *notif = (void *) priv_notif;
        struct bt_notification_stream_begin *sb_notif = (void *) notif;
 
@@ -236,21 +224,13 @@ int bt_private_notification_stream_begin_set_default_clock_value(
                "Notification's stream class has no default clock class: "
                "%![notif-]+n, %![sc-]+S", notif, sb_notif->stream->class);
 
-       if (!sb_notif->default_cv) {
-               sb_notif->default_cv = bt_clock_value_create(
-                       sb_notif->stream->class->default_clock_class);
-               if (!sb_notif->default_cv) {
-                       ret = -1;
-                       goto end;
-               }
-       }
-
+       /* TODO: have the object already created */
+       sb_notif->default_cv = bt_clock_value_create(
+               sb_notif->stream->class->default_clock_class);
+       BT_ASSERT(sb_notif->default_cv);
        bt_clock_value_set_value_inline(sb_notif->default_cv, value_cycles);
        BT_LIB_LOGV("Set notification's default clock value: %![notif-]+n, "
                "value=%" PRIu64, value_cycles);
-
-end:
-       return ret;
 }
 
 struct bt_clock_value *bt_notification_stream_begin_borrow_default_clock_value(