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

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

diff --git a/lib/graph/connection.c b/lib/graph/connection.c
index 91d130edcf6c9147bcfac3f36ae69bde57bcc8b9..163a760b2d809b03529ca9b8e6adc4bf1fb8304d 100644 (file)
--- a/lib/graph/connection.c
+++ b/lib/graph/connection.c
@@ -79,9 +79,9 @@ void bt_connection_destroy(struct bt_object *obj)
 static
 void bt_connection_try_remove_from_graph(struct bt_connection *connection)
 {
-       void *graph = bt_object_borrow_parent(&connection->base);
+       void *graph = (void *) bt_object_borrow_parent(&connection->base);
 
-       if (connection->base.ref_count.count > 0 ||
+       if (connection->base.ref_count > 0 ||
                        connection->downstream_port ||
                        connection->upstream_port ||
                        connection->iterators->len > 0) {
@@ -151,8 +151,9 @@ struct bt_connection *bt_connection_create(
                goto end;
        }
 
-       bt_object_init(connection, bt_connection_destroy);
-       bt_object_set_parent_is_owner_listener(connection,
+       bt_object_init_shared_with_parent(&connection->base,
+               bt_connection_destroy);
+       bt_object_set_parent_is_owner_listener_func(&connection->base,
                bt_connection_parent_is_owner);
        connection->iterators = g_ptr_array_new();
        if (!connection->iterators) {
@@ -168,7 +169,7 @@ struct bt_connection *bt_connection_create(
        bt_port_set_connection(upstream_port, connection);
        BT_LOGD_STR("Setting downstream port's connection.");
        bt_port_set_connection(downstream_port, connection);
-       bt_object_set_parent(connection, &graph->base);
+       bt_object_set_parent(&connection->base, &graph->base);
        BT_LOGD("Created connection: "
                "graph-addr=%p, upstream-port-addr=%p, uptream-port-name=\"%s\", "
                "downstream-port-addr=%p, downstream-port-name=\"%s\", "
@@ -213,21 +214,25 @@ void bt_connection_end(struct bt_connection *conn,
                conn->upstream_port = NULL;
        }
 
-       if (downstream_comp) {
+       if (downstream_comp && conn->notified_downstream_port_connected) {
                /* bt_component_port_disconnected() logs details */
                bt_component_port_disconnected(downstream_comp,
                        downstream_port);
        }
 
-       if (upstream_comp) {
+       if (upstream_comp && conn->notified_upstream_port_connected) {
                /* bt_component_port_disconnected() logs details */
                bt_component_port_disconnected(upstream_comp, upstream_port);
        }
 
        BT_ASSERT(graph);
-       /* bt_graph_notify_ports_disconnected() logs details */
-       bt_graph_notify_ports_disconnected(graph, upstream_comp,
-               downstream_comp, upstream_port, downstream_port);
+
+       if (conn->notified_graph_ports_connected) {
+               /* bt_graph_notify_ports_disconnected() logs details */
+               bt_graph_notify_ports_disconnected(graph, upstream_comp,
+                       downstream_comp, upstream_port, downstream_port);
+       }
+
        bt_put(downstream_comp);
        bt_put(upstream_comp);