lib: use object pool for event and packet notifications

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

diff --git a/lib/graph/connection.c b/lib/graph/connection.c
index 6c41f4c96bb6d7f9ef825724e6d93a0e6eb8b64f..91d130edcf6c9147bcfac3f36ae69bde57bcc8b9 100644 (file)
--- a/lib/graph/connection.c
+++ b/lib/graph/connection.c
@@ -39,6 +39,7 @@
 #include <babeltrace/graph/port-internal.h>
 #include <babeltrace/object-internal.h>
 #include <babeltrace/compiler-internal.h>
+#include <babeltrace/assert-internal.h>
 #include <stdlib.h>
 #include <glib.h>
 
@@ -116,10 +117,10 @@ void bt_connection_parent_is_owner(struct bt_object *obj)
        bt_connection_try_remove_from_graph(connection);
 }
 
-struct bt_connection *bt_connection_from_private(
+struct bt_connection *bt_connection_borrow_from_private(
                struct bt_private_connection *private_connection)
 {
-       return bt_get(bt_connection_borrow_from_private(private_connection));
+       return (void *) private_connection;
 }
 
 BT_HIDDEN
@@ -223,7 +224,7 @@ void bt_connection_end(struct bt_connection *conn,
                bt_component_port_disconnected(upstream_comp, upstream_port);
        }
 
-       assert(graph);
+       BT_ASSERT(graph);
        /* bt_graph_notify_ports_disconnected() logs details */
        bt_graph_notify_ports_disconnected(graph, upstream_comp,
                downstream_comp, upstream_port, downstream_port);
@@ -273,7 +274,6 @@ struct bt_port *bt_connection_get_downstream_port(
 enum bt_connection_status
 bt_private_connection_create_notification_iterator(
                struct bt_private_connection *private_connection,
-               const enum bt_notification_type *notification_types,
                struct bt_notification_iterator **user_iterator)
 {
        enum bt_component_class_type upstream_comp_class_type;
@@ -284,10 +284,6 @@ bt_private_connection_create_notification_iterator(
        struct bt_connection *connection = NULL;
        bt_component_class_notification_iterator_init_method init_method = NULL;
        enum bt_connection_status status;
-       static const enum bt_notification_type all_notif_types[] = {
-               BT_NOTIFICATION_TYPE_ALL,
-               BT_NOTIFICATION_TYPE_SENTINEL,
-       };
 
        if (!private_connection) {
                BT_LOGW_STR("Invalid parameter: private connection is NULL.");
@@ -325,15 +321,10 @@ bt_private_connection_create_notification_iterator(
                goto end;
        }
 
-       if (!notification_types) {
-               BT_LOGD_STR("No notification types: subscribing to all notifications.");
-               notification_types = all_notif_types;
-       }
-
        upstream_port = connection->upstream_port;
-       assert(upstream_port);
+       BT_ASSERT(upstream_port);
        upstream_component = bt_port_get_component(upstream_port);
-       assert(upstream_component);
+       BT_ASSERT(upstream_component);
        upstream_comp_class = upstream_component->class;
        BT_LOGD("Creating notification iterator from connection: "
                "conn-addr=%p, upstream-port-addr=%p, "
@@ -344,10 +335,10 @@ bt_private_connection_create_notification_iterator(
                upstream_component, bt_component_get_name(upstream_component));
        upstream_comp_class_type =
                bt_component_get_class_type(upstream_component);
-       assert(upstream_comp_class_type == BT_COMPONENT_CLASS_TYPE_SOURCE ||
+       BT_ASSERT(upstream_comp_class_type == BT_COMPONENT_CLASS_TYPE_SOURCE ||
                        upstream_comp_class_type == BT_COMPONENT_CLASS_TYPE_FILTER);
        status = bt_private_connection_notification_iterator_create(upstream_component,
-               upstream_port, notification_types, connection, &iterator);
+               upstream_port, connection, &iterator);
        if (status != BT_CONNECTION_STATUS_OK) {
                BT_LOGW("Cannot create notification iterator from connection.");
                goto end;