lib: rename "begin" to "beginning" when used as a noun

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

diff --git a/lib/graph/notification/packet.c b/lib/graph/notification/packet.c
index b15c489b41f2677870cf8ff6d69f014b1b642df8..c753f61c2814dd76e979c007037f76686958f577 100644 (file)
--- a/lib/graph/notification/packet.c
+++ b/lib/graph/notification/packet.c
@@ -32,7 +32,8 @@
 #include <babeltrace/trace-ir/stream.h>
 #include <babeltrace/trace-ir/stream-internal.h>
 #include <babeltrace/graph/graph-internal.h>
-#include <babeltrace/graph/private-notification-packet.h>
+#include <babeltrace/graph/notification-packet-const.h>
+#include <babeltrace/graph/notification-packet.h>
 #include <babeltrace/graph/notification-packet-internal.h>
 #include <babeltrace/object.h>
 #include <babeltrace/assert-internal.h>
@@ -41,19 +42,19 @@
 #include <inttypes.h>
 
 BT_HIDDEN
-struct bt_notification *bt_notification_packet_begin_new(struct bt_graph *graph)
+struct bt_notification *bt_notification_packet_beginning_new(struct bt_graph *graph)
 {
-       struct bt_notification_packet_begin *notification;
+       struct bt_notification_packet_beginning *notification;
 
-       notification = g_new0(struct bt_notification_packet_begin, 1);
+       notification = g_new0(struct bt_notification_packet_beginning, 1);
        if (!notification) {
                BT_LOGE_STR("Failed to allocate one packet beginning notification.");
                goto error;
        }
 
        bt_notification_init(&notification->parent,
-                       BT_NOTIFICATION_TYPE_PACKET_BEGIN,
-                       (bt_object_release_func) bt_notification_packet_begin_recycle,
+                       BT_NOTIFICATION_TYPE_PACKET_BEGINNING,
+                       (bt_object_release_func) bt_notification_packet_beginning_recycle,
                        graph);
        goto end;
 
@@ -64,14 +65,13 @@ end:
        return (void *) notification;
 }
 
-struct bt_private_notification *bt_private_notification_packet_begin_create(
+struct bt_notification *bt_notification_packet_beginning_create(
                struct bt_self_notification_iterator *self_notif_iter,
-               struct bt_private_packet *priv_packet)
+               struct bt_packet *packet)
 {
        struct bt_self_component_port_input_notification_iterator *notif_iter =
                (void *) self_notif_iter;
-       struct bt_packet *packet = (void *) priv_packet;
-       struct bt_notification_packet_begin *notification = NULL;
+       struct bt_notification_packet_beginning *notification = NULL;
        struct bt_stream *stream;
        struct bt_stream_class *stream_class;
 
@@ -106,9 +106,9 @@ end:
 }
 
 BT_HIDDEN
-void bt_notification_packet_begin_destroy(struct bt_notification *notif)
+void bt_notification_packet_beginning_destroy(struct bt_notification *notif)
 {
-       struct bt_notification_packet_begin *packet_begin_notif = (void *) notif;
+       struct bt_notification_packet_beginning *packet_begin_notif = (void *) notif;
 
        BT_LIB_LOGD("Destroying packet beginning notification: %!+n", notif);
        BT_LIB_LOGD("Putting packet: %!+a", packet_begin_notif->packet);
@@ -117,15 +117,15 @@ void bt_notification_packet_begin_destroy(struct bt_notification *notif)
 }
 
 BT_HIDDEN
-void bt_notification_packet_begin_recycle(struct bt_notification *notif)
+void bt_notification_packet_beginning_recycle(struct bt_notification *notif)
 {
-       struct bt_notification_packet_begin *packet_begin_notif = (void *) notif;
+       struct bt_notification_packet_beginning *packet_begin_notif = (void *) notif;
        struct bt_graph *graph;
 
        BT_ASSERT(packet_begin_notif);
 
        if (unlikely(!notif->graph)) {
-               bt_notification_packet_begin_destroy(notif);
+               bt_notification_packet_beginning_destroy(notif);
                return;
        }
 
@@ -138,24 +138,22 @@ void bt_notification_packet_begin_recycle(struct bt_notification *notif)
        bt_object_pool_recycle_object(&graph->packet_begin_notif_pool, notif);
 }
 
-struct bt_packet *bt_notification_packet_begin_borrow_packet(
+struct bt_packet *bt_notification_packet_beginning_borrow_packet(
                struct bt_notification *notification)
 {
-       struct bt_notification_packet_begin *packet_begin;
+       struct bt_notification_packet_beginning *packet_begin;
 
        BT_ASSERT_PRE_NON_NULL(notification, "Notification");
        BT_ASSERT_PRE_NOTIF_IS_TYPE(notification,
-               BT_NOTIFICATION_TYPE_PACKET_BEGIN);
-       packet_begin = container_of(notification,
-                       struct bt_notification_packet_begin, parent);
+               BT_NOTIFICATION_TYPE_PACKET_BEGINNING);
+       packet_begin = (void *) notification;
        return packet_begin->packet;
 }
 
-struct bt_private_packet *
-bt_private_notification_packet_begin_borrow_packet(
-               struct bt_private_notification *notification)
+const struct bt_packet *bt_notification_packet_beginning_borrow_packet_const(
+               const struct bt_notification *notification)
 {
-       return (void *) bt_notification_packet_begin_borrow_packet(
+       return bt_notification_packet_beginning_borrow_packet(
                (void *) notification);
 }
 
@@ -183,13 +181,12 @@ end:
        return (void *) notification;
 }
 
-struct bt_private_notification *bt_private_notification_packet_end_create(
+struct bt_notification *bt_notification_packet_end_create(
                struct bt_self_notification_iterator *self_notif_iter,
-               struct bt_private_packet *priv_packet)
+               struct bt_packet *packet)
 {
        struct bt_self_component_port_input_notification_iterator *notif_iter =
                (void *) self_notif_iter;
-       struct bt_packet *packet = (void *) priv_packet;
        struct bt_notification_packet_end *notification = NULL;
        struct bt_stream *stream;
        struct bt_stream_class *stream_class;
@@ -264,14 +261,13 @@ struct bt_packet *bt_notification_packet_end_borrow_packet(
        BT_ASSERT_PRE_NON_NULL(notification, "Notification");
        BT_ASSERT_PRE_NOTIF_IS_TYPE(notification,
                BT_NOTIFICATION_TYPE_PACKET_END);
-       packet_end = container_of(notification,
-                       struct bt_notification_packet_end, parent);
+       packet_end = (void *) notification;
        return packet_end->packet;
 }
 
-struct bt_private_packet *bt_private_notification_packet_end_borrow_packet(
-               struct bt_private_notification *notification)
+const struct bt_packet *bt_notification_packet_end_borrow_packet_const(
+               const struct bt_notification *notification)
 {
-       return (void *) bt_notification_packet_end_borrow_packet(
+       return bt_notification_packet_end_borrow_packet(
                (void *) notification);
 }