X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fgraph.c;h=37c239946cdeb6d17735b8a5a74d97ba1fbda42f;hb=867eb7632255f6a84234542198bd7edaac1bce12;hp=3c9be9ef28c358a025f429748533d9d5b4fddae0;hpb=602362a632f41fd414e4a1f6c51c5cc47fc57af2;p=babeltrace.git

diff --git a/src/lib/graph/graph.c b/src/lib/graph/graph.c
index 3c9be9ef..37c23994 100644
--- a/src/lib/graph/graph.c
+++ b/src/lib/graph/graph.c
@@ -1,45 +1,26 @@
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * 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
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
 #define BT_LOG_TAG "LIB/GRAPH"
 #include "lib/logging.h"
 
 #include "common/assert.h"
-#include "lib/assert-pre.h"
-#include "lib/assert-post.h"
+#include "lib/assert-cond.h"
 #include <babeltrace2/graph/graph.h>
-#include <babeltrace2/graph/graph-const.h>
-#include <babeltrace2/graph/component-source-const.h>
-#include <babeltrace2/graph/component-filter-const.h>
-#include <babeltrace2/graph/port-const.h>
+#include <babeltrace2/graph/component.h>
+#include <babeltrace2/graph/port.h>
 #include "lib/graph/message/message.h"
 #include "compat/compiler.h"
 #include "common/common.h"
 #include <babeltrace2/types.h>
 #include <babeltrace2/value.h>
-#include <babeltrace2/value-const.h>
 #include "lib/value.h"
 #include <unistd.h>
+#include <stdbool.h>
 #include <glib.h>
 
 #include "component-class-sink-simple.h"
@@ -54,26 +35,12 @@
 typedef enum bt_graph_listener_func_status
 (*port_added_func_t)(const void *, const void *, void *);
 
-typedef enum bt_graph_listener_func_status
-(*ports_connected_func_t)(const void *, const void *, const void *,
-		const void *, void *);
-
 typedef enum bt_component_class_initialize_method_status
 (*comp_init_method_t)(const void *, void *, const void *, void *);
 
-struct bt_graph_listener {
-	bt_graph_listener_removed_func removed;
-	void *data;
-};
-
 struct bt_graph_listener_port_added {
-	struct bt_graph_listener base;
 	port_added_func_t func;
-};
-
-struct bt_graph_listener_ports_connected {
-	struct bt_graph_listener base;
-	ports_connected_func_t func;
+	void *data;
 };
 
 #define INIT_LISTENERS_ARRAY(_type, _listeners)				\
@@ -85,23 +52,6 @@ struct bt_graph_listener_ports_connected {
 		}							\
 	} while (0)
 
