lib: rename "notification" -> "message"

[babeltrace.git] / plugins / utils / dummy / dummy.c

diff --git a/plugins/utils/dummy/dummy.c b/plugins/utils/dummy/dummy.c
index b3178416bfd8f692edd125bbe2419b53240c38b3..5d513cf216b66ee47fe8cdad653fd6edaee79d02 100644 (file)
--- a/plugins/utils/dummy/dummy.c
+++ b/plugins/utils/dummy/dummy.c
@@ -28,27 +28,28 @@
 
 void destroy_private_dummy_data(struct dummy *dummy)
 {
-       bt_object_put_ref(dummy->notif_iter);
+       bt_self_component_port_input_message_iterator_put_ref(dummy->msg_iter);
        g_free(dummy);
 
 }
 
 BT_HIDDEN
-void dummy_finalize(struct bt_self_component_sink *comp)
+void dummy_finalize(bt_self_component_sink *comp)
 {
        struct dummy *dummy;
 
        BT_ASSERT(comp);
        dummy = bt_self_component_get_data(
-                       bt_self_component_sink_borrow_self_component(comp));
+                       bt_self_component_sink_as_self_component(comp));
        BT_ASSERT(dummy);
        destroy_private_dummy_data(dummy);
 }
 
 BT_HIDDEN
 enum bt_self_component_status dummy_init(
-               struct bt_self_component_sink *component,
-               struct bt_value *params, UNUSED_VAR void *init_method_data)
+               bt_self_component_sink *component,
+               const bt_value *params,
+               UNUSED_VAR void *init_method_data)
 {
        enum bt_self_component_status ret;
        struct dummy *dummy = g_new0(struct dummy, 1);
@@ -65,7 +66,7 @@ enum bt_self_component_status dummy_init(
        }
 
        bt_self_component_set_data(
-               bt_self_component_sink_borrow_self_component(component), dummy);
+               bt_self_component_sink_as_self_component(component), dummy);
        goto end;
 
 error:
@@ -77,25 +78,26 @@ end:
 
 BT_HIDDEN
 enum bt_self_component_status dummy_port_connected(
-               struct bt_self_component_sink *comp,
-               struct bt_self_component_port_input *self_port,
-               struct bt_port_output *other_port)
+               bt_self_component_sink *comp,
+               bt_self_component_port_input *self_port,
+               const bt_port_output *other_port)
 {
        enum bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
        struct dummy *dummy;
-       struct bt_self_component_port_input_notification_iterator *iterator;
+       bt_self_component_port_input_message_iterator *iterator;
 
        dummy = bt_self_component_get_data(
-               bt_self_component_sink_borrow_self_component(comp));
+               bt_self_component_sink_as_self_component(comp));
        BT_ASSERT(dummy);
-       iterator = bt_self_component_port_input_notification_iterator_create(
+       iterator = bt_self_component_port_input_message_iterator_create(
                self_port);
        if (!iterator) {
                status = BT_SELF_COMPONENT_STATUS_NOMEM;
                goto end;
        }
 
-       BT_OBJECT_MOVE_REF(dummy->notif_iter, iterator);
+       BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_MOVE_REF(
+               dummy->msg_iter, iterator);
 
 end:
        return status;
@@ -103,46 +105,46 @@ end:
 
 BT_HIDDEN
 enum bt_self_component_status dummy_consume(
-               struct bt_self_component_sink *component)
+               bt_self_component_sink *component)
 {
        enum bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
-       bt_notification_array notifs;
+       bt_message_array_const msgs;
        uint64_t count;
        struct dummy *dummy;
-       enum bt_notification_iterator_status it_ret;
+       enum bt_message_iterator_status it_ret;
        uint64_t i;
 
        dummy = bt_self_component_get_data(
-               bt_self_component_sink_borrow_self_component(component));
+               bt_self_component_sink_as_self_component(component));
        BT_ASSERT(dummy);
 
-       if (unlikely(!dummy->notif_iter)) {
+       if (unlikely(!dummy->msg_iter)) {
                ret = BT_SELF_COMPONENT_STATUS_END;
                goto end;
        }
 
-       /* Consume one notification  */
-       it_ret = bt_self_component_port_input_notification_iterator_next(
-               dummy->notif_iter, &notifs, &count);
+       /* Consume one message  */
+       it_ret = bt_self_component_port_input_message_iterator_next(
+               dummy->msg_iter, &msgs, &count);
        switch (it_ret) {
-       case BT_NOTIFICATION_ITERATOR_STATUS_OK:
+       case BT_MESSAGE_ITERATOR_STATUS_OK:
                ret = BT_SELF_COMPONENT_STATUS_OK;
 
                for (i = 0; i < count; i++) {
-                       bt_object_put_ref(notifs[i]);
+                       bt_message_put_ref(msgs[i]);
                }
 
                break;
-       case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN:
+       case BT_MESSAGE_ITERATOR_STATUS_AGAIN:
                ret = BT_SELF_COMPONENT_STATUS_AGAIN;
                goto end;
-       case BT_NOTIFICATION_ITERATOR_STATUS_END:
+       case BT_MESSAGE_ITERATOR_STATUS_END:
                ret = BT_SELF_COMPONENT_STATUS_END;
                goto end;
-       case BT_NOTIFICATION_ITERATOR_STATUS_ERROR:
+       case BT_MESSAGE_ITERATOR_STATUS_ERROR:
                ret = BT_SELF_COMPONENT_STATUS_ERROR;
                goto end;
-       case BT_NOTIFICATION_ITERATOR_STATUS_NOMEM:
+       case BT_MESSAGE_ITERATOR_STATUS_NOMEM:
                ret = BT_SELF_COMPONENT_STATUS_NOMEM;
                goto end;
        default: