lib: add internal object pool API and use it; adapt plugins/tests

[babeltrace.git] / lib / graph / iterator.c

diff --git a/lib/graph/iterator.c b/lib/graph/iterator.c
index b98121a1d596a65f06854b10b2318bde390d563d..61b5298bdcdc9c4bacac18760769de52f7c4b022 100644 (file)
--- a/lib/graph/iterator.c
+++ b/lib/graph/iterator.c
@@ -78,7 +78,7 @@ struct stream_state {
 };
 
 static
-void stream_destroy_listener(struct bt_stream *stream, void *data)
+void stream_destroy_listener(struct bt_stream_common *stream, void *data)
 {
        struct bt_notification_iterator_private_connection *iterator = data;
 
@@ -184,7 +184,7 @@ void bt_private_connection_notification_iterator_destroy(struct bt_object *obj)
                        BT_ASSERT(stream_gptr);
 
                        BT_LOGD_STR("Removing stream's destroy listener for notification iterator.");
-                       bt_stream_remove_destroy_listener(
+                       bt_stream_common_remove_destroy_listener(
                                (void *) stream_gptr, stream_destroy_listener,
                                iterator);
                }
@@ -390,12 +390,11 @@ bt_private_connection_private_notification_iterator_set_user_data(
        return BT_NOTIFICATION_ITERATOR_STATUS_OK;
 }
 
-struct bt_notification *bt_notification_iterator_get_notification(
+struct bt_notification *bt_notification_iterator_borrow_notification(
                struct bt_notification_iterator *iterator)
 {
        BT_ASSERT_PRE_NON_NULL(iterator, "Notification iterator");
-       return bt_get(
-               bt_notification_iterator_borrow_current_notification(iterator));
+       return bt_notification_iterator_borrow_current_notification(iterator);
 }
 
 BT_ASSERT_PRE_FUNC