From 53816eee3855d4e6086202542b9410e529dc80bc Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 18 Oct 2019 13:37:43 -0400 Subject: [PATCH] lib: remove unused bt_graph_remove_unconnected_component() Signed-off-by: Philippe Proulx Change-Id: Ief672565ec2a597ae5e3d1bdfd46f7f12656d09b Reviewed-on: https://review.lttng.org/c/babeltrace/+/2218 Tested-by: jenkins Reviewed-by: Francis Deslauriers --- src/lib/graph/graph.c | 77 ------------------------------------------- src/lib/graph/graph.h | 12 ------- 2 files changed, 89 deletions(-) diff --git a/src/lib/graph/graph.c b/src/lib/graph/graph.c index 32af1ef8..44a5e1b4 100644 --- a/src/lib/graph/graph.c +++ b/src/lib/graph/graph.c @@ -1506,83 +1506,6 @@ end: return status; } -BT_HIDDEN -int bt_graph_remove_unconnected_component(struct bt_graph *graph, - struct bt_component *component) -{ - bool init_can_consume; - uint64_t count; - uint64_t i; - int ret = 0; - - BT_ASSERT(graph); - BT_ASSERT(component); - BT_ASSERT(component->base.ref_count == 0); - BT_ASSERT(bt_component_borrow_graph(component) == graph); - - init_can_consume = graph->can_consume; - count = bt_component_get_input_port_count(component); - - for (i = 0; i < count; i++) { - struct bt_port *port = (void *) - bt_component_borrow_input_port_by_index(component, i); - - BT_ASSERT(port); - - if (bt_port_is_connected(port)) { - BT_LIB_LOGW_APPEND_CAUSE( - "Cannot remove component from graph: " - "an input port is connected: " - "%![graph-]+g, %![comp-]+c, %![port-]+p", - graph, component, port); - goto error; - } - } - - count = bt_component_get_output_port_count(component); - - for (i = 0; i < count; i++) { - struct bt_port *port = (void *) - bt_component_borrow_output_port_by_index(component, i); - - BT_ASSERT(port); - - if (bt_port_is_connected(port)) { - BT_LIB_LOGW_APPEND_CAUSE( - "Cannot remove component from graph: " - "an output port is connected: " - "%![graph-]+g, %![comp-]+c, %![port-]+p", - graph, component, port); - goto error; - } - } - - bt_graph_set_can_consume(graph, false); - - /* Possibly remove from sinks to consume */ - (void) g_queue_remove(graph->sinks_to_consume, component); - - if (graph->sinks_to_consume->length == 0) { - graph->has_sink = false; - } - - /* - * This calls bt_object_try_spec_release() on the component, and - * since its reference count is 0, its destructor is called. Its - * destructor calls the user's finalization method (if set). - */ - g_ptr_array_remove(graph->components, component); - goto end; - -error: - ret = -1; - -end: - (void) init_can_consume; - bt_graph_set_can_consume(graph, init_can_consume); - return ret; -} - BT_HIDDEN void bt_graph_add_message(struct bt_graph *graph, struct bt_message *msg) diff --git a/src/lib/graph/graph.h b/src/lib/graph/graph.h index 5fe6cb69..e18e63ff 100644 --- a/src/lib/graph/graph.h +++ b/src/lib/graph/graph.h @@ -183,18 +183,6 @@ BT_HIDDEN void bt_graph_remove_connection(struct bt_graph *graph, struct bt_connection *connection); -/* - * This only works with a component which is not connected at this - * point. - * - * Also the reference count of `component` should be 0 when you call - * this function, which means only `graph` owns the component, so it - * is safe to destroy. - */ -BT_HIDDEN -int bt_graph_remove_unconnected_component(struct bt_graph *graph, - struct bt_component *component); - BT_HIDDEN void bt_graph_add_message(struct bt_graph *graph, struct bt_message *msg); -- 2.34.1