X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fgraph.c;h=32af1ef898585d4c240f7e505c79de01970226be;hb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;hp=591b65d2036feb94a4ec8cd7891d6e507947cfbf;hpb=21a9f056fd7d86d18aa7a1700c7f47d93eb1adeb;p=babeltrace.git

diff --git a/src/lib/graph/graph.c b/src/lib/graph/graph.c
index 591b65d2..32af1ef8 100644
--- a/src/lib/graph/graph.c
+++ b/src/lib/graph/graph.c
@@ -303,7 +303,6 @@ struct bt_graph *bt_graph_create(uint64_t mip_version)
 		graph->listeners.source_output_port_added);
 
 	if (!graph->listeners.source_output_port_added) {
-		ret = -1;
 		goto error;
 	}
 
@@ -311,7 +310,6 @@ struct bt_graph *bt_graph_create(uint64_t mip_version)
 		graph->listeners.filter_output_port_added);
 
 	if (!graph->listeners.filter_output_port_added) {
-		ret = -1;
 		goto error;
 	}
 
@@ -319,7 +317,6 @@ struct bt_graph *bt_graph_create(uint64_t mip_version)
 		graph->listeners.filter_input_port_added);
 
 	if (!graph->listeners.filter_input_port_added) {
-		ret = -1;
 		goto error;
 	}
 
@@ -327,7 +324,6 @@ struct bt_graph *bt_graph_create(uint64_t mip_version)
 		graph->listeners.sink_input_port_added);
 
 	if (!graph->listeners.sink_input_port_added) {
-		ret = -1;
 		goto error;
 	}
 
@@ -335,7 +331,6 @@ struct bt_graph *bt_graph_create(uint64_t mip_version)
 		graph->listeners.source_filter_ports_connected);
 
 	if (!graph->listeners.source_filter_ports_connected) {
-		ret = -1;
 		goto error;
 	}
 
@@ -343,7 +338,6 @@ struct bt_graph *bt_graph_create(uint64_t mip_version)
 		graph->listeners.source_sink_ports_connected);
 
 	if (!graph->listeners.source_sink_ports_connected) {
-		ret = -1;
 		goto error;
 	}
 
@@ -351,7 +345,6 @@ struct bt_graph *bt_graph_create(uint64_t mip_version)
 		graph->listeners.filter_filter_ports_connected);
 
 	if (!graph->listeners.filter_filter_ports_connected) {
-		ret = -1;
 		goto error;
 	}
 
@@ -359,12 +352,11 @@ struct bt_graph *bt_graph_create(uint64_t mip_version)
 		graph->listeners.filter_sink_ports_connected);
 
 	if (!graph->listeners.filter_sink_ports_connected) {
-		ret = -1;
 		goto error;
 	}
 
 	graph->interrupters = g_ptr_array_new_with_free_func(
-		(GDestroyNotify) bt_object_put_no_null_check);
+		(GDestroyNotify) bt_object_put_ref_no_null_check);
 	if (!graph->interrupters) {
 		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray.");
 		goto error;
@@ -581,9 +573,9 @@ 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",
@@ -656,7 +648,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.");
@@ -673,7 +665,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:
@@ -1612,7 +1604,7 @@ 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);
 }
 
@@ -1622,7 +1614,7 @@ enum bt_graph_add_interrupter_status bt_graph_add_interrupter(
 	BT_ASSERT_PRE_NON_NULL(graph, "Graph");
 	BT_ASSERT_PRE_NON_NULL(intr, "Interrupter");
 	g_ptr_array_add(graph->interrupters, (void *) intr);
-	bt_object_get_no_null_check(intr);
+	bt_object_get_ref_no_null_check(intr);
 	BT_LIB_LOGD("Added interrupter to graph: %![graph-]+g, %![intr-]+z",
 		graph, intr);
 	return BT_FUNC_STATUS_OK;