X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fconnection.c;h=00b3a2a707ec3d4e4387aa8f0f5da9b8ab800853;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=c7e32c071bd4d97a6641ca51038058c1883e55c5;hpb=73d5c1adb1411e16c9c613c38a4c74a29ee608ae;p=babeltrace.git diff --git a/lib/graph/connection.c b/lib/graph/connection.c index c7e32c07..00b3a2a7 100644 --- a/lib/graph/connection.c +++ b/lib/graph/connection.c @@ -1,12 +1,7 @@ /* - * connection.c - * - * Babeltrace Connection - * + * Copyright 2017-2018 Philippe Proulx * Copyright 2017 Jérémie Galarneau * - * Author: Jérémie Galarneau - * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights @@ -27,75 +22,61 @@ */ #define BT_LOG_TAG "CONNECTION" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include static -void bt_connection_destroy(struct bt_object *obj) +void destroy_connection(struct bt_object *obj) { struct bt_connection *connection = container_of(obj, struct bt_connection, base); - size_t i; - BT_LOGD("Destroying connection: addr=%p", connection); + BT_LIB_LOGD("Destroying connection: %!+x", connection); /* - * Make sure that each notification iterator which was created - * for this connection is finalized before we destroy it. Once a - * notification iterator is finalized, all its method return - * NULL or the BT_NOTIFICATION_ITERATOR_STATUS_CANCELED status. + * Make sure that each message iterator which was created for + * this connection is finalized before we destroy it. Once a + * message iterator is finalized, all its method return NULL or + * the BT_MESSAGE_ITERATOR_STATUS_CANCELED status. * * Because connections are destroyed before components within a - * graph, this ensures that notification iterators are always + * graph, this ensures that message iterators are always * finalized before their upstream component. + * + * Ending the connection does exactly this. We pass `false` to + * bt_connection_end() here to avoid removing this connection + * from the graph: if we're here, we're already in the graph's + * destructor. */ - if (connection->iterators) { - for (i = 0; i < connection->iterators->len; i++) { - struct bt_notification_iterator *iterator = - g_ptr_array_index(connection->iterators, i); - - BT_LOGD("Finalizing notification iterator created by this connection: " - "iter-addr=%p", iterator); - bt_notification_iterator_finalize(iterator); - - /* - * Make sure this iterator does not try to - * remove itself from this connection's - * iterators on destruction because this - * connection won't exist anymore. - */ - bt_notification_iterator_set_connection(iterator, - NULL); - } - - g_ptr_array_free(connection->iterators, TRUE); - } + bt_connection_end(connection, false); + g_ptr_array_free(connection->iterators, TRUE); + connection->iterators = NULL; /* - * No bt_put on ports as a connection only holds _weak_ references - * to them. + * No bt_object_put_ref on ports as a connection only holds _weak_ + * references to them. */ g_free(connection); } static -void bt_connection_try_remove_from_graph(struct bt_connection *connection) +void try_remove_connection_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) { @@ -106,7 +87,7 @@ void bt_connection_try_remove_from_graph(struct bt_connection *connection) * At this point we know that: * * 1. The connection is ended (ports were disconnected). - * 2. All the notification iterators that this connection + * 2. All the message iterators that this connection * created, if any, are finalized. * 3. The connection's reference count is 0, so only the * parent (graph) owns this connection after this call. @@ -117,298 +98,165 @@ void bt_connection_try_remove_from_graph(struct bt_connection *connection) * It is safe to remove the connection from the graph, therefore * destroying it. */ - BT_LOGD("Removing self from graph's connections: " - "graph-addr=%p, conn-addr=%p", graph, connection); + BT_LIB_LOGD("Removing self from graph's connections: " + "%![graph-]+g, %![conn-]+x", graph, connection); bt_graph_remove_connection(graph, connection); } static -void bt_connection_parent_is_owner(struct bt_object *obj) +void parent_is_owner(struct bt_object *obj) { struct bt_connection *connection = container_of(obj, struct bt_connection, base); - bt_connection_try_remove_from_graph(connection); -} - -struct bt_connection *bt_connection_from_private_connection( - struct bt_private_connection *private_connection) -{ - return bt_get(bt_connection_from_private(private_connection)); + try_remove_connection_from_graph(connection); } BT_HIDDEN -struct bt_connection *bt_connection_create( - struct bt_graph *graph, +struct bt_connection *bt_connection_create(struct bt_graph *graph, struct bt_port *upstream_port, struct bt_port *downstream_port) { struct bt_connection *connection = NULL; - if (bt_port_get_type(upstream_port) != BT_PORT_TYPE_OUTPUT) { - BT_LOGW_STR("Invalid parameter: upstream port is not an output port."); - goto end; - } - if (bt_port_get_type(downstream_port) != BT_PORT_TYPE_INPUT) { - BT_LOGW_STR("Invalid parameter: downstream port is not an input port."); - goto end; - } - - BT_LOGD("Creating connection: " - "graph-addr=%p, upstream-port-addr=%p, uptream-port-name=\"%s\", " - "downstream-port-addr=%p, downstream-port-name=\"%s\"", - graph, upstream_port, bt_port_get_name(upstream_port), - downstream_port, bt_port_get_name(downstream_port)); + BT_LIB_LOGD("Creating connection: " + "%![graph-]+g, %![up-port-]+p, %![down-port-]+p", + graph, upstream_port, downstream_port); connection = g_new0(struct bt_connection, 1); if (!connection) { BT_LOGE_STR("Failed to allocate one connection."); goto end; } - bt_object_init(connection, bt_connection_destroy); - bt_object_set_parent_is_owner_listener(connection, - bt_connection_parent_is_owner); + bt_object_init_shared_with_parent(&connection->base, + destroy_connection); + bt_object_set_parent_is_owner_listener_func(&connection->base, + parent_is_owner); connection->iterators = g_ptr_array_new(); if (!connection->iterators) { BT_LOGE_STR("Failed to allocate a GPtrArray."); - BT_PUT(connection); + BT_OBJECT_PUT_REF_AND_RESET(connection); goto end; } /* Weak references are taken, see comment in header. */ connection->upstream_port = upstream_port; connection->downstream_port = downstream_port; - BT_LOGD_STR("Setting upstream port's connection."); + BT_LIB_LOGD("Setting upstream port's connection: %!+p", upstream_port); bt_port_set_connection(upstream_port, connection); - BT_LOGD_STR("Setting downstream port's connection."); + BT_LIB_LOGD("Setting downstream port's connection: %!+p", + downstream_port); bt_port_set_connection(downstream_port, connection); - bt_object_set_parent(connection, &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\", " - "conn-addr=%p", - graph, upstream_port, bt_port_get_name(upstream_port), - downstream_port, bt_port_get_name(downstream_port), - connection); + bt_object_set_parent(&connection->base, &graph->base); + BT_LIB_LOGD("Created connection: %!+x", connection); end: return connection; } BT_HIDDEN -void bt_connection_disconnect_ports(struct bt_connection *conn) +void bt_connection_end(struct bt_connection *conn, bool try_remove_from_graph) { - struct bt_component *downstream_comp = NULL; - struct bt_component *upstream_comp = NULL; struct bt_port *downstream_port = conn->downstream_port; struct bt_port *upstream_port = conn->upstream_port; - struct bt_graph *graph = (void *) bt_object_borrow_parent(conn); size_t i; + BT_LIB_LOGD("Ending connection: %!+x, try-remove-from-graph=%d", + conn, try_remove_from_graph); + + /* + * Any of the following message callback functions could + * remove one of the connection's ports from its component. To + * make sure that at least logging in called functions works + * with existing objects, get a local reference on both ports. + */ + bt_object_get_ref(downstream_port); + bt_object_get_ref(upstream_port); + if (downstream_port) { - downstream_comp = bt_port_get_component(downstream_port); + BT_LIB_LOGD("Disconnecting connection's downstream port: %!+p", + downstream_port); bt_port_set_connection(downstream_port, NULL); conn->downstream_port = NULL; } if (upstream_port) { - upstream_comp = bt_port_get_component(upstream_port); + BT_LIB_LOGD("Disconnecting connection's upstream port: %!+p", + upstream_port); bt_port_set_connection(upstream_port, NULL); conn->upstream_port = NULL; } - if (downstream_comp) { - /* bt_component_port_disconnected() logs details */ - bt_component_port_disconnected(downstream_comp, - downstream_port); - } - - if (upstream_comp) { - /* bt_component_port_disconnected() logs details */ - bt_component_port_disconnected(upstream_comp, upstream_port); - } - - assert(graph); - /* 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); + /* + * It is safe to put the local port references now that we don't + * need them anymore. This could indeed destroy them. + */ + bt_object_put_ref(downstream_port); + bt_object_put_ref(upstream_port); /* - * Because this connection is ended, finalize (cancel) each - * notification iterator created from it. + * Because this connection is ended, finalize each message + * iterator created from it. + * + * In practice, this only happens when the connection is + * destroyed and not all its message iterators were finalized, + * which is on graph destruction. */ for (i = 0; i < conn->iterators->len; i++) { - struct bt_notification_iterator *iterator = + struct bt_self_component_port_input_message_iterator *iterator = g_ptr_array_index(conn->iterators, i); - BT_LOGD("Finalizing notification iterator created by this ended connection: " - "conn-addr=%p, iter-addr=%p", conn, iterator); - bt_notification_iterator_finalize(iterator); + BT_LIB_LOGD("Finalizing message iterator created by " + "this ended connection: %![iter-]+i", iterator); + bt_self_component_port_input_message_iterator_try_finalize( + iterator); /* * Make sure this iterator does not try to remove itself * from this connection's iterators on destruction * because this connection won't exist anymore. */ - bt_notification_iterator_set_connection(iterator, - NULL); + bt_self_component_port_input_message_iterator_set_connection( + iterator, NULL); } g_ptr_array_set_size(conn->iterators, 0); - bt_connection_try_remove_from_graph(conn); -} -struct bt_port *bt_connection_get_upstream_port( - struct bt_connection *connection) -{ - return connection ? bt_get(connection->upstream_port) : NULL; + if (try_remove_from_graph) { + try_remove_connection_from_graph(conn); + } } -struct bt_port *bt_connection_get_downstream_port( - struct bt_connection *connection) +const struct bt_port_output *bt_connection_borrow_upstream_port_const( + const struct bt_connection *connection) { - return connection ? bt_get(connection->downstream_port) : NULL; + BT_ASSERT_PRE_NON_NULL(connection, "Connection"); + return (void *) connection->upstream_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) +const struct bt_port_input *bt_connection_borrow_downstream_port_const( + const struct bt_connection *connection) { - enum bt_component_class_type upstream_comp_class_type; - struct bt_notification_iterator *iterator = NULL; - struct bt_port *upstream_port = NULL; - struct bt_component *upstream_component = NULL; - struct bt_component_class *upstream_comp_class = NULL; - 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."); - status = BT_CONNECTION_STATUS_INVALID; - goto end; - } - - if (!user_iterator) { - BT_LOGW_STR("Invalid parameter: notification iterator pointer is NULL."); - status = BT_CONNECTION_STATUS_INVALID; - goto end; - } - - if (!notification_types) { - BT_LOGD_STR("No notification types: subscribing to all notifications."); - notification_types = all_notif_types; - } - - connection = bt_connection_from_private(private_connection); - if (bt_connection_is_ended(connection)) { - BT_LOGW("Invalid parameter: connection is ended: " - "conn-addr=%p", connection); - status = BT_CONNECTION_STATUS_IS_ENDED; - goto end; - } - - upstream_port = connection->upstream_port; - assert(upstream_port); - upstream_component = bt_port_get_component(upstream_port); - assert(upstream_component); - upstream_comp_class = upstream_component->class; - BT_LOGD("Creating notification iterator from connection: " - "conn-addr=%p, upstream-port-addr=%p, " - "upstream-port-name=\"%s\", upstream-comp-addr=%p, " - "upstream-comp-name=\"%s\"", - connection, connection->upstream_port, - bt_port_get_name(connection->upstream_port), - 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 || - upstream_comp_class_type == BT_COMPONENT_CLASS_TYPE_FILTER); - status = bt_notification_iterator_create(upstream_component, - upstream_port, notification_types, connection, &iterator); - if (status != BT_CONNECTION_STATUS_OK) { - BT_LOGW("Cannot create notification iterator from connection."); - goto end; - } - - switch (upstream_comp_class_type) { - case BT_COMPONENT_CLASS_TYPE_SOURCE: - { - struct bt_component_class_source *source_class = - container_of(upstream_comp_class, - struct bt_component_class_source, parent); - init_method = source_class->methods.iterator.init; - break; - } - case BT_COMPONENT_CLASS_TYPE_FILTER: - { - struct bt_component_class_filter *filter_class = - container_of(upstream_comp_class, - struct bt_component_class_filter, parent); - init_method = filter_class->methods.iterator.init; - break; - } - default: - /* Unreachable. */ - BT_LOGF("Unknown component class type: type=%d", - upstream_comp_class_type); - abort(); - } - - if (init_method) { - enum bt_notification_iterator_status iter_status; - - BT_LOGD("Calling user's initialization method: iter-addr=%p", - iterator); - iter_status = init_method( - bt_private_notification_iterator_from_notification_iterator(iterator), - bt_private_port_from_port(upstream_port)); - BT_LOGD("User method returned: status=%s", - bt_notification_iterator_status_string(iter_status)); - if (iter_status != BT_NOTIFICATION_ITERATOR_STATUS_OK) { - BT_LOGW_STR("Initialization method failed."); - status = bt_connection_status_from_notification_iterator_status( - iter_status); - goto end; - } - } - - g_ptr_array_add(connection->iterators, iterator); - BT_LOGD("Created notification iterator from connection: " - "conn-addr=%p, upstream-port-addr=%p, " - "upstream-port-name=\"%s\", upstream-comp-addr=%p, " - "upstream-comp-name=\"%s\", iter-addr=%p", - connection, connection->upstream_port, - bt_port_get_name(connection->upstream_port), - upstream_component, bt_component_get_name(upstream_component), - iterator); - BT_MOVE(*user_iterator, iterator); - -end: - bt_put(upstream_component); - bt_put(iterator); - return status; + BT_ASSERT_PRE_NON_NULL(connection, "Connection"); + return (void *) connection->downstream_port; } BT_HIDDEN void bt_connection_remove_iterator(struct bt_connection *conn, - struct bt_notification_iterator *iterator) + struct bt_self_component_port_input_message_iterator *iterator) { g_ptr_array_remove(conn->iterators, iterator); - BT_LOGV("Removed notification iterator from connection: " - "conn-addr=%p, iter-addr=%p", conn, iterator); - bt_connection_try_remove_from_graph(conn); + BT_LIB_LOGV("Removed message iterator from connection: " + "%![conn-]+x, %![iter-]+i", conn, iterator); + try_remove_connection_from_graph(conn); +} + +void bt_connection_get_ref(const struct bt_connection *connection) +{ + bt_object_get_ref(connection); } -bt_bool bt_connection_is_ended(struct bt_connection *connection) +void bt_connection_put_ref(const struct bt_connection *connection) { - return !connection->downstream_port && !connection->upstream_port; + bt_object_put_ref(connection); }