lib: make the "port connected" method return a status

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

diff --git a/plugins/utils/dummy/dummy.c b/plugins/utils/dummy/dummy.c
index 5109259eff34033d172c923f8b8e707baa03d41b..af6e3cfbecbc019ed008c5df60452b912194d295 100644 (file)
--- a/plugins/utils/dummy/dummy.c
+++ b/plugins/utils/dummy/dummy.c
@@ -73,11 +73,12 @@ end:
        return ret;
 }
 
-void dummy_port_connected(
+enum bt_component_status dummy_port_connected(
                struct bt_private_component *component,
                struct bt_private_port *self_port,
                struct bt_port *other_port)
 {
+       enum bt_component_status status = BT_COMPONENT_STATUS_OK;
        struct dummy *dummy;
        struct bt_notification_iterator *iterator;
        struct bt_private_connection *connection;
@@ -90,7 +91,7 @@ void dummy_port_connected(
        conn_status = bt_private_connection_create_notification_iterator(
                connection, &iterator);
        if (conn_status != BT_CONNECTION_STATUS_OK) {
-               dummy->error = true;
+               status = BT_COMPONENT_STATUS_ERROR;
                goto end;
        }
 
@@ -98,23 +99,21 @@ void dummy_port_connected(
 
 end:
        bt_put(connection);
+       return status;
 }
 
 enum bt_component_status dummy_consume(struct bt_private_component *component)
 {
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-       struct bt_notification *notif = NULL;
+       bt_notification_array notifs;
+       uint64_t count;
        struct dummy *dummy;
        enum bt_notification_iterator_status it_ret;
+       uint64_t i;
 
        dummy = bt_private_component_get_user_data(component);
        BT_ASSERT(dummy);
 
-       if (unlikely(dummy->error)) {
-               ret = BT_COMPONENT_STATUS_ERROR;
-               goto end;
-       }
-
        if (unlikely(!dummy->notif_iter)) {
                ret = BT_COMPONENT_STATUS_END;
                goto end;
@@ -122,22 +121,29 @@ enum bt_component_status dummy_consume(struct bt_private_component *component)
 
        /* Consume one notification  */
        it_ret = bt_private_connection_notification_iterator_next(
-               dummy->notif_iter, &notif);
+               dummy->notif_iter, &notifs, &count);
        switch (it_ret) {
-       case BT_NOTIFICATION_ITERATOR_STATUS_ERROR:
-               ret = BT_COMPONENT_STATUS_ERROR;
-               goto end;
+       case BT_NOTIFICATION_ITERATOR_STATUS_OK:
+               ret = BT_COMPONENT_STATUS_OK;
+
+               for (i = 0; i < count; i++) {
+                       bt_put(notifs[i]);
+               }
+
+               break;
        case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN:
                ret = BT_COMPONENT_STATUS_AGAIN;
                goto end;
        case BT_NOTIFICATION_ITERATOR_STATUS_END:
                ret = BT_COMPONENT_STATUS_END;
                goto end;
+       case BT_NOTIFICATION_ITERATOR_STATUS_ERROR:
+               ret = BT_COMPONENT_STATUS_ERROR;
+               goto end;
        default:
                break;
        }
 
 end:
-       bt_put(notif);
        return ret;
 }