void destroy_private_dummy_data(struct dummy *dummy)
{
- bt_put(dummy->notif_iter);
+ bt_object_put_ref(dummy->notif_iter);
g_free(dummy);
}
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;
connection = bt_private_port_get_private_connection(self_port);
BT_ASSERT(connection);
conn_status = bt_private_connection_create_notification_iterator(
- connection, NULL, &iterator);
+ connection, &iterator);
if (conn_status != BT_CONNECTION_STATUS_OK) {
- dummy->error = true;
+ status = BT_COMPONENT_STATUS_ERROR;
goto end;
}
- BT_MOVE(dummy->notif_iter, iterator);
+ BT_OBJECT_MOVE_REF(dummy->notif_iter, iterator);
end:
- bt_put(connection);
+ bt_object_put_ref(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;
}
/* Consume one notification */
- it_ret = bt_notification_iterator_next(dummy->notif_iter);
+ it_ret = bt_private_connection_notification_iterator_next(
+ dummy->notif_iter, ¬ifs, &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_object_put_ref(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;
}