Always evaluate BT_ASSERT(); add BT_ASSERT_DBG() for debug mode only

[babeltrace.git] / src / lib / graph / graph.h

diff --git a/src/lib/graph/graph.h b/src/lib/graph/graph.h
index 2f189f83f3fb3cf1a205c73ed069a1e457dbecb8..5fe6cb69fa0eb02c56e42f46f05e740be8525950 100644 (file)
--- a/src/lib/graph/graph.h
+++ b/src/lib/graph/graph.h
@@ -90,6 +90,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 +162,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;
 }
 
@@ -226,7 +228,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 +269,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: "