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

[babeltrace.git] / plugins / ctf / common / notif-iter / notif-iter.c

diff --git a/plugins/ctf/common/notif-iter/notif-iter.c b/plugins/ctf/common/notif-iter/notif-iter.c
index b7be219f0de02cb1f768d091d050a6c8547db411..501c3004dcbabd0e2a5f9d04506ac66cb2793107 100644 (file)
--- a/plugins/ctf/common/notif-iter/notif-iter.c
+++ b/plugins/ctf/common/notif-iter/notif-iter.c
@@ -145,7 +145,7 @@ struct bt_notif_iter {
        struct bt_event *event;
 
        /* Current event notification (NULL if not created yet) */
-       struct bt_private_notification *event_notif;
+       struct bt_notification *event_notif;
 
        /* Database of current dynamic scopes */
        struct {
@@ -661,7 +661,7 @@ enum bt_notif_iter_status read_packet_header_begin_state(
                goto end;
        }
 
-       /* Packet header class is common to the whole trace. */
+       /* Packet header class is common to the whole trace class. */
        packet_header_fc = notit->meta.tc->packet_header_fc;
        if (!packet_header_fc) {
                notit->state = STATE_AFTER_TRACE_PACKET_HEADER;
@@ -672,8 +672,8 @@ enum bt_notif_iter_status read_packet_header_begin_state(
 
        if (packet_header_fc->in_ir) {
                /*
-                * Create free packet header field from trace. This
-                * field is going to be moved to the packet once we
+                * Create free packet header field from trace class.
+                * This field is going to be moved to the packet once we
                 * create it. We cannot create the packet now because:
                 *
                 * 1. A packet is created from a stream.
@@ -685,7 +685,7 @@ enum bt_notif_iter_status read_packet_header_begin_state(
                        bt_packet_header_field_create(
                                notit->meta.tc->ir_tc);
                if (!notit->packet_header_field) {
-                       BT_LOGE_STR("Cannot create packet header field wrapper from trace.");
+                       BT_LOGE_STR("Cannot create packet header field wrapper from trace class.");
                        ret = BT_NOTIF_ITER_STATUS_ERROR;
                        goto end;
                }
@@ -700,20 +700,17 @@ enum bt_notif_iter_status read_packet_header_begin_state(
        notit->cur_event_class_id = -1;
        notit->cur_data_stream_id = -1;
        BT_LOGV("Decoding packet header field:"
-               "notit-addr=%p, trace-addr=%p, trace-name=\"%s\", fc-addr=%p",
-               notit, notit->meta.tc,
-               notit->meta.tc->name->str, packet_header_fc);
+               "notit-addr=%p, trace-class-addr=%p, fc-addr=%p",
+               notit, notit->meta.tc, packet_header_fc);
        ret = read_dscope_begin_state(notit, packet_header_fc,
                STATE_AFTER_TRACE_PACKET_HEADER,
                STATE_DSCOPE_TRACE_PACKET_HEADER_CONTINUE,
                notit->dscopes.trace_packet_header);
        if (ret < 0) {
                BT_LOGW("Cannot decode packet header field: "
-                       "notit-addr=%p, trace-addr=%p, "
-                       "trace-name=\"%s\", fc-addr=%p",
-                       notit, notit->meta.tc,
-                       notit->meta.tc->name->str,
-                       packet_header_fc);
+                       "notit-addr=%p, trace-class-addr=%p, "
+                       "fc-addr=%p",
+                       notit, notit->meta.tc, packet_header_fc);
        }
 
 end:
@@ -742,8 +739,7 @@ enum bt_notif_iter_status set_current_stream_class(struct bt_notif_iter *notit)
                if (notit->meta.tc->stream_classes->len != 1) {
                        BT_LOGW("Need exactly one stream class since there's "
                                "no stream class ID field: "
-                               "notit-addr=%p, trace-name=\"%s\"",
-                               notit, notit->meta.tc->name->str);
+                               "notit-addr=%p", notit);
                        status = BT_NOTIF_ITER_STATUS_ERROR;
                        goto end;
                }
@@ -755,11 +751,10 @@ enum bt_notif_iter_status set_current_stream_class(struct bt_notif_iter *notit)
        new_stream_class = ctf_trace_class_borrow_stream_class_by_id(
                notit->meta.tc, notit->cur_stream_class_id);
        if (!new_stream_class) {
-               BT_LOGW("No stream class with ID of stream class ID to use in trace: "
+               BT_LOGW("No stream class with ID of stream class ID to use in trace class: "
                        "notit-addr=%p, stream-class-id=%" PRIu64 ", "
-                       "trace-addr=%p, trace-name=\"%s\"",
-                       notit, notit->cur_stream_class_id, notit->meta.tc,
-                       notit->meta.tc->name->str);
+                       "trace-class-addr=%p",
+                       notit, notit->cur_stream_class_id, notit->meta.tc);
                status = BT_NOTIF_ITER_STATUS_ERROR;
                goto end;
        }
@@ -771,13 +766,12 @@ enum bt_notif_iter_status set_current_stream_class(struct bt_notif_iter *notit)
                                "prev-stream-class-id=%" PRId64 ", "
                                "next-stream-class-addr=%p, "
                                "next-stream-class-id=%" PRId64 ", "
-                               "trace-addr=%p, trace-name=\"%s\"",
+                               "trace-addr=%p",
                                notit, notit->meta.sc,
                                notit->meta.sc->id,
                                new_stream_class,
                                new_stream_class->id,
-                               notit->meta.tc,
-                               notit->meta.tc->name->str);
+                               notit->meta.tc);
                        status = BT_NOTIF_ITER_STATUS_ERROR;
                        goto end;
                }
@@ -1099,7 +1093,7 @@ enum bt_notif_iter_status read_event_header_begin_state(
                        bt_event_header_field_create(
                                notit->meta.sc->ir_sc);
                if (!notit->event_header_field) {
-                       BT_LOGE_STR("Cannot create event header field wrapper from trace.");
+                       BT_LOGE_STR("Cannot create event header field wrapper from trace class.");
                        status = BT_NOTIF_ITER_STATUS_ERROR;
                        goto end;
                }
@@ -1157,8 +1151,7 @@ enum bt_notif_iter_status set_current_event_class(struct bt_notif_iter *notit)
                if (notit->meta.sc->event_classes->len != 1) {
                        BT_LOGW("Need exactly one event class since there's "
                                "no event class ID field: "
-                               "notit-addr=%p, trace-name=\"%s\"",
-                               notit, notit->meta.tc->name->str);
+                               "notit-addr=%p", notit);
                        status = BT_NOTIF_ITER_STATUS_ERROR;
                        goto end;
                }
@@ -1173,9 +1166,9 @@ enum bt_notif_iter_status set_current_event_class(struct bt_notif_iter *notit)
                BT_LOGW("No event class with ID of event class ID to use in stream class: "
                        "notit-addr=%p, stream-class-id=%" PRIu64 ", "
                        "event-class-id=%" PRIu64 ", "
-                       "trace-addr=%p, trace-name=\"%s\"",
+                       "trace-class-addr=%p",
                        notit, notit->meta.sc->id, notit->cur_event_class_id,
-                       notit->meta.tc, notit->meta.tc->name->str);
+                       notit->meta.tc);
                status = BT_NOTIF_ITER_STATUS_ERROR;
                goto end;
        }
@@ -1197,7 +1190,7 @@ enum bt_notif_iter_status set_current_event_notification(
                struct bt_notif_iter *notit)
 {
        enum bt_notif_iter_status status = BT_NOTIF_ITER_STATUS_OK;
-       struct bt_private_notification *notif = NULL;
+       struct bt_notification *notif = NULL;
 
        BT_ASSERT(notit->meta.ec);
        BT_ASSERT(notit->packet);
@@ -1207,7 +1200,7 @@ enum bt_notif_iter_status set_current_event_notification(
                notit->meta.ec->name->str,
                notit->packet);
        BT_ASSERT(notit->notif_iter);
-       notif = bt_private_notification_event_create(notit->notif_iter,
+       notif = bt_notification_event_create(notit->notif_iter,
                notit->meta.ec->ir_ec, notit->packet);
        if (!notif) {
                BT_LOGE("Cannot create event notification: "
@@ -1246,7 +1239,7 @@ enum bt_notif_iter_status after_event_header_state(
                goto end;
        }
 
-       notit->event = bt_private_notification_event_borrow_event(
+       notit->event = bt_notification_event_borrow_event(
                notit->event_notif);
        BT_ASSERT(notit->event);
 
@@ -2254,7 +2247,7 @@ static
 void set_event_default_clock_value(struct bt_notif_iter *notit)
 {
        struct bt_event *event =
-               bt_private_notification_event_borrow_event(
+               bt_notification_event_borrow_event(
                        notit->event_notif);
        struct bt_stream_class *sc = notit->meta.sc->ir_sc;
 
@@ -2268,10 +2261,10 @@ void set_event_default_clock_value(struct bt_notif_iter *notit)
 
 static
 void notify_new_stream(struct bt_notif_iter *notit,
-               struct bt_private_notification **notification)
+               struct bt_notification **notification)
 {
        enum bt_notif_iter_status status;
-       struct bt_private_notification *ret = NULL;
+       struct bt_notification *ret = NULL;
 
        status = set_current_stream(notit);
        if (status != BT_NOTIF_ITER_STATUS_OK) {
@@ -2281,7 +2274,7 @@ void notify_new_stream(struct bt_notif_iter *notit,
 
        BT_ASSERT(notit->stream);
        BT_ASSERT(notit->notif_iter);
-       ret = bt_private_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: "
@@ -2296,9 +2289,9 @@ end:
 
 static
 void notify_end_of_stream(struct bt_notif_iter *notit,
-               struct bt_private_notification **notification)
+               struct bt_notification **notification)
 {
-       struct bt_private_notification *ret;
+       struct bt_notification *ret;
 
        if (!notit->stream) {
                BT_LOGE("Cannot create stream for stream notification: "
@@ -2307,7 +2300,7 @@ void notify_end_of_stream(struct bt_notif_iter *notit,
        }
 
        BT_ASSERT(notit->notif_iter);
-       ret = bt_private_notification_stream_end_create(notit->notif_iter,
+       ret = bt_notification_stream_end_create(notit->notif_iter,
                notit->stream);
        if (!ret) {
                BT_LOGE("Cannot create stream beginning notification: "
@@ -2320,11 +2313,11 @@ void notify_end_of_stream(struct bt_notif_iter *notit,
 
 static
 void notify_new_packet(struct bt_notif_iter *notit,
-               struct bt_private_notification **notification)
+               struct bt_notification **notification)
 {
        int ret;
        enum bt_notif_iter_status status;
-       struct bt_private_notification *notif = NULL;
+       struct bt_notification *notif = NULL;
        const struct bt_stream_class *sc;
 
        status = set_current_packet(notit);
@@ -2399,7 +2392,7 @@ void notify_new_packet(struct bt_notif_iter *notit,
        }
 
        BT_ASSERT(notit->notif_iter);
-       notif = bt_private_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: "
@@ -2416,9 +2409,9 @@ end:
 
 static
 void notify_end_of_packet(struct bt_notif_iter *notit,
-               struct bt_private_notification **notification)
+               struct bt_notification **notification)
 {
-       struct bt_private_notification *notif;
+       struct bt_notification *notif;
 
        if (!notit->packet) {
                return;
@@ -2430,7 +2423,7 @@ void notify_end_of_packet(struct bt_notif_iter *notit,
        }
 
        BT_ASSERT(notit->notif_iter);
-       notif = bt_private_notification_packet_end_create(notit->notif_iter,
+       notif = bt_notification_packet_end_create(notit->notif_iter,
                notit->packet);
        if (!notif) {
                BT_LOGE("Cannot create packet end notification: "
@@ -2471,8 +2464,8 @@ struct bt_notif_iter *bt_notif_iter_create(struct ctf_trace_class *tc,
        BT_ASSERT(medops.request_bytes);
        BT_ASSERT(medops.borrow_stream);
        BT_LOGD("Creating CTF plugin notification iterator: "
-               "trace-addr=%p, trace-name=\"%s\", max-request-size=%zu, "
-               "data=%p", tc, tc->name->str, max_request_sz, data);
+               "trace-addr=%p, max-request-size=%zu, "
+               "data=%p", tc, max_request_sz, data);
        notit = g_new0(struct bt_notif_iter, 1);
        if (!notit) {
                BT_LOGE_STR("Failed to allocate one CTF plugin notification iterator.");
@@ -2499,10 +2492,9 @@ struct bt_notif_iter *bt_notif_iter_create(struct ctf_trace_class *tc,
 
        bt_notif_iter_reset(notit);
        BT_LOGD("Created CTF plugin notification iterator: "
-               "trace-addr=%p, trace-name=\"%s\", max-request-size=%zu, "
+               "trace-addr=%p, max-request-size=%zu, "
                "data=%p, notit-addr=%p",
-               tc, tc->name->str, max_request_sz, data,
-               notit);
+               tc, max_request_sz, data, notit);
        notit->cur_packet_offset = 0;
 
 end:
@@ -2542,7 +2534,7 @@ void bt_notif_iter_destroy(struct bt_notif_iter *notit)
 enum bt_notif_iter_status bt_notif_iter_get_next_notification(
                struct bt_notif_iter *notit,
                struct bt_self_notification_iterator *notif_iter,
-               struct bt_private_notification **notification)
+               struct bt_notification **notification)
 {
        enum bt_notif_iter_status status = BT_NOTIF_ITER_STATUS_OK;