lib: update copyrights

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

diff --git a/lib/graph/notification/stream.c b/lib/graph/notification/stream.c
index f24194d81efea23f84488ca9f66cf02dd2d0868f..44456ee23f906dcb0c2507e1148f340e042cc869 100644 (file)
--- a/lib/graph/notification/stream.c
+++ b/lib/graph/notification/stream.c
@@ -1,8 +1,7 @@
 /*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -30,7 +29,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 +55,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 +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);
@@ -96,23 +96,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");
@@ -142,10 +139,10 @@ struct bt_clock_value *bt_notification_stream_end_borrow_default_clock_value(
 }
 
 static
-void bt_notification_stream_begin_destroy(struct bt_object *obj)
+void bt_notification_stream_beginning_destroy(struct bt_object *obj)
 {
-       struct bt_notification_stream_begin *notification =
-                       (struct bt_notification_stream_begin *) obj;
+       struct bt_notification_stream_beginning *notification =
+                       (struct bt_notification_stream_beginning *) obj;
 
        BT_LIB_LOGD("Destroying stream beginning notification: %!+n",
                notification);
@@ -160,12 +157,11 @@ 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_beginning_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_notification_stream_beginning *notification;
        struct bt_stream_class *stream_class;
 
        BT_ASSERT_PRE_NON_NULL(self_notif_iter, "Notification iterator");
@@ -174,16 +170,17 @@ struct bt_private_notification *bt_private_notification_stream_begin_create(
        BT_ASSERT(stream_class);
        BT_LIB_LOGD("Creating stream beginning notification object: "
                "%![stream-]+s, %![sc-]+S", stream, stream_class);
-       notification = g_new0(struct bt_notification_stream_begin, 1);
+       notification = g_new0(struct bt_notification_stream_beginning, 1);
        if (!notification) {
                BT_LOGE_STR("Failed to allocate one stream beginning notification.");
                goto error;
        }
 
        bt_notification_init(&notification->parent,
-                       BT_NOTIFICATION_TYPE_STREAM_BEGIN,
-                       bt_notification_stream_begin_destroy, NULL);
-       notification->stream = bt_object_get_ref(stream);
+                       BT_NOTIFICATION_TYPE_STREAM_BEGINNING,
+                       bt_notification_stream_beginning_destroy, NULL);
+       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);
@@ -192,36 +189,34 @@ error:
        return NULL;
 }
 
-struct bt_stream *bt_notification_stream_begin_borrow_stream(
+struct bt_stream *bt_notification_stream_beginning_borrow_stream(
                struct bt_notification *notification)
 {
-       struct bt_notification_stream_begin *stream_begin;
+       struct bt_notification_stream_beginning *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);
+               BT_NOTIFICATION_TYPE_STREAM_BEGINNING);
+       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_beginning_borrow_stream_const(
+               const struct bt_notification *notification)
 {
-       return (void *) bt_notification_stream_begin_borrow_stream(
+       return bt_notification_stream_beginning_borrow_stream(
                (void *) notification);
 }
 
-void bt_private_notification_stream_begin_set_default_clock_value(
-               struct bt_private_notification *priv_notif,
+void bt_notification_stream_beginning_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;
+       struct bt_notification_stream_beginning *sb_notif = (void *) notif;
 
        BT_ASSERT_PRE_NON_NULL(notif, "Notification");
        BT_ASSERT_PRE_HOT(notif, "Notification", ": %!+n", notif);
-       BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_STREAM_BEGIN);
+       BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_STREAM_BEGINNING);
        BT_ASSERT_PRE(sb_notif->stream->class->default_clock_class,
                "Notification's stream class has no default clock class: "
                "%![notif-]+n, %![sc-]+S", notif, sb_notif->stream->class);
@@ -235,12 +230,12 @@ void bt_private_notification_stream_begin_set_default_clock_value(
                "value=%" PRIu64, value_cycles);
 }
 
-struct bt_clock_value *bt_notification_stream_begin_borrow_default_clock_value(
+struct bt_clock_value *bt_notification_stream_beginning_borrow_default_clock_value(
                struct bt_notification *notif)
 {
-       struct bt_notification_stream_begin *stream_begin = (void *) notif;
+       struct bt_notification_stream_beginning *stream_begin = (void *) notif;
 
        BT_ASSERT_PRE_NON_NULL(notif, "Notification");
-       BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_STREAM_BEGIN);
+       BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_STREAM_BEGINNING);
        return stream_begin->default_cv;
 }