-#define CALL_REMOVE_LISTENERS(_type, _listeners)			\
-	do {								\
-		size_t i;						\
-									\
-		if (!_listeners) {					\
-			break;						\
-		}							\
-		for (i = 0; i < (_listeners)->len; i++) {		\
-			_type *listener =				\
-				&g_array_index((_listeners), _type, i);	\
-									\
-			if (listener->base.removed) {			\
-				listener->base.removed(listener->base.data); \
-			}						\
-		}							\
-	} while (0)
-
 static
 void destroy_graph(struct bt_object *obj)
 {
@@ -137,24 +87,6 @@ void destroy_graph(struct bt_object *obj)
 	obj->ref_count++;
 	graph->config_state = BT_GRAPH_CONFIGURATION_STATE_DESTROYING;
 
-	/* Call all remove listeners */
-	CALL_REMOVE_LISTENERS(struct bt_graph_listener_port_added,
-		graph->listeners.source_output_port_added);
-	CALL_REMOVE_LISTENERS(struct bt_graph_listener_port_added,
-		graph->listeners.filter_output_port_added);
-	CALL_REMOVE_LISTENERS(struct bt_graph_listener_port_added,
-		graph->listeners.filter_input_port_added);
-	CALL_REMOVE_LISTENERS(struct bt_graph_listener_port_added,
-		graph->listeners.sink_input_port_added);
-	CALL_REMOVE_LISTENERS(struct bt_graph_listener_ports_connected,
-		graph->listeners.source_filter_ports_connected);
-	CALL_REMOVE_LISTENERS(struct bt_graph_listener_ports_connected,
-		graph->listeners.filter_filter_ports_connected);
-	CALL_REMOVE_LISTENERS(struct bt_graph_listener_ports_connected,
-		graph->listeners.source_sink_ports_connected);
-	CALL_REMOVE_LISTENERS(struct bt_graph_listener_ports_connected,
-		graph->listeners.filter_sink_ports_connected);
-
 	if (graph->messages) {
 		g_ptr_array_free(graph->messages, TRUE);
 		graph->messages = NULL;
@@ -205,30 +137,6 @@ void destroy_graph(struct bt_object *obj)
 		graph->listeners.sink_input_port_added = NULL;
 	}
 
-	if (graph->listeners.source_filter_ports_connected) {
-		g_array_free(graph->listeners.source_filter_ports_connected,
-			TRUE);
-		graph->listeners.source_filter_ports_connected = NULL;
-	}
-
-	if (graph->listeners.filter_filter_ports_connected) {
-		g_array_free(graph->listeners.filter_filter_ports_connected,
-			TRUE);
-		graph->listeners.filter_filter_ports_connected = NULL;
-	}
-
-	if (graph->listeners.source_sink_ports_connected) {
-		g_array_free(graph->listeners.source_sink_ports_connected,
-			TRUE);
-		graph->listeners.source_sink_ports_connected = NULL;
-	}
-
-	if (graph->listeners.filter_sink_ports_connected) {
-		g_array_free(graph->listeners.filter_sink_ports_connected,
-			TRUE);
-		graph->listeners.filter_sink_ports_connected = NULL;
-	}
-
 	bt_object_pool_finalize(&graph->event_msg_pool);
 	bt_object_pool_finalize(&graph->packet_begin_msg_pool);
 	bt_object_pool_finalize(&graph->packet_end_msg_pool);
@@ -267,7 +175,9 @@ struct bt_graph *bt_graph_create(uint64_t mip_version)
 	struct bt_graph *graph;
 	int ret;
 
-	BT_ASSERT_PRE(mip_version <= bt_get_maximal_mip_version(),
+	BT_ASSERT_PRE_NO_ERROR();
+	BT_ASSERT_PRE("valid-mip-version",
+		mip_version <= bt_get_maximal_mip_version(),
 		"Unknown MIP version: mip-version=%" PRIu64 ", "
 		"max-mip-version=%" PRIu64,
 		mip_version, bt_get_maximal_mip_version());
@@ -327,34 +237,6 @@ struct bt_graph *bt_graph_create(uint64_t mip_version)
 		goto error;
 	}
 
-	INIT_LISTENERS_ARRAY(struct bt_graph_listener_ports_connected,
-		graph->listeners.source_filter_ports_connected);
-
-	if (!graph->listeners.source_filter_ports_connected) {
-		goto error;
-	}
-
-	INIT_LISTENERS_ARRAY(struct bt_graph_listener_ports_connected,
-		graph->listeners.source_sink_ports_connected);
-
-	if (!graph->listeners.source_sink_ports_connected) {
-		goto error;
-	}
-
-	INIT_LISTENERS_ARRAY(struct bt_graph_listener_ports_connected,
-		graph->listeners.filter_filter_ports_connected);
-
-	if (!graph->listeners.filter_filter_ports_connected) {
-		goto error;
-	}
-
-	INIT_LISTENERS_ARRAY(struct bt_graph_listener_ports_connected,
-		graph->listeners.filter_sink_ports_connected);
-
-	if (!graph->listeners.filter_sink_ports_connected) {
-		goto error;
-	}
-
 	graph->interrupters = g_ptr_array_new_with_free_func(
 		(GDestroyNotify) bt_object_put_ref_no_null_check);
 	if (!graph->interrupters) {
@@ -422,7 +304,6 @@ enum bt_graph_connect_ports_status bt_graph_connect_ports(
 		const struct bt_connection **user_connection)
 {
 	enum bt_graph_connect_ports_status status = BT_FUNC_STATUS_OK;
-	enum bt_graph_listener_func_status listener_status;
 	struct bt_connection *connection = NULL;
 	struct bt_port *upstream_port = (void *) upstream_port_out;
 	struct bt_port *downstream_port = (void *) downstream_port_in;
@@ -431,20 +312,26 @@ enum bt_graph_connect_ports_status bt_graph_connect_ports(
 	enum bt_component_class_port_connected_method_status port_connected_status;
 	bool init_can_consume;
 
-	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	BT_ASSERT_PRE_NON_NULL(upstream_port, "Upstream port");
-	BT_ASSERT_PRE_NON_NULL(downstream_port, "Downstream port port");
-	BT_ASSERT_PRE(
+	BT_ASSERT_PRE_NO_ERROR();
+	BT_ASSERT_PRE_GRAPH_NON_NULL(graph);
+	BT_ASSERT_PRE_NON_NULL("upstream-port", upstream_port, "Upstream port");
+	BT_ASSERT_PRE_NON_NULL("downstream-port", downstream_port,
+		"Downstream port port");
+	BT_ASSERT_PRE("graph-is-not-configured",
 		graph->config_state == BT_GRAPH_CONFIGURATION_STATE_CONFIGURING,
 		"Graph is not in the \"configuring\" state: %!+g", graph);
-	BT_ASSERT_PRE(!bt_port_is_connected(upstream_port),
+	BT_ASSERT_PRE("upstream-port-is-not-connected",
+		!bt_port_is_connected(upstream_port),
 		"Upstream port is already connected: %!+p", upstream_port);
-	BT_ASSERT_PRE(!bt_port_is_connected(downstream_port),
+	BT_ASSERT_PRE("downstream-port-is-not-connected",
+		!bt_port_is_connected(downstream_port),
 		"Downstream port is already connected: %!+p", downstream_port);
-	BT_ASSERT_PRE(bt_port_borrow_component_inline((void *) upstream_port),
+	BT_ASSERT_PRE("upstream-port-has-component",
+		bt_port_borrow_component_inline((void *) upstream_port),
 		"Upstream port does not belong to a component: %!+p",
 		upstream_port);
-	BT_ASSERT_PRE(bt_port_borrow_component_inline((void *) downstream_port),
+	BT_ASSERT_PRE("downstream-port-has-component",
+		bt_port_borrow_component_inline((void *) downstream_port),
 		"Downstream port does not belong to a component: %!+p",
 		downstream_port);
 	init_can_consume = graph->can_consume;
@@ -523,27 +410,6 @@ enum bt_graph_connect_ports_status bt_graph_connect_ports(
 
 	connection->notified_downstream_port_connected = true;
 
-	/*
-	 * Notify the graph's creator that both ports are connected.
-	 */
-	BT_LOGD_STR("Notifying graph's user that new component ports are connected.");
-	listener_status = bt_graph_notify_ports_connected(graph, upstream_port, downstream_port);
-	if (listener_status != BT_FUNC_STATUS_OK) {
-		if (listener_status < 0) {
-			BT_LIB_LOGW_APPEND_CAUSE(
-				"Graph \"ports connected\" listener failed: "
-				"status=%d, %![graph-]+g, %![up-comp-]+c, "
-				"%![down-comp-]+c, %![up-port-]+p, %![down-port-]+p",
-				listener_status, graph,
-				upstream_component, downstream_component,
-				upstream_port, downstream_port);
-		}
-
-		status = (int) listener_status;
-		goto end;
-	}
-
-	connection->notified_graph_ports_connected = true;
 	BT_LIB_LOGI("Connected component ports within graph: "
 		"%![graph-]+g, %![up-comp-]+c, %![down-comp-]+c, "
 		"%![up-port-]+p, %![down-port-]+p",
@@ -553,7 +419,6 @@ enum bt_graph_connect_ports_status bt_graph_connect_ports(
 	if (user_connection) {
 		/* Move reference to user */
 		*user_connection = connection;
-		connection = NULL;
 	}
 
 end:
@@ -567,26 +432,31 @@ end:
 	return status;
 }
 
+#define CONSUME_METHOD_NAME	"bt_component_class_sink_consume_method"
+
 static inline
 int consume_graph_sink(struct bt_component_sink *comp)
 {
 	enum bt_component_class_sink_consume_method_status consume_status;
 	struct bt_component_class_sink *sink_class = NULL;
 
-	BT_ASSERT(comp);
+	BT_ASSERT_DBG(comp);
 	sink_class = (void *) comp->parent.class;
-	BT_ASSERT(sink_class->methods.consume);
+	BT_ASSERT_DBG(sink_class->methods.consume);
 	BT_LIB_LOGD("Calling user's consume method: %!+c", comp);
 	consume_status = sink_class->methods.consume((void *) comp);
 	BT_LOGD("User method returned: status=%s",
 		bt_common_func_status_string(consume_status));
-	BT_ASSERT_POST_DEV(consume_status == BT_FUNC_STATUS_OK ||
+	BT_ASSERT_POST_DEV(CONSUME_METHOD_NAME, "valid-status",
+		consume_status == BT_FUNC_STATUS_OK ||
 		consume_status == BT_FUNC_STATUS_END ||
 		consume_status == BT_FUNC_STATUS_AGAIN ||
 		consume_status == BT_FUNC_STATUS_ERROR ||
 		consume_status == BT_FUNC_STATUS_MEMORY_ERROR,
 		"Invalid component status returned by consuming method: "
 		"status=%s", bt_common_func_status_string(consume_status));
+	BT_ASSERT_POST_DEV_NO_ERROR_IF_NO_ERROR_STATUS(CONSUME_METHOD_NAME,
+		consume_status);
 	if (consume_status) {
 		if (consume_status < 0) {
 			BT_LIB_LOGW_APPEND_CAUSE(
@@ -648,7 +518,7 @@ int bt_graph_consume_sink_no_check(struct bt_graph *graph,
 	int index;
 
 	BT_LIB_LOGD("Making specific sink consume: %![comp-]+c", sink);
-	BT_ASSERT(bt_component_borrow_graph((void *) sink) == graph);
+	BT_ASSERT_DBG(bt_component_borrow_graph((void *) sink) == graph);
 
 	if (g_queue_is_empty(graph->sinks_to_consume)) {
 		BT_LOGD_STR("Graph's sink queue is empty: end of graph.");
@@ -665,7 +535,7 @@ int bt_graph_consume_sink_no_check(struct bt_graph *graph,
 	}
 
 	sink_node = g_queue_pop_nth_link(graph->sinks_to_consume, index);
-	BT_ASSERT(sink_node);
+	BT_ASSERT_DBG(sink_node);
 	status = consume_sink_node(graph, sink_node);
 
 end:
@@ -673,13 +543,14 @@ end:
 }
 
 static inline
-int consume_no_check(struct bt_graph *graph)
+int consume_no_check(struct bt_graph *graph, const char *api_func)
 {
 	int status = BT_FUNC_STATUS_OK;
 	struct bt_component *sink;
 	GList *current_node;
 
-	BT_ASSERT_PRE_DEV(graph->has_sink,
+	BT_ASSERT_PRE_DEV_FROM_FUNC(api_func,
+		"graph-has-at-least-one-sink-component", graph->has_sink,
 		"Graph has no sink component: %!+g", graph);
 	BT_LIB_LOGD("Making next sink component consume: %![graph-]+g", graph);
 
@@ -698,24 +569,104 @@ end:
 	return status;
 }
 
+#define GRAPH_IS_CONFIGURED_METHOD_NAME					\
+	"bt_component_class_sink_graph_is_configured_method"
+
+static
+int configure_graph(struct bt_graph *graph, const char *api_func)
+{
+	int status = BT_FUNC_STATUS_OK;
+	uint64_t i;
+
+	BT_ASSERT_DBG(graph->config_state !=
+		BT_GRAPH_CONFIGURATION_STATE_FAULTY);
+
+	if (G_LIKELY(graph->config_state ==
+			BT_GRAPH_CONFIGURATION_STATE_CONFIGURED)) {
+		goto end;
+	}
+
+	BT_ASSERT_PRE_FROM_FUNC(api_func,
+		"graph-has-at-least-one-sink-component",
+		graph->has_sink, "Graph has no sink component: %!+g", graph);
+	graph->config_state = BT_GRAPH_CONFIGURATION_STATE_PARTIALLY_CONFIGURED;
+
+	for (i = 0; i < graph->components->len; i++) {
+		struct bt_component *comp = graph->components->pdata[i];
+		struct bt_component_sink *comp_sink = (void *) comp;
+		struct bt_component_class_sink *comp_cls_sink =
+			(void *) comp->class;
+
+		if (comp->class->type != BT_COMPONENT_CLASS_TYPE_SINK) {
+			continue;
+		}
+
+		if (comp_sink->graph_is_configured_method_called) {
+			continue;
+		}
+
+		if (comp_cls_sink->methods.graph_is_configured) {
+			enum bt_component_class_sink_graph_is_configured_method_status comp_status;
+
+			BT_LIB_LOGD("Calling user's \"graph is configured\" method: "
+				"%![graph-]+g, %![comp-]+c",
+				graph, comp);
+			comp_status = comp_cls_sink->methods.graph_is_configured(
+				(void *) comp_sink);
+			BT_LIB_LOGD("User method returned: status=%s",
+				bt_common_func_status_string(comp_status));
+			BT_ASSERT_POST(GRAPH_IS_CONFIGURED_METHOD_NAME,
+				"valid-status",
+				comp_status == BT_FUNC_STATUS_OK ||
+				comp_status == BT_FUNC_STATUS_ERROR ||
+				comp_status == BT_FUNC_STATUS_MEMORY_ERROR,
+				"Unexpected returned status: status=%s",
+				bt_common_func_status_string(comp_status));
+			BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(
+				GRAPH_IS_CONFIGURED_METHOD_NAME, comp_status);
+			if (comp_status != BT_FUNC_STATUS_OK) {
+				if (comp_status < 0) {
+					BT_LIB_LOGW_APPEND_CAUSE(
+						"Component's \"graph is configured\" method failed: "
+						"%![comp-]+c, status=%s",
+						comp,
+						bt_common_func_status_string(
+							comp_status));
+				}
+
+				status = comp_status;
+				goto end;
+			}
+		}
+
+		comp_sink->graph_is_configured_method_called = true;
+	}
+
+	graph->config_state = BT_GRAPH_CONFIGURATION_STATE_CONFIGURED;
+
+end:
+	return status;
+}
+
 enum bt_graph_run_once_status bt_graph_run_once(struct bt_graph *graph)
 {
 	enum bt_graph_run_once_status status;
 
-	BT_ASSERT_PRE_DEV_NON_NULL(graph, "Graph");
-	BT_ASSERT_PRE_DEV(graph->can_consume,
+	BT_ASSERT_PRE_NO_ERROR();
+	BT_ASSERT_PRE_DEV_GRAPH_NON_NULL(graph);
+	BT_ASSERT_PRE_DEV("graph-can-consume", graph->can_consume,
 		"Cannot consume graph in its current state: %!+g", graph);
-	BT_ASSERT_PRE_DEV(graph->config_state !=
-		BT_GRAPH_CONFIGURATION_STATE_FAULTY,
+	BT_ASSERT_PRE_DEV("graph-is-not-faulty",
+		graph->config_state != BT_GRAPH_CONFIGURATION_STATE_FAULTY,
 		"Graph is in a faulty state: %!+g", graph);
 	bt_graph_set_can_consume(graph, false);
-	status = bt_graph_configure(graph);
+	status = configure_graph(graph, __func__);
 	if (G_UNLIKELY(status)) {
-		/* bt_graph_configure() logs errors */
+		/* configure_graph() logs errors */
 		goto end;
 	}
 
-	status = consume_no_check(graph);
+	status = consume_no_check(graph, __func__);
 	bt_graph_set_can_consume(graph, true);
 
 end:
@@ -726,15 +677,17 @@ enum bt_graph_run_status bt_graph_run(struct bt_graph *graph)
 {
 	enum bt_graph_run_status status;
 
-	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	BT_ASSERT_PRE(graph->can_consume,
+	BT_ASSERT_PRE_NO_ERROR();
+	BT_ASSERT_PRE_GRAPH_NON_NULL(graph);
+	BT_ASSERT_PRE("graph-can-consume", graph->can_consume,
 		"Cannot consume graph in its current state: %!+g", graph);
-	BT_ASSERT_PRE(graph->config_state != BT_GRAPH_CONFIGURATION_STATE_FAULTY,
+	BT_ASSERT_PRE("graph-is-not-faulty",
+		graph->config_state != BT_GRAPH_CONFIGURATION_STATE_FAULTY,
 		"Graph is in a faulty state: %!+g", graph);
 	bt_graph_set_can_consume(graph, false);
-	status = bt_graph_configure(graph);
+	status = configure_graph(graph, __func__);
 	if (G_UNLIKELY(status)) {
-		/* bt_graph_configure() logs errors */
+		/* configure_graph() logs errors */
 		goto end;
 	}
 
@@ -754,7 +707,7 @@ enum bt_graph_run_status bt_graph_run(struct bt_graph *graph)
 			goto end;
 		}
 
-		status = consume_no_check(graph);
+		status = consume_no_check(graph, __func__);
 		if (G_UNLIKELY(status == BT_FUNC_STATUS_AGAIN)) {
 			/*
 			 * If AGAIN is received and there are multiple
@@ -773,8 +726,15 @@ enum bt_graph_run_status bt_graph_run(struct bt_graph *graph)
 		}
 	} while (status == BT_FUNC_STATUS_OK);
 
-	if (g_queue_is_empty(graph->sinks_to_consume)) {
-		status = BT_FUNC_STATUS_END;
+	if (status == BT_FUNC_STATUS_END) {
+		/*
+		 * The last call to consume_no_check() returned
+		 * `BT_FUNC_STATUS_END`, but bt_graph_run() has no
+		 * `BT_GRAPH_RUN_STATUS_END` status: replace with
+		 * `BT_GRAPH_RUN_STATUS_OK` (success: graph ran
+		 * completely).
+		 */
+		status = BT_FUNC_STATUS_OK;
 	}
 
 end:
@@ -788,24 +748,17 @@ enum bt_graph_add_listener_status
 bt_graph_add_source_component_output_port_added_listener(
 		struct bt_graph *graph,
 		bt_graph_source_component_output_port_added_listener_func func,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *out_listener_id)
+		void *data, bt_listener_id *out_listener_id)
 {
 	struct bt_graph_listener_port_added listener = {
-		.base = {
-			.removed = listener_removed,
-			.data = data,
-		},
 		.func = (port_added_func_t) func,
+		.data = data,
 	};
 	bt_listener_id listener_id;
 
-	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	BT_ASSERT_PRE_NON_NULL(func, "Listener");
-	BT_ASSERT_PRE_NON_NULL(func, "\"Listener removed\" listener");
-	BT_ASSERT_PRE(!graph->in_remove_listener,
-		"Graph currently executing a \"listener removed\" listener: "
-		"%!+g", graph);
+	BT_ASSERT_PRE_NO_ERROR();
+	BT_ASSERT_PRE_GRAPH_NON_NULL(graph);
+	BT_ASSERT_PRE_LISTENER_FUNC_NON_NULL(func);
 	g_array_append_val(graph->listeners.source_output_port_added, listener);
 	listener_id = graph->listeners.source_output_port_added->len - 1;
 	BT_LIB_LOGD("Added \"source component output port added\" listener to graph: "
@@ -823,24 +776,17 @@ enum bt_graph_add_listener_status
 bt_graph_add_filter_component_output_port_added_listener(
 		struct bt_graph *graph,
 		bt_graph_filter_component_output_port_added_listener_func func,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *out_listener_id)
+		void *data, bt_listener_id *out_listener_id)
 {
 	struct bt_graph_listener_port_added listener = {
-		.base = {
-			.removed = listener_removed,
-			.data = data,
-		},
 		.func = (port_added_func_t) func,
+		.data = data,
 	};
 	bt_listener_id listener_id;
 
-	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	BT_ASSERT_PRE_NON_NULL(func, "Listener");
-	BT_ASSERT_PRE_NON_NULL(func, "\"Listener removed\" listener");
-	BT_ASSERT_PRE(!graph->in_remove_listener,
-		"Graph currently executing a \"listener removed\" listener: "
-		"%!+g", graph);
+	BT_ASSERT_PRE_NO_ERROR();
+	BT_ASSERT_PRE_GRAPH_NON_NULL(graph);
+	BT_ASSERT_PRE_LISTENER_FUNC_NON_NULL(func);
 	g_array_append_val(graph->listeners.filter_output_port_added, listener);
 	listener_id = graph->listeners.filter_output_port_added->len - 1;
 	BT_LIB_LOGD("Added \"filter component output port added\" listener to graph: "
@@ -858,24 +804,17 @@ enum bt_graph_add_listener_status
 bt_graph_add_filter_component_input_port_added_listener(
 		struct bt_graph *graph,
 		bt_graph_filter_component_input_port_added_listener_func func,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *out_listener_id)
+		void *data, bt_listener_id *out_listener_id)
 {
 	struct bt_graph_listener_port_added listener = {
-		.base = {
-			.removed = listener_removed,
-			.data = data,
-		},
 		.func = (port_added_func_t) func,
+		.data = data,
 	};
 	bt_listener_id listener_id;
 
-	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	BT_ASSERT_PRE_NON_NULL(func, "Listener");
-	BT_ASSERT_PRE_NON_NULL(func, "\"Listener removed\" listener");
-	BT_ASSERT_PRE(!graph->in_remove_listener,
-		"Graph currently executing a \"listener removed\" listener: "
-		"%!+g", graph);
+	BT_ASSERT_PRE_NO_ERROR();
+	BT_ASSERT_PRE_GRAPH_NON_NULL(graph);
+	BT_ASSERT_PRE_LISTENER_FUNC_NON_NULL(func);
 	g_array_append_val(graph->listeners.filter_input_port_added, listener);
 	listener_id = graph->listeners.filter_input_port_added->len - 1;
 	BT_LIB_LOGD("Added \"filter component input port added\" listener to graph: "
@@ -893,24 +832,17 @@ enum bt_graph_add_listener_status
 bt_graph_add_sink_component_input_port_added_listener(
 		struct bt_graph *graph,
 		bt_graph_sink_component_input_port_added_listener_func func,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *out_listener_id)
+		void *data, bt_listener_id *out_listener_id)
 {
 	struct bt_graph_listener_port_added listener = {
-		.base = {
-			.removed = listener_removed,
-			.data = data,
-		},
 		.func = (port_added_func_t) func,
+		.data = data,
 	};
 	bt_listener_id listener_id;
 
-	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	BT_ASSERT_PRE_NON_NULL(func, "Listener");
-	BT_ASSERT_PRE_NON_NULL(func, "\"Listener removed\" listener");
-	BT_ASSERT_PRE(!graph->in_remove_listener,
-		"Graph currently executing a \"listener removed\" listener: "
-		"%!+g", graph);
+	BT_ASSERT_PRE_NO_ERROR();
+	BT_ASSERT_PRE_GRAPH_NON_NULL(graph);
+	BT_ASSERT_PRE_LISTENER_FUNC_NON_NULL(func);
 	g_array_append_val(graph->listeners.sink_input_port_added, listener);
 	listener_id = graph->listeners.sink_input_port_added->len - 1;
 	BT_LIB_LOGD("Added \"sink component input port added\" listener to graph: "
@@ -924,150 +856,6 @@ bt_graph_add_sink_component_input_port_added_listener(
 	return BT_FUNC_STATUS_OK;
 }
 
-enum bt_graph_add_listener_status
-bt_graph_add_source_filter_component_ports_connected_listener(
-		struct bt_graph *graph,
-		bt_graph_source_filter_component_ports_connected_listener_func func,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *out_listener_id)
-{
-	struct bt_graph_listener_ports_connected listener = {
-		.base = {
-			.removed = listener_removed,
-			.data = data,
-		},
-		.func = (ports_connected_func_t) func,
-	};
-	bt_listener_id listener_id;
-
-	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	BT_ASSERT_PRE_NON_NULL(func, "Listener");
-	BT_ASSERT_PRE_NON_NULL(func, "\"Listener removed\" listener");
-	BT_ASSERT_PRE(!graph->in_remove_listener,
-		"Graph currently executing a \"listener removed\" listener: "
-		"%!+g", graph);
-	g_array_append_val(graph->listeners.source_filter_ports_connected,
-		listener);
-	listener_id = graph->listeners.source_filter_ports_connected->len - 1;
-	BT_LIB_LOGD("Added \"source to filter component ports connected\" listener to graph: "
-		"%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
-		listener_id);
-
-	if (listener_id) {
-		*out_listener_id = listener_id;
-	}
-
-	return BT_FUNC_STATUS_OK;
-}
-
-enum bt_graph_add_listener_status
-bt_graph_add_source_sink_component_ports_connected_listener(
-		struct bt_graph *graph,
-		bt_graph_source_sink_component_ports_connected_listener_func func,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *out_listener_id)
-{
-	struct bt_graph_listener_ports_connected listener = {
-		.base = {
-			.removed = listener_removed,
-			.data = data,
-		},
-		.func = (ports_connected_func_t) func,
-	};
-	bt_listener_id listener_id;
-
-	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	BT_ASSERT_PRE_NON_NULL(func, "Listener");
-	BT_ASSERT_PRE_NON_NULL(func, "\"Listener removed\" listener");
-	BT_ASSERT_PRE(!graph->in_remove_listener,
-		"Graph currently executing a \"listener removed\" listener: "
-		"%!+g", graph);
-	g_array_append_val(graph->listeners.source_sink_ports_connected,
-		listener);
-	listener_id = graph->listeners.source_sink_ports_connected->len - 1;
-	BT_LIB_LOGD("Added \"source to sink component ports connected\" listener to graph: "
-		"%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
-		listener_id);
-
-	if (listener_id) {
-		*out_listener_id = listener_id;
-	}
-
-	return BT_FUNC_STATUS_OK;
-}
-
-enum bt_graph_add_listener_status
-bt_graph_add_filter_filter_component_ports_connected_listener(
-		struct bt_graph *graph,
-		bt_graph_filter_filter_component_ports_connected_listener_func func,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *out_listener_id)
-{
-	struct bt_graph_listener_ports_connected listener = {
-		.base = {
-			.removed = listener_removed,
-			.data = data,
-		},
-		.func = (ports_connected_func_t) func,
-	};
-	bt_listener_id listener_id;
-
-	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	BT_ASSERT_PRE_NON_NULL(func, "Listener");
-	BT_ASSERT_PRE_NON_NULL(func, "\"Listener removed\" listener");
-	BT_ASSERT_PRE(!graph->in_remove_listener,
-		"Graph currently executing a \"listener removed\" listener: "
-		"%!+g", graph);
-	g_array_append_val(graph->listeners.filter_filter_ports_connected,
-		listener);
-	listener_id = graph->listeners.filter_filter_ports_connected->len - 1;
-	BT_LIB_LOGD("Added \"filter to filter component ports connected\" listener to graph: "
-		"%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
-		listener_id);
-
-	if (listener_id) {
-		*out_listener_id = listener_id;
-	}
-
-	return BT_FUNC_STATUS_OK;
-}
-
-enum bt_graph_add_listener_status
-bt_graph_add_filter_sink_component_ports_connected_listener(
-		struct bt_graph *graph,
-		bt_graph_filter_sink_component_ports_connected_listener_func func,
-		bt_graph_listener_removed_func listener_removed, void *data,
-		bt_listener_id *out_listener_id)
-{
-	struct bt_graph_listener_ports_connected listener = {
-		.base = {
-			.removed = listener_removed,
-			.data = data,
-		},
-		.func = (ports_connected_func_t) func,
-	};
-	bt_listener_id listener_id;
-
-	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	BT_ASSERT_PRE_NON_NULL(func, "Listener");
-	BT_ASSERT_PRE_NON_NULL(func, "\"Listener removed\" listener");
-	BT_ASSERT_PRE(!graph->in_remove_listener,
-		"Graph currently executing a \"listener removed\" listener: "
-		"%!+g", graph);
-	g_array_append_val(graph->listeners.filter_sink_ports_connected,
-		listener);
-	listener_id = graph->listeners.filter_sink_ports_connected->len - 1;
-	BT_LIB_LOGD("Added \"filter to sink component ports connected\" listener to graph: "
-		"%![graph-]+g, listener-addr=%p, id=%d", graph, listener,
-		listener_id);
-
-	if (listener_id) {
-		*out_listener_id = listener_id;
-	}
-
-	return BT_FUNC_STATUS_OK;
-}
-
 BT_HIDDEN
 enum bt_graph_listener_func_status bt_graph_notify_port_added(
 		struct bt_graph *graph, struct bt_port *port)
@@ -1076,6 +864,7 @@ enum bt_graph_listener_func_status bt_graph_notify_port_added(
 	GArray *listeners;
 	struct bt_component *comp;
 	enum bt_graph_listener_func_status status = BT_FUNC_STATUS_OK;
+	const char *func_name;
 
 	BT_ASSERT(graph);
 	BT_ASSERT(port);
@@ -1090,9 +879,10 @@ enum bt_graph_listener_func_status bt_graph_notify_port_added(
 		switch (port->type) {
 		case BT_PORT_TYPE_OUTPUT:
 			listeners = graph->listeners.source_output_port_added;
+			func_name = "bt_graph_source_component_output_port_added_listener_func";
 			break;
 		default:
-			abort();
+			bt_common_abort();
 		}
 
 		break;
@@ -1102,12 +892,14 @@ enum bt_graph_listener_func_status bt_graph_notify_port_added(
 		switch (port->type) {
 		case BT_PORT_TYPE_INPUT:
 			listeners = graph->listeners.filter_input_port_added;
+			func_name = "bt_graph_filter_component_input_port_added_listener_func";
 			break;
 		case BT_PORT_TYPE_OUTPUT:
 			listeners = graph->listeners.filter_output_port_added;
+			func_name = "bt_graph_filter_component_output_port_added_listener_func";
 			break;
 		default:
-			abort();
+			bt_common_abort();
 		}
 
 		break;
@@ -1117,15 +909,16 @@ enum bt_graph_listener_func_status bt_graph_notify_port_added(
 		switch (port->type) {
 		case BT_PORT_TYPE_INPUT:
 			listeners = graph->listeners.sink_input_port_added;
+			func_name = "bt_graph_sink_component_input_port_added_listener_func";
 			break;
 		default:
-			abort();
+			bt_common_abort();
 		}
 
 		break;
 	}
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	for (i = 0; i < listeners->len; i++) {
@@ -1135,85 +928,8 @@ enum bt_graph_listener_func_status bt_graph_notify_port_added(
 
 
 		BT_ASSERT(listener->func);
-		status = listener->func(comp, port, listener->base.data);
-		if (status != BT_FUNC_STATUS_OK) {
-			goto end;
-		}
-	}
-
-end:
-	return status;
-}
-
-BT_HIDDEN
-enum bt_graph_listener_func_status bt_graph_notify_ports_connected(
-		struct bt_graph *graph, struct bt_port *upstream_port,
-		struct bt_port *downstream_port)
-{
-	uint64_t i;
-	GArray *listeners;
-	struct bt_component *upstream_comp;
-	struct bt_component *downstream_comp;
-	enum bt_graph_listener_func_status status = BT_FUNC_STATUS_OK;
-
-	BT_ASSERT(graph);
-	BT_ASSERT(upstream_port);
-	BT_ASSERT(downstream_port);
-	BT_LIB_LOGD("Notifying graph listeners that ports were connected: "
-		"%![graph-]+g, %![up-port-]+p, %![down-port-]+p",
-		graph, upstream_port, downstream_port);
-	upstream_comp = bt_port_borrow_component_inline(upstream_port);
-	BT_ASSERT(upstream_comp);
-	downstream_comp = bt_port_borrow_component_inline(downstream_port);
-	BT_ASSERT(downstream_comp);
-
-	switch (upstream_comp->class->type) {
-	case BT_COMPONENT_CLASS_TYPE_SOURCE:
-	{
-		switch (downstream_comp->class->type) {
-		case BT_COMPONENT_CLASS_TYPE_FILTER:
-			listeners =
-				graph->listeners.source_filter_ports_connected;
-			break;
-		case BT_COMPONENT_CLASS_TYPE_SINK:
-			listeners =
-				graph->listeners.source_sink_ports_connected;
-			break;
-		default:
-			abort();
-		}
-
-		break;
-	}
-	case BT_COMPONENT_CLASS_TYPE_FILTER:
-	{
-		switch (downstream_comp->class->type) {
-		case BT_COMPONENT_CLASS_TYPE_FILTER:
-			listeners =
-				graph->listeners.filter_filter_ports_connected;
-			break;
-		case BT_COMPONENT_CLASS_TYPE_SINK:
-			listeners =
-				graph->listeners.filter_sink_ports_connected;
-			break;
-		default:
-			abort();
-		}
-
-		break;
-	}
-	default:
-		abort();
-	}
-
-	for (i = 0; i < listeners->len; i++) {
-		struct bt_graph_listener_ports_connected *listener =
-			&g_array_index(listeners,
-				struct bt_graph_listener_ports_connected, i);
-
-		BT_ASSERT(listener->func);
-		status = listener->func(upstream_comp, downstream_comp,
-			upstream_port, downstream_port, listener->base.data);
+		status = listener->func(comp, port, listener->data);
+		BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(func_name, status);
 		if (status != BT_FUNC_STATUS_OK) {
 			goto end;
 		}
@@ -1244,7 +960,7 @@ bool component_name_exists(struct bt_graph *graph, const char *name)
 		struct bt_component *other_comp = graph->components->pdata[i];
 
 		if (strcmp(name, bt_component_get_name(other_comp)) == 0) {
-			BT_ASSERT_PRE_MSG("Another component with the same name already exists in the graph: "
+			BT_ASSERT_COND_MSG("Another component with the same name already exists in the graph: "
 				"%![other-comp-]+c, name=\"%s\"",
 				other_comp, name);
 			exists = true;
@@ -1263,7 +979,9 @@ int add_component_with_init_method_data(
 		comp_init_method_t init_method,
 		const char *name, const struct bt_value *params,
 		void *init_method_data, bt_logging_level log_level,
-		const struct bt_component **user_component)
+		const struct bt_component **user_component,
+		const char *api_func,
+		const char *init_method_name)
 {
 	int status = BT_FUNC_STATUS_OK;
 	enum bt_component_class_initialize_method_status init_status;
@@ -1273,15 +991,15 @@ int add_component_with_init_method_data(
 	struct bt_value *new_params = NULL;
 
 	BT_ASSERT(comp_cls);
-	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	BT_ASSERT_PRE_NON_NULL(name, "Name");
-	BT_ASSERT_PRE(
+	BT_ASSERT_PRE_GRAPH_NON_NULL_FROM_FUNC(api_func, graph);
+	BT_ASSERT_PRE_NAME_NON_NULL_FROM_FUNC(api_func, name);
+	BT_ASSERT_PRE_FROM_FUNC(api_func, "graph-is-not-configured",
 		graph->config_state == BT_GRAPH_CONFIGURATION_STATE_CONFIGURING,
 		"Graph is not in the \"configuring\" state: %!+g", graph);
-	BT_ASSERT_PRE(!component_name_exists(graph, name),
+	BT_ASSERT_PRE_FROM_FUNC(api_func, "component-name-is-unique",
+		!component_name_exists(graph, name),
 		"Duplicate component name: %!+g, name=\"%s\"", graph, name);
-	BT_ASSERT_PRE(!params || bt_value_is_map(params),
-		"Parameter value is not a map value: %!+v", params);
+	BT_ASSERT_PRE_PARAM_VALUE_IS_MAP_FROM_FUNC(api_func, params);
 	init_can_consume = graph->can_consume;
 	bt_graph_set_can_consume(graph, false);
 	BT_LIB_LOGI("Adding component to graph: "
@@ -1330,6 +1048,8 @@ int add_component_with_init_method_data(
 		init_status = init_method(component, NULL, params, init_method_data);
 		BT_LOGD("User method returned: status=%s",
 			bt_common_func_status_string(init_status));
+		BT_ASSERT_POST_DEV_NO_ERROR_IF_NO_ERROR_STATUS(init_method_name,
+			init_status);
 		if (init_status != BT_FUNC_STATUS_OK) {
 			if (init_status < 0) {
 				BT_LIB_LOGW_APPEND_CAUSE(
@@ -1378,7 +1098,6 @@ int add_component_with_init_method_data(
 	if (user_component) {
 		/* Move reference to user */
 		*user_component = component;
-		component = NULL;
 	}
 
 end:
@@ -1393,18 +1112,34 @@ end:
 	return status;
 }
 
+static
 enum bt_graph_add_component_status
-bt_graph_add_source_component_with_initialize_method_data(
+add_source_component_with_initialize_method_data(
 		struct bt_graph *graph,
 		const struct bt_component_class_source *comp_cls,
 		const char *name, const struct bt_value *params,
 		void *init_method_data, bt_logging_level log_level,
-		const struct bt_component_source **component)
+		const struct bt_component_source **component,
+		const char *api_func)
 {
-	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
+	BT_ASSERT_PRE_NO_ERROR_FROM_FUNC(api_func);
+	BT_ASSERT_PRE_COMP_CLS_NON_NULL_FROM_FUNC(api_func, comp_cls);
 	return add_component_with_init_method_data(graph,
 		(void *) comp_cls, (comp_init_method_t) comp_cls->methods.init,
-		name, params, init_method_data, log_level, (void *) component);
+		name, params, init_method_data, log_level, (void *) component,
+		api_func, "bt_component_class_source_initialize_method");
+}
+
+enum bt_graph_add_component_status
+bt_graph_add_source_component_with_initialize_method_data(
+		struct bt_graph *graph,
+		const struct bt_component_class_source *comp_cls,
+		const char *name, const struct bt_value *params,
+		void *init_method_data, bt_logging_level log_level,
+		const struct bt_component_source **component)
+{
+	return add_source_component_with_initialize_method_data(graph, comp_cls,
+		name, params, init_method_data, log_level, component, __func__);
 }
 
 enum bt_graph_add_component_status bt_graph_add_source_component(
@@ -1414,22 +1149,38 @@ enum bt_graph_add_component_status bt_graph_add_source_component(
 		enum bt_logging_level log_level,
 		const struct bt_component_source **component)
 {
-	return bt_graph_add_source_component_with_initialize_method_data(
-		graph, comp_cls, name, params, NULL, log_level, component);
+	return add_source_component_with_initialize_method_data(graph, comp_cls,
+		name, params, NULL, log_level, component, __func__);
 }
 
+static
 enum bt_graph_add_component_status
-bt_graph_add_filter_component_with_initialize_method_data(
+add_filter_component_with_initialize_method_data(
 		struct bt_graph *graph,
 		const struct bt_component_class_filter *comp_cls,
 		const char *name, const struct bt_value *params,
-		void *init_method_data, enum bt_logging_level log_level,
-		const struct bt_component_filter **component)
+		void *init_method_data, bt_logging_level log_level,
+		const struct bt_component_filter **component,
+		const char *api_func)
 {
-	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
+	BT_ASSERT_PRE_NO_ERROR_FROM_FUNC(api_func);
+	BT_ASSERT_PRE_COMP_CLS_NON_NULL_FROM_FUNC(api_func, comp_cls);
 	return add_component_with_init_method_data(graph,
 		(void *) comp_cls, (comp_init_method_t) comp_cls->methods.init,
-		name, params, init_method_data, log_level, (void *) component);
+		name, params, init_method_data, log_level, (void *) component,
+		api_func, "bt_component_class_filter_initialize_method");
+}
+
+enum bt_graph_add_component_status
+bt_graph_add_filter_component_with_initialize_method_data(
+		struct bt_graph *graph,
+		const struct bt_component_class_filter *comp_cls,
+		const char *name, const struct bt_value *params,
+		void *init_method_data, bt_logging_level log_level,
+		const struct bt_component_filter **component)
+{
+	return add_filter_component_with_initialize_method_data(graph, comp_cls,
+		name, params, init_method_data, log_level, component, __func__);
 }
 
 enum bt_graph_add_component_status bt_graph_add_filter_component(
@@ -1439,22 +1190,39 @@ enum bt_graph_add_component_status bt_graph_add_filter_component(
 		enum bt_logging_level log_level,
 		const struct bt_component_filter **component)
 {
-	return bt_graph_add_filter_component_with_initialize_method_data(
-		graph, comp_cls, name, params, NULL, log_level, component);
+	return add_filter_component_with_initialize_method_data(graph, comp_cls,
+		name, params, NULL, log_level, component, __func__);
 }
 
+static
 enum bt_graph_add_component_status
-bt_graph_add_sink_component_with_initialize_method_data(
+add_sink_component_with_initialize_method_data(
 		struct bt_graph *graph,
 		const struct bt_component_class_sink *comp_cls,
 		const char *name, const struct bt_value *params,
-		void *init_method_data, enum bt_logging_level log_level,
-		const struct bt_component_sink **component)
+		void *init_method_data, bt_logging_level log_level,
+		const struct bt_component_sink **component,
+		const char *api_func)
 {
-	BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class");
+	BT_ASSERT_PRE_NO_ERROR_FROM_FUNC(api_func);
+	BT_ASSERT_PRE_COMP_CLS_NON_NULL_FROM_FUNC(api_func, comp_cls);
 	return add_component_with_init_method_data(graph,
 		(void *) comp_cls, (comp_init_method_t) comp_cls->methods.init,
-		name, params, init_method_data, log_level, (void *) component);
+		name, params, init_method_data, log_level, (void *) component,
+		api_func, "bt_component_class_sink_initialize_method");
+}
+
+enum bt_graph_add_component_status
+bt_graph_add_sink_component_with_initialize_method_data(
+		struct bt_graph *graph,
+		const struct bt_component_class_sink *comp_cls,
+		const char *name, const struct bt_value *params,
+		void *init_method_data, bt_logging_level log_level,
+		const struct bt_component_sink **component)
+{
+	return add_sink_component_with_initialize_method_data(graph, comp_cls,
+		name, params, init_method_data, log_level, component,
+		__func__);
 }
 
 enum bt_graph_add_component_status bt_graph_add_sink_component(
@@ -1464,8 +1232,8 @@ enum bt_graph_add_component_status bt_graph_add_sink_component(
 		enum bt_logging_level log_level,
 		const struct bt_component_sink **component)
 {
-	return bt_graph_add_sink_component_with_initialize_method_data(
-		graph, comp_cls, name, params, NULL, log_level, component);
+	return add_sink_component_with_initialize_method_data(graph, comp_cls,
+		name, params, NULL, log_level, component, __func__);
 }
 
 enum bt_graph_add_component_status
@@ -1484,11 +1252,14 @@ bt_graph_add_simple_sink_component(struct bt_graph *graph, const char *name,
 		.user_data = user_data,
 	};
 
+	BT_ASSERT_PRE_NO_ERROR();
+
 	/*
 	 * Other preconditions are checked by
-	 * bt_graph_add_sink_component_with_init_method_data().
+	 * add_sink_component_with_initialize_method_data().
 	 */
-	BT_ASSERT_PRE_NON_NULL(consume_func, "Consume function");
+	BT_ASSERT_PRE_NON_NULL("consume-function", consume_func,
+		"Consume function");
 
 	comp_cls = bt_component_class_sink_simple_borrow();
 	if (!comp_cls) {
@@ -1498,91 +1269,14 @@ bt_graph_add_simple_sink_component(struct bt_graph *graph, const char *name,
 		goto end;
 	}
 
-	status = bt_graph_add_sink_component_with_initialize_method_data(graph,
+	status = add_sink_component_with_initialize_method_data(graph,
 		comp_cls, name, NULL, &init_method_data,
-		BT_LOGGING_LEVEL_NONE, component);
+		BT_LOGGING_LEVEL_NONE, component, __func__);
 
 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)
@@ -1604,15 +1298,16 @@ void bt_graph_add_message(struct bt_graph *graph,
 BT_HIDDEN
 bool bt_graph_is_interrupted(const struct bt_graph *graph)
 {
-	BT_ASSERT(graph);
+	BT_ASSERT_DBG(graph);
 	return bt_interrupter_array_any_is_set(graph->interrupters);
 }
 
 enum bt_graph_add_interrupter_status bt_graph_add_interrupter(
 		struct bt_graph *graph, const struct bt_interrupter *intr)
 {
-	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	BT_ASSERT_PRE_NON_NULL(intr, "Interrupter");
+	BT_ASSERT_PRE_NO_ERROR();
+	BT_ASSERT_PRE_GRAPH_NON_NULL(graph);
+	BT_ASSERT_PRE_INTR_NON_NULL(intr);
 	g_ptr_array_add(graph->interrupters, (void *) intr);
 	bt_object_get_ref_no_null_check(intr);
 	BT_LIB_LOGD("Added interrupter to graph: %![graph-]+g, %![intr-]+z",
@@ -1620,11 +1315,10 @@ enum bt_graph_add_interrupter_status bt_graph_add_interrupter(
 	return BT_FUNC_STATUS_OK;
 }
 
-void bt_graph_interrupt(struct bt_graph *graph)
+struct bt_interrupter *bt_graph_borrow_default_interrupter(bt_graph *graph)
 {
-	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
-	bt_interrupter_set(graph->default_interrupter);
-	BT_LIB_LOGI("Interrupted graph: %!+g", graph);
+	BT_ASSERT_PRE_GRAPH_NON_NULL(graph);
+	return graph->default_interrupter;
 }
 
 void bt_graph_get_ref(const struct bt_graph *graph)