X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fgraph.h;h=7fffd0ca3bc213c8cb093bbdf73205d9d4cbbe6f;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=e18e63ffb0022a6d07c73a7e2d3d2589b4ce6647;hpb=53816eee3855d4e6086202542b9410e529dc80bc;p=babeltrace.git

diff --git a/src/lib/graph/graph.h b/src/lib/graph/graph.h
index e18e63ff..7fffd0ca 100644
--- a/src/lib/graph/graph.h
+++ b/src/lib/graph/graph.h
@@ -30,12 +30,13 @@
 #endif
 
 #include <babeltrace2/graph/graph.h>
-#include <babeltrace2/graph/message-const.h>
+#include <babeltrace2/graph/message.h>
 #include "common/macros.h"
 #include "lib/object.h"
 #include "lib/object-pool.h"
 #include "common/assert.h"
 #include "common/common.h"
+#include <stdbool.h>
 #include <stdlib.h>
 #include <glib.h>
 
@@ -100,12 +101,10 @@ struct bt_graph {
 	GPtrArray *interrupters;
 
 	/*
-	 * Default interrupter to support bt_graph_interrupt(); owned
-	 * by this.
+	 * Default interrupter, owned by this.
 	 */
 	struct bt_interrupter *default_interrupter;
 
-	bool in_remove_listener;
 	bool has_sink;
 
 	/*
@@ -127,10 +126,6 @@ struct bt_graph {
 		GArray *filter_output_port_added;
 		GArray *filter_input_port_added;
 		GArray *sink_input_port_added;
-		GArray *source_filter_ports_connected;
-		GArray *source_sink_ports_connected;
-		GArray *filter_filter_ports_connected;
-		GArray *filter_sink_ports_connected;
 	} listeners;
 
 	/* Pool of `struct bt_message_event *` */
@@ -174,11 +169,6 @@ BT_HIDDEN
 enum bt_graph_listener_func_status bt_graph_notify_port_added(struct bt_graph *graph,
 		struct bt_port *port);
 
-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);
-
 BT_HIDDEN
 void bt_graph_remove_connection(struct bt_graph *graph,
 		struct bt_connection *connection);
@@ -256,6 +246,7 @@ int bt_graph_configure(struct bt_graph *graph)
 				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(comp_status);
 			if (comp_status != BT_FUNC_STATUS_OK) {
 				if (comp_status < 0) {
 					BT_LIB_LOGW_APPEND_CAUSE(