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

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/include/babeltrace/graph/const-notification.h b/include/babeltrace/graph/const-notification.h
index 44c50d3cac6b0485af253322d48d08e1ec2c25df..a8347a3d7cebc660d1e9a3e41cbc01379f3c39ea 100644 (file)
--- a/include/babeltrace/graph/const-notification.h
+++ b/include/babeltrace/graph/const-notification.h
@@ -39,9 +39,9 @@ typedef struct bt_notification **bt_notification_array;
 enum bt_notification_type {
        BT_NOTIFICATION_TYPE_EVENT =                    0,
        BT_NOTIFICATION_TYPE_INACTIVITY =               1,
-       BT_NOTIFICATION_TYPE_STREAM_BEGIN =             2,
+       BT_NOTIFICATION_TYPE_STREAM_BEGINNING =         2,
        BT_NOTIFICATION_TYPE_STREAM_END =               3,
-       BT_NOTIFICATION_TYPE_PACKET_BEGIN =             4,
+       BT_NOTIFICATION_TYPE_PACKET_BEGINNING =         4,
        BT_NOTIFICATION_TYPE_PACKET_END =               5,
 };
 

diff --git a/include/babeltrace/graph/graph-internal.h b/include/babeltrace/graph/graph-internal.h
index cb2da872534672c01786ab8050b4c7d547f03686..c1c018d083d35cead9b7e9669197509814013988 100644 (file)
--- a/include/babeltrace/graph/graph-internal.h
+++ b/include/babeltrace/graph/graph-internal.h
@@ -94,7 +94,7 @@ struct bt_graph {
        /* Pool of `struct bt_notification_event *` */
        struct bt_object_pool event_notif_pool;
 
-       /* Pool of `struct bt_notification_packet_begin *` */
+       /* Pool of `struct bt_notification_packet_beginning *` */
        struct bt_object_pool packet_begin_notif_pool;
 
        /* Pool of `struct bt_notification_packet_end *` */

diff --git a/include/babeltrace/graph/notification-const.h b/include/babeltrace/graph/notification-const.h
index 4ab0bb91dff24cebdb8d8ebc6415915d43861104..ed8cb84166dd70c1062c641819a8d548821d59df 100644 (file)
--- a/include/babeltrace/graph/notification-const.h
+++ b/include/babeltrace/graph/notification-const.h
@@ -39,9 +39,9 @@ typedef const struct bt_notification **bt_notification_array_const;
 enum bt_notification_type {
        BT_NOTIFICATION_TYPE_EVENT =                    0,
        BT_NOTIFICATION_TYPE_INACTIVITY =               1,
-       BT_NOTIFICATION_TYPE_STREAM_BEGIN =             2,
+       BT_NOTIFICATION_TYPE_STREAM_BEGINNING =         2,
        BT_NOTIFICATION_TYPE_STREAM_END =               3,
-       BT_NOTIFICATION_TYPE_PACKET_BEGIN =             4,
+       BT_NOTIFICATION_TYPE_PACKET_BEGINNING =         4,
        BT_NOTIFICATION_TYPE_PACKET_END =               5,
 };
 

diff --git a/include/babeltrace/graph/notification-internal.h b/include/babeltrace/graph/notification-internal.h
index 4ef04290bfed9a09bfa4020a859c1a68c2f73814..cdd2146957bec76116ed125d798f4d90b96e00b8 100644 (file)
--- a/include/babeltrace/graph/notification-internal.h
+++ b/include/babeltrace/graph/notification-internal.h
@@ -119,12 +119,12 @@ const char *bt_notification_type_string(enum bt_notification_type type)
                return "BT_NOTIFICATION_TYPE_EVENT";
        case BT_NOTIFICATION_TYPE_INACTIVITY:
                return "BT_NOTIFICATION_TYPE_INACTIVITY";
-       case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
-               return "BT_NOTIFICATION_TYPE_STREAM_BEGIN";
+       case BT_NOTIFICATION_TYPE_STREAM_BEGINNING:
+               return "BT_NOTIFICATION_TYPE_STREAM_BEGINNING";
        case BT_NOTIFICATION_TYPE_STREAM_END:
                return "BT_NOTIFICATION_TYPE_STREAM_END";
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
-               return "BT_NOTIFICATION_TYPE_PACKET_BEGIN";
+       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
+               return "BT_NOTIFICATION_TYPE_PACKET_BEGINNING";
        case BT_NOTIFICATION_TYPE_PACKET_END:
                return "BT_NOTIFICATION_TYPE_PACKET_END";
        default:

diff --git a/include/babeltrace/graph/notification-packet-const.h b/include/babeltrace/graph/notification-packet-const.h
index aa75c2f245a978147f7a6b26184685855312f38f..83fd5607bc284d3242d0d9bc9f0e31c1af7b8841 100644 (file)
--- a/include/babeltrace/graph/notification-packet-const.h
+++ b/include/babeltrace/graph/notification-packet-const.h
@@ -32,7 +32,7 @@ extern "C" {
 struct bt_notification;
 struct bt_packet;
 
-extern const struct bt_packet *bt_notification_packet_begin_borrow_packet_const(
+extern const struct bt_packet *bt_notification_packet_beginning_borrow_packet_const(
                const struct bt_notification *notification);
 
 extern const struct bt_packet *bt_notification_packet_end_borrow_packet_const(

diff --git a/include/babeltrace/graph/notification-packet-internal.h b/include/babeltrace/graph/notification-packet-internal.h
index 77cdf979a990dd24e5072642aceda2c1d4e972fe..95e6cb4092ba6d5a8fc379344e74bee4e2591c26 100644 (file)
--- a/include/babeltrace/graph/notification-packet-internal.h
+++ b/include/babeltrace/graph/notification-packet-internal.h
@@ -30,7 +30,7 @@
 #include <babeltrace/graph/notification-internal.h>
 #include <babeltrace/assert-internal.h>
 
-struct bt_notification_packet_begin {
+struct bt_notification_packet_beginning {
        struct bt_notification parent;
        struct bt_packet *packet;
 };
@@ -41,13 +41,13 @@ struct bt_notification_packet_end {
 };
 
 BT_HIDDEN
-struct bt_notification *bt_notification_packet_begin_new(
+struct bt_notification *bt_notification_packet_beginning_new(
                struct bt_graph *graph);
 BT_HIDDEN
-void bt_notification_packet_begin_recycle(struct bt_notification *notif);
+void bt_notification_packet_beginning_recycle(struct bt_notification *notif);
 
 BT_HIDDEN
-void bt_notification_packet_begin_destroy(struct bt_notification *notif);
+void bt_notification_packet_beginning_destroy(struct bt_notification *notif);
 
 BT_HIDDEN
 struct bt_notification *bt_notification_packet_end_new(struct bt_graph *graph);

diff --git a/include/babeltrace/graph/notification-packet.h b/include/babeltrace/graph/notification-packet.h
index b56e9e7a112f97214f64203ec0107865cd057b0a..ac293baa3c96e0a3a1f533ea9e95f4a2631dcf4a 100644 (file)
--- a/include/babeltrace/graph/notification-packet.h
+++ b/include/babeltrace/graph/notification-packet.h
@@ -34,7 +34,7 @@ struct bt_self_notification_iterator;
 struct bt_packet;
 
 extern
-struct bt_notification *bt_notification_packet_begin_create(
+struct bt_notification *bt_notification_packet_beginning_create(
                struct bt_self_notification_iterator *notification_iterator,
                struct bt_packet *packet);
 
@@ -43,7 +43,7 @@ struct bt_notification *bt_notification_packet_end_create(
                struct bt_self_notification_iterator *notification_iterator,
                struct bt_packet *packet);
 
-extern struct bt_packet *bt_notification_packet_begin_borrow_packet(
+extern struct bt_packet *bt_notification_packet_beginning_borrow_packet(
                struct bt_notification *notification);
 
 extern struct bt_packet *bt_notification_packet_end_borrow_packet(

diff --git a/include/babeltrace/graph/notification-stream-const.h b/include/babeltrace/graph/notification-stream-const.h
index f0fd960c9e15ab6bbbbf8c97dd574aa6feec5579..d04c0820ad86ee77de0e5dd02b61894b47833975 100644 (file)
--- a/include/babeltrace/graph/notification-stream-const.h
+++ b/include/babeltrace/graph/notification-stream-const.h
@@ -34,11 +34,11 @@ struct bt_self_notification_iterator;
 struct bt_clock_value;
 struct bt_stream;
 
-extern const struct bt_stream *bt_notification_stream_begin_borrow_stream_const(
+extern const struct bt_stream *bt_notification_stream_beginning_borrow_stream_const(
                const struct bt_notification *notification);
 
 extern const struct bt_clock_value *
-bt_notification_stream_begin_borrow_default_clock_value_const(
+bt_notification_stream_beginning_borrow_default_clock_value_const(
                const struct bt_notification *notif);
 
 extern const struct bt_stream *bt_notification_stream_end_borrow_stream_const(

diff --git a/include/babeltrace/graph/notification-stream-internal.h b/include/babeltrace/graph/notification-stream-internal.h
index 4b4e0c7c68988dc232239c8b20be3fdd71e6f9bb..bad744e8a6534e45a8baaeec3247fc0d03c3fdda 100644 (file)
--- a/include/babeltrace/graph/notification-stream-internal.h
+++ b/include/babeltrace/graph/notification-stream-internal.h
@@ -31,7 +31,7 @@
 #include <babeltrace/trace-ir/clock-value-internal.h>
 #include <babeltrace/assert-internal.h>
 
-struct bt_notification_stream_begin {
+struct bt_notification_stream_beginning {
        struct bt_notification parent;
        struct bt_stream *stream;
        struct bt_clock_value *default_cv;

diff --git a/include/babeltrace/graph/notification-stream.h b/include/babeltrace/graph/notification-stream.h
index 2f98f82f00ae35df4b7fa4454fc8d6919030d248..537beca612e99f1c5c99077253991f9054e0e46c 100644 (file)
--- a/include/babeltrace/graph/notification-stream.h
+++ b/include/babeltrace/graph/notification-stream.h
@@ -36,7 +36,7 @@ struct bt_self_notification_iterator;
 struct bt_stream;
 
 extern
-struct bt_notification *bt_notification_stream_begin_create(
+struct bt_notification *bt_notification_stream_beginning_create(
                struct bt_self_notification_iterator *notification_iterator,
                struct bt_stream *stream);
 
@@ -45,10 +45,10 @@ struct bt_notification *bt_notification_stream_end_create(
                struct bt_self_notification_iterator *notification_iterator,
                struct bt_stream *stream);
 
-extern struct bt_stream *bt_notification_stream_begin_borrow_stream(
+extern struct bt_stream *bt_notification_stream_beginning_borrow_stream(
                struct bt_notification *notification);
 
-extern void bt_notification_stream_begin_set_default_clock_value(
+extern void bt_notification_stream_beginning_set_default_clock_value(
                struct bt_notification *notif, uint64_t value_cycles);
 
 extern struct bt_stream *bt_notification_stream_end_borrow_stream(

diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index 3ba2321e5572c72a31f49af76469995ba62fb2f0..db88e333c5dfbe7b34b218f9b5069acbb380f5b5 100644 (file)
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -293,7 +293,7 @@ static
 void destroy_notification_packet_begin(struct bt_notification *notif,
                struct bt_graph *graph)
 {
-       bt_notification_packet_begin_destroy(notif);
+       bt_notification_packet_beginning_destroy(notif);
 }
 
 static
@@ -464,7 +464,7 @@ struct bt_graph *bt_graph_create(void)
        }
 
        ret = bt_object_pool_initialize(&graph->packet_begin_notif_pool,
-               (bt_object_pool_new_object_func) bt_notification_packet_begin_new,
+               (bt_object_pool_new_object_func) bt_notification_packet_beginning_new,
                (bt_object_pool_destroy_object_func) destroy_notification_packet_begin,
                graph);
        if (ret) {

diff --git a/lib/graph/iterator.c b/lib/graph/iterator.c
index 56b688046c5a746c4a33d663dc4b7b5af0f7de16..54ce07dcdab6597988c5fe0adbc99359c36b3261 100644 (file)
--- a/lib/graph/iterator.c
+++ b/lib/graph/iterator.c
@@ -471,14 +471,14 @@ void bt_notification_borrow_packet_stream(const struct bt_notification *notif,
                        bt_notification_event_borrow_event_const(notif));
                *stream = bt_packet_borrow_stream_const(*packet);
                break;
-       case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
-               *stream = bt_notification_stream_begin_borrow_stream_const(notif);
+       case BT_NOTIFICATION_TYPE_STREAM_BEGINNING:
+               *stream = bt_notification_stream_beginning_borrow_stream_const(notif);
                break;
        case BT_NOTIFICATION_TYPE_STREAM_END:
                *stream = bt_notification_stream_end_borrow_stream_const(notif);
                break;
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
-               *packet = bt_notification_packet_begin_borrow_packet_const(notif);
+       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
+               *packet = bt_notification_packet_beginning_borrow_packet_const(notif);
                *stream = bt_packet_borrow_stream_const(*packet);
                break;
        case BT_NOTIFICATION_TYPE_PACKET_END:
@@ -514,12 +514,12 @@ bool validate_notification(
        if (!stream_state) {
                /*
                 * No stream state for this stream: this notification
-                * MUST be a BT_NOTIFICATION_TYPE_STREAM_BEGIN notification
+                * MUST be a BT_NOTIFICATION_TYPE_STREAM_BEGINNING notification
                 * and its sequence number must be 0.
                 */
-               if (c_notif->type != BT_NOTIFICATION_TYPE_STREAM_BEGIN) {
+               if (c_notif->type != BT_NOTIFICATION_TYPE_STREAM_BEGINNING) {
                        BT_ASSERT_PRE_MSG("Unexpected notification: missing a "
-                               "BT_NOTIFICATION_TYPE_STREAM_BEGIN "
+                               "BT_NOTIFICATION_TYPE_STREAM_BEGINNING "
                                "notification prior to this notification: "
                                "%![stream-]+s", stream);
                        is_valid = false;
@@ -582,8 +582,8 @@ bool validate_notification(
        }
 
        switch (c_notif->type) {
-       case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
-               BT_ASSERT_PRE_MSG("Unexpected BT_NOTIFICATION_TYPE_STREAM_BEGIN "
+       case BT_NOTIFICATION_TYPE_STREAM_BEGINNING:
+               BT_ASSERT_PRE_MSG("Unexpected BT_NOTIFICATION_TYPE_STREAM_BEGINNING "
                        "notification at this point: notif-seq-num=%" PRIu64 ", "
                        "%![stream-]+s", c_notif->seq_num, stream);
                is_valid = false;
@@ -602,9 +602,9 @@ bool validate_notification(
                stream_state->expected_notif_seq_num++;
                stream_state->is_ended = true;
                goto end;
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
                if (stream_state->cur_packet) {
-                       BT_ASSERT_PRE_MSG("Unexpected BT_NOTIFICATION_TYPE_PACKET_BEGIN "
+                       BT_ASSERT_PRE_MSG("Unexpected BT_NOTIFICATION_TYPE_PACKET_BEGINNING "
                                "notification at this point: missing a "
                                "BT_NOTIFICATION_TYPE_PACKET_END notification "
                                "prior to this notification: "
@@ -622,7 +622,7 @@ bool validate_notification(
                if (!stream_state->cur_packet) {
                        BT_ASSERT_PRE_MSG("Unexpected BT_NOTIFICATION_TYPE_PACKET_END "
                                "notification at this point: missing a "
-                               "BT_NOTIFICATION_TYPE_PACKET_BEGIN notification "
+                               "BT_NOTIFICATION_TYPE_PACKET_BEGINNING notification "
                                "prior to this notification: "
                                "notif-seq-num=%" PRIu64 ", %![stream-]+s, "
                                "%![packet-]+a", c_notif->seq_num, stream,

diff --git a/lib/graph/notification/packet.c b/lib/graph/notification/packet.c
index a1750764584bbf7d2b9314cb551f045e54d3b022..c753f61c2814dd76e979c007037f76686958f577 100644 (file)
--- a/lib/graph/notification/packet.c
+++ b/lib/graph/notification/packet.c
@@ -42,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;
 
@@ -65,13 +65,13 @@ end:
        return (void *) notification;
 }
 
-struct bt_notification *bt_notification_packet_begin_create(
+struct bt_notification *bt_notification_packet_beginning_create(
                struct bt_self_notification_iterator *self_notif_iter,
                struct bt_packet *packet)
 {
        struct bt_self_component_port_input_notification_iterator *notif_iter =
                (void *) self_notif_iter;
-       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,22 +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);
+               BT_NOTIFICATION_TYPE_PACKET_BEGINNING);
        packet_begin = (void *) notification;
        return packet_begin->packet;
 }
 
-const struct bt_packet *bt_notification_packet_begin_borrow_packet_const(
+const struct bt_packet *bt_notification_packet_beginning_borrow_packet_const(
                const struct bt_notification *notification)
 {
-       return bt_notification_packet_begin_borrow_packet(
+       return bt_notification_packet_beginning_borrow_packet(
                (void *) notification);
 }
 

diff --git a/lib/graph/notification/stream.c b/lib/graph/notification/stream.c
index 92336b27318c99572cae8d59a8f4cf1bcb41a8a0..b824b15d5de205248bdba9ed3e597cd865916893 100644 (file)
--- a/lib/graph/notification/stream.c
+++ b/lib/graph/notification/stream.c
@@ -140,10 +140,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);
@@ -158,11 +158,11 @@ void bt_notification_stream_begin_destroy(struct bt_object *obj)
        g_free(notification);
 }
 
-struct bt_notification *bt_notification_stream_begin_create(
+struct bt_notification *bt_notification_stream_beginning_create(
                struct bt_self_notification_iterator *self_notif_iter,
                struct bt_stream *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");
@@ -171,15 +171,15 @@ struct bt_notification *bt_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);
+                       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: "
@@ -190,34 +190,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);
+               BT_NOTIFICATION_TYPE_STREAM_BEGINNING);
        stream_begin = (void *) notification;
        return stream_begin->stream;
 }
 
-const struct bt_stream *bt_notification_stream_begin_borrow_stream_const(
+const struct bt_stream *bt_notification_stream_beginning_borrow_stream_const(
                const struct bt_notification *notification)
 {
-       return bt_notification_stream_begin_borrow_stream(
+       return bt_notification_stream_beginning_borrow_stream(
                (void *) notification);
 }
 
-void bt_notification_stream_begin_set_default_clock_value(
+void bt_notification_stream_beginning_set_default_clock_value(
                struct bt_notification *notif,
                uint64_t value_cycles)
 {
-       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);
@@ -231,12 +231,12 @@ void bt_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;
 }

diff --git a/lib/lib-logging.c b/lib/lib-logging.c
index a72cdd98e1d9ac4e5ea4a741814ed7c799933324..d58996b0a188fb5cf6fe9a248715207bc1fc32ef 100644 (file)
--- a/lib/lib-logging.c
+++ b/lib/lib-logging.c
@@ -926,9 +926,9 @@ static inline void format_notification(char **buf_ch, bool extended,
 
                break;
        }
-       case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
+       case BT_NOTIFICATION_TYPE_STREAM_BEGINNING:
        {
-               const struct bt_notification_stream_begin *notif_stream =
+               const struct bt_notification_stream_beginning *notif_stream =
                        (const void *) notif;
 
                if (notif_stream->stream) {
@@ -950,9 +950,9 @@ static inline void format_notification(char **buf_ch, bool extended,
 
                break;
        }
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
        {
-               const struct bt_notification_packet_begin *notif_packet =
+               const struct bt_notification_packet_beginning *notif_packet =
                        (const void *) notif;
 
                if (notif_packet->packet) {

diff --git a/plugins/ctf/common/notif-iter/notif-iter.c b/plugins/ctf/common/notif-iter/notif-iter.c
index a8028b33369858ca33ddaf0ffe74964de466f118..501c3004dcbabd0e2a5f9d04506ac66cb2793107 100644 (file)
--- a/plugins/ctf/common/notif-iter/notif-iter.c
+++ b/plugins/ctf/common/notif-iter/notif-iter.c
@@ -2274,7 +2274,7 @@ void notify_new_stream(struct bt_notif_iter *notit,
 
        BT_ASSERT(notit->stream);
        BT_ASSERT(notit->notif_iter);
-       ret = bt_notification_stream_begin_create(notit->notif_iter,
+       ret = bt_notification_stream_beginning_create(notit->notif_iter,
                notit->stream);
        if (!ret) {
                BT_LOGE("Cannot create stream beginning notification: "
@@ -2392,7 +2392,7 @@ void notify_new_packet(struct bt_notif_iter *notit,
        }
 
        BT_ASSERT(notit->notif_iter);
-       notif = bt_notification_packet_begin_create(notit->notif_iter,
+       notif = bt_notification_packet_beginning_create(notit->notif_iter,
                notit->packet);
        if (!notif) {
                BT_LOGE("Cannot create packet beginning notification: "

diff --git a/plugins/ctf/common/notif-iter/notif-iter.h b/plugins/ctf/common/notif-iter/notif-iter.h
index 9fd9b725227120d1ec5243b434da81a1d17026c3..9c3033a128d118d9c9a832b4196acb0be7f36507 100644 (file)
--- a/plugins/ctf/common/notif-iter/notif-iter.h
+++ b/plugins/ctf/common/notif-iter/notif-iter.h
@@ -352,7 +352,7 @@ off_t bt_notif_iter_get_current_packet_size(
  * Resets the iterator so that the next requested medium bytes are
  * assumed to be the first bytes of a new stream. The first notification
  * which this iterator emits after calling bt_notif_iter_reset() is a
- * BT_NOTIFICATION_TYPE_STREAM_BEGIN one.
+ * BT_NOTIFICATION_TYPE_STREAM_BEGINNING one.
  */
 BT_HIDDEN
 void bt_notif_iter_reset(struct bt_notif_iter *notit);

diff --git a/plugins/ctf/fs-sink/writer.c b/plugins/ctf/fs-sink/writer.c
index 8f2ffd8a92f3421d720ada71d47043fb7e8a7269..7ff4584010f2759ad2da32043b0f01065a8049d9 100644 (file)
--- a/plugins/ctf/fs-sink/writer.c
+++ b/plugins/ctf/fs-sink/writer.c
@@ -121,10 +121,10 @@ enum bt_component_status handle_notification(
        }
 
        switch (bt_notification_get_type(notification)) {
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
        {
                const struct bt_packet *packet =
-                       bt_notification_packet_begin_get_packet(notification);
+                       bt_notification_packet_beginning_get_packet(notification);
 
                if (!packet) {
                        ret = BT_COMPONENT_STATUS_ERROR;
@@ -164,10 +164,10 @@ enum bt_component_status handle_notification(
                }
                break;
        }
-       case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
+       case BT_NOTIFICATION_TYPE_STREAM_BEGINNING:
        {
                const struct bt_stream *stream =
-                       bt_notification_stream_begin_get_stream(notification);
+                       bt_notification_stream_beginning_get_stream(notification);
 
                if (!stream) {
                        ret = BT_COMPONENT_STATUS_ERROR;

diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c
index 8de14bdc66b79684b9467a78a5cd59dfa72e6650..7241e732b4b0b2a382dc344079d7ef6a7b7c7147 100644 (file)
--- a/plugins/ctf/fs-src/fs.c
+++ b/plugins/ctf/fs-src/fs.c
@@ -102,11 +102,11 @@ enum bt_self_notification_iterator_status ctf_fs_iterator_next_one(
 
        if (status == BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK &&
                        bt_notification_get_type(*notif) ==
-                       BT_NOTIFICATION_TYPE_STREAM_BEGIN) {
+                       BT_NOTIFICATION_TYPE_STREAM_BEGINNING) {
                if (notif_iter_data->skip_stream_begin_notifs) {
                        /*
                         * We already emitted a
-                        * BT_NOTIFICATION_TYPE_STREAM_BEGIN
+                        * BT_NOTIFICATION_TYPE_STREAM_BEGINNING
                         * notification: skip this one, get a new one.
                         */
                        BT_OBJECT_PUT_REF_AND_RESET(*notif);
@@ -117,7 +117,7 @@ enum bt_self_notification_iterator_status ctf_fs_iterator_next_one(
                        goto end;
                } else {
                        /*
-                        * First BT_NOTIFICATION_TYPE_STREAM_BEGIN
+                        * First BT_NOTIFICATION_TYPE_STREAM_BEGINNING
                         * notification: skip all following.
                         */
                        notif_iter_data->skip_stream_begin_notifs = true;
@@ -162,15 +162,15 @@ enum bt_self_notification_iterator_status ctf_fs_iterator_next_one(
 
                /*
                 * If we get a notification, we expect to get a
-                * BT_NOTIFICATION_TYPE_STREAM_BEGIN notification
+                * BT_NOTIFICATION_TYPE_STREAM_BEGINNING notification
                 * because the iterator's state machine emits one before
                 * even requesting the first block of data from the
                 * medium. Skip this notification because we're not
                 * really starting a new stream here, and try getting a
                 * new notification (which, if it works, is a
-                * BT_NOTIFICATION_TYPE_PACKET_BEGIN one). We're sure to
+                * BT_NOTIFICATION_TYPE_PACKET_BEGINNING one). We're sure to
                 * get at least one pair of
-                * BT_NOTIFICATION_TYPE_PACKET_BEGIN and
+                * BT_NOTIFICATION_TYPE_PACKET_BEGINNING and
                 * BT_NOTIFICATION_TYPE_PACKET_END notifications in the
                 * case of a single, empty packet. We know there's at
                 * least one packet because the stream file group does
@@ -180,7 +180,7 @@ enum bt_self_notification_iterator_status ctf_fs_iterator_next_one(
 
                if (status == BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK) {
                        BT_ASSERT(bt_notification_get_type(*notif) ==
-                               BT_NOTIFICATION_TYPE_STREAM_BEGIN);
+                               BT_NOTIFICATION_TYPE_STREAM_BEGINNING);
                        BT_OBJECT_PUT_REF_AND_RESET(*notif);
                        status = ctf_fs_ds_file_next(notif_iter_data->ds_file,
                                &priv_notif);

diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h
index 3542f58aa28034634830199b23af40cdecb7cdb5..5619e1b25517aa3b26f0b53de114b1b5ac85f804 100644 (file)
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -150,7 +150,7 @@ struct ctf_fs_notif_iter_data {
        /* Owned by this */
        struct bt_notif_iter *notif_iter;
 
-       /* True to skip BT_NOTIFICATION_TYPE_STREAM_BEGIN notifications */
+       /* True to skip BT_NOTIFICATION_TYPE_STREAM_BEGINNING notifications */
        bool skip_stream_begin_notifs;
 };
 

diff --git a/plugins/lttng-utils/plugin.c b/plugins/lttng-utils/plugin.c
index c3b24f3f5eea0e33fc85d6665f7c0e8117f0d5d1..e3ebc514f712b4812ef138195cf049b23e4bcb44 100644 (file)
--- a/plugins/lttng-utils/plugin.c
+++ b/plugins/lttng-utils/plugin.c
@@ -112,10 +112,10 @@ const struct bt_notification *handle_notification(FILE *err,
        const struct bt_notification *new_notification = NULL;
 
        switch (bt_notification_get_type(notification)) {
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
        {
                const struct bt_packet *packet =
-                       bt_notification_packet_begin_get_packet(notification);
+                       bt_notification_packet_beginning_get_packet(notification);
                const struct bt_packet *writer_packet;
 
                if (!packet) {
@@ -124,7 +124,7 @@ const struct bt_notification *handle_notification(FILE *err,
 
                writer_packet = debug_info_new_packet(debug_it, packet);
                BT_ASSERT(writer_packet);
-               new_notification = bt_notification_packet_begin_create(
+               new_notification = bt_notification_packet_beginning_create(
                                writer_packet);
                BT_ASSERT(new_notification);
                bt_object_put_ref(packet);
@@ -172,10 +172,10 @@ const struct bt_notification *handle_notification(FILE *err,
                bt_object_put_ref(writer_event);
                break;
        }
-       case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
+       case BT_NOTIFICATION_TYPE_STREAM_BEGINNING:
        {
                const struct bt_stream *stream =
-                       bt_notification_stream_begin_get_stream(notification);
+                       bt_notification_stream_beginning_get_stream(notification);
                const struct bt_stream *writer_stream;
 
                if (!stream) {
@@ -184,7 +184,7 @@ const struct bt_notification *handle_notification(FILE *err,
 
                writer_stream = debug_info_stream_begin(debug_it, stream);
                BT_ASSERT(writer_stream);
-               new_notification = bt_notification_stream_begin_create(
+               new_notification = bt_notification_stream_beginning_create(
                                writer_stream);
                BT_ASSERT(new_notification);
                bt_object_put_ref(stream);

diff --git a/plugins/text/dmesg/dmesg.c b/plugins/text/dmesg/dmesg.c
index 0f5b15990fd25d23b0a39f8ee6d3ce195ba67b6a..4da898bdb4f75559c57519be1d50c93f16af1a8b 100644 (file)
--- a/plugins/text/dmesg/dmesg.c
+++ b/plugins/text/dmesg/dmesg.c
@@ -768,13 +768,13 @@ handle_state:
        switch (dmesg_notif_iter->state) {
        case STATE_EMIT_STREAM_BEGINNING:
                BT_ASSERT(dmesg_notif_iter->tmp_event_notif);
-               *notif = bt_notification_stream_begin_create(
+               *notif = bt_notification_stream_beginning_create(
                        dmesg_notif_iter->pc_notif_iter, dmesg_comp->stream);
                dmesg_notif_iter->state = STATE_EMIT_PACKET_BEGINNING;
                break;
        case STATE_EMIT_PACKET_BEGINNING:
                BT_ASSERT(dmesg_notif_iter->tmp_event_notif);
-               *notif = bt_notification_packet_begin_create(
+               *notif = bt_notification_packet_beginning_create(
                        dmesg_notif_iter->pc_notif_iter, dmesg_comp->packet);
                dmesg_notif_iter->state = STATE_EMIT_EVENT;
                break;

diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c
index dcf1b5f7745340c54436ccad8580ef8884db101a..ae064c5e0b5a92360921c010a7582d6bed862784 100644 (file)
--- a/plugins/text/pretty/pretty.c
+++ b/plugins/text/pretty/pretty.c
@@ -130,7 +130,7 @@ enum bt_self_component_status handle_notification(
        BT_ASSERT(pretty);
 
        switch (bt_notification_get_type(notification)) {
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
                if (pretty_print_packet(pretty, notification)) {
                        ret = BT_SELF_COMPONENT_STATUS_ERROR;
                }

diff --git a/plugins/text/pretty/print.c b/plugins/text/pretty/print.c
index 46e3236d9ad2055bf8559d6e0f204a53fe9c6896..5f31221943de6bda53047a9c782b90e6eba005f8 100644 (file)
--- a/plugins/text/pretty/print.c
+++ b/plugins/text/pretty/print.c
@@ -1373,7 +1373,7 @@ int pretty_print_packet(struct pretty_component *pretty,
                const struct bt_notification *packet_beginning_notif)
 {
 #if 0
-       const struct bt_packet *packet = bt_notification_packet_begin_borrow_packet_const(
+       const struct bt_packet *packet = bt_notification_packet_beginning_borrow_packet_const(
                packet_beginning_notif);
        uint64_t count;
        int status = 0;

diff --git a/plugins/utils/counter/counter.c b/plugins/utils/counter/counter.c
index 3b24092c0fe3469aa61a136997db96447477ba0d..3da0fb90883b67384a2aacae695be5980e1c0ad4 100644 (file)
--- a/plugins/utils/counter/counter.c
+++ b/plugins/utils/counter/counter.c
@@ -245,13 +245,13 @@ enum bt_self_component_status counter_consume(
                        case BT_NOTIFICATION_TYPE_INACTIVITY:
                                counter->count.inactivity++;
                                break;
-                       case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
+                       case BT_NOTIFICATION_TYPE_STREAM_BEGINNING:
                                counter->count.stream_begin++;
                                break;
                        case BT_NOTIFICATION_TYPE_STREAM_END:
                                counter->count.stream_end++;
                                break;
-                       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+                       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
                                counter->count.packet_begin++;
                                break;
                        case BT_NOTIFICATION_TYPE_PACKET_END:

diff --git a/plugins/utils/trimmer/iterator.c b/plugins/utils/trimmer/iterator.c
index 0ea086e44307a94794265cb99aa13da860870a92..c0503d257ec74a608e0dfd33abd952d89527d9f3 100644 (file)
--- a/plugins/utils/trimmer/iterator.c
+++ b/plugins/utils/trimmer/iterator.c
@@ -392,8 +392,8 @@ const struct bt_notification *evaluate_packet_notification(
        bool lazy_update = false;
 
         switch (bt_notification_get_type(notification)) {
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
-               packet = bt_notification_packet_begin_get_packet(notification);
+       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
+               packet = bt_notification_packet_beginning_get_packet(notification);
                BT_ASSERT(packet);
                writer_packet = trimmer_new_packet(trim_it, packet);
                BT_ASSERT(writer_packet);
@@ -479,8 +479,8 @@ const struct bt_notification *evaluate_packet_notification(
 
 end:
         switch (bt_notification_get_type(notification)) {
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
-               new_notification = bt_notification_packet_begin_create(writer_packet);
+       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
+               new_notification = bt_notification_packet_beginning_create(writer_packet);
                BT_ASSERT(new_notification);
                break;
        case BT_NOTIFICATION_TYPE_PACKET_END:
@@ -533,7 +533,7 @@ enum bt_notification_iterator_status evaluate_notification(
                new_notification = evaluate_event_notification(*notification,
                                trim_it, begin, end, in_range, &finished);
                break;
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
        case BT_NOTIFICATION_TYPE_PACKET_END:
                new_notification = evaluate_packet_notification(*notification,
                                trim_it, begin, end, in_range, &finished);

diff --git a/tests/lib/test_bt_notification_iterator.c b/tests/lib/test_bt_notification_iterator.c
index 5455b960b9883163034904e5b9b01b4dd66c82e5..f121df0593785492b4b806852ad962693619b542 100644 (file)
--- a/tests/lib/test_bt_notification_iterator.c
+++ b/tests/lib/test_bt_notification_iterator.c
@@ -345,11 +345,11 @@ void src_iter_next_seq_one(struct bt_self_notification_iterator* notif_iter,
 
        switch (user_data->seq[user_data->at]) {
        case SEQ_STREAM1_BEGIN:
-               *notif = bt_notification_stream_begin_create(notif_iter,
+               *notif = bt_notification_stream_beginning_create(notif_iter,
                                                                     src_stream1);
                break;
        case SEQ_STREAM2_BEGIN:
-               *notif = bt_notification_stream_begin_create(notif_iter,
+               *notif = bt_notification_stream_beginning_create(notif_iter,
                                                             src_stream2);
                break;
        case SEQ_STREAM1_END:
@@ -361,19 +361,19 @@ void src_iter_next_seq_one(struct bt_self_notification_iterator* notif_iter,
                                                           src_stream2);
                break;
        case SEQ_STREAM1_PACKET1_BEGIN:
-               *notif = bt_notification_packet_begin_create(notif_iter,
+               *notif = bt_notification_packet_beginning_create(notif_iter,
                                                             src_stream1_packet1);
                break;
        case SEQ_STREAM1_PACKET2_BEGIN:
-               *notif = bt_notification_packet_begin_create(notif_iter,
+               *notif = bt_notification_packet_beginning_create(notif_iter,
                                                             src_stream1_packet2);
                break;
        case SEQ_STREAM2_PACKET1_BEGIN:
-               *notif = bt_notification_packet_begin_create(notif_iter,
+               *notif = bt_notification_packet_beginning_create(notif_iter,
                                                             src_stream2_packet1);
                break;
        case SEQ_STREAM2_PACKET2_BEGIN:
-               *notif = bt_notification_packet_begin_create(notif_iter,
+               *notif = bt_notification_packet_beginning_create(notif_iter,
                                                             src_stream2_packet2);
                break;
        case SEQ_STREAM1_PACKET1_END:
@@ -497,10 +497,10 @@ void append_test_events_from_notification(const struct bt_notification *notifica
                BT_ASSERT(test_event.packet);
                break;
        }
-       case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
+       case BT_NOTIFICATION_TYPE_STREAM_BEGINNING:
                test_event.type = TEST_EV_TYPE_NOTIF_STREAM_BEGIN;
                test_event.stream =
-                       bt_notification_stream_begin_borrow_stream_const(notification);
+                       bt_notification_stream_beginning_borrow_stream_const(notification);
                BT_ASSERT(test_event.stream);
                break;
        case BT_NOTIFICATION_TYPE_STREAM_END:
@@ -509,10 +509,10 @@ void append_test_events_from_notification(const struct bt_notification *notifica
                        bt_notification_stream_end_borrow_stream_const(notification);
                BT_ASSERT(test_event.stream);
                break;
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
                test_event.type = TEST_EV_TYPE_NOTIF_PACKET_BEGIN;
                test_event.packet =
-                       bt_notification_packet_begin_borrow_packet_const(notification);
+                       bt_notification_packet_beginning_borrow_packet_const(notification);
                BT_ASSERT(test_event.packet);
                break;
        case BT_NOTIFICATION_TYPE_PACKET_END: