X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fgraph.h;h=4e8daa27deb0c1f278ed41c5cc39817562260be5;hb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;hp=2f189f83f3fb3cf1a205c73ed069a1e457dbecb8;hpb=8a4328893c7222e490da887e1caec4e61fe3d56e;p=babeltrace.git

diff --git a/src/lib/graph/graph.h b/src/lib/graph/graph.h
index 2f189f83..4e8daa27 100644
--- a/src/lib/graph/graph.h
+++ b/src/lib/graph/graph.h
@@ -36,6 +36,7 @@
 #include "lib/object-pool.h"
 #include "common/assert.h"
 #include "common/common.h"
+#include <stdbool.h>
 #include <stdlib.h>
 #include <glib.h>
 
@@ -90,6 +91,8 @@ struct bt_graph {
 	/* Queue of pointers (weak references) to sink bt_components. */
 	GQueue *sinks_to_consume;
 
+	uint64_t mip_version;
+
 	/*
 	 * Array of `struct bt_interrupter *`, each one owned by this.
 	 * If any interrupter is set, then this graph is deemed
@@ -160,7 +163,7 @@ struct bt_graph {
 static inline
 void bt_graph_set_can_consume(struct bt_graph *graph, bool can_consume)
 {
-	BT_ASSERT(graph);
+	BT_ASSERT_DBG(graph);
 	graph->can_consume = can_consume;
 }
 
@@ -181,18 +184,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);
@@ -226,7 +217,8 @@ int bt_graph_configure(struct bt_graph *graph)
 	int status = BT_FUNC_STATUS_OK;
 	uint64_t i;
 
-	BT_ASSERT(graph->config_state != BT_GRAPH_CONFIGURATION_STATE_FAULTY);
+	BT_ASSERT_DBG(graph->config_state !=
+		BT_GRAPH_CONFIGURATION_STATE_FAULTY);
 
 	if (G_LIKELY(graph->config_state ==
 			BT_GRAPH_CONFIGURATION_STATE_CONFIGURED)) {
@@ -266,7 +258,6 @@ int bt_graph_configure(struct bt_graph *graph)
 				"Unexpected returned status: status=%s",
 				bt_common_func_status_string(comp_status));
 			if (comp_status != BT_FUNC_STATUS_OK) {
-				comp_status = BT_FUNC_STATUS_ERROR;
 				if (comp_status < 0) {
 					BT_LIB_LOGW_APPEND_CAUSE(
 						"Component's \"graph is configured\" method failed: "