X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fsink.c;h=bee8403cc5a65772698072c5dc4969b3407c1ef4;hb=5c5632787fc9cafa602c89a28966bcfd01ec0204;hp=063539f2acd3c0fd24d02acb5ab7385d40066e50;hpb=bd7cc15bddddb727ea02fb44bde2d9f15cd82847;p=babeltrace.git

diff --git a/lib/graph/sink.c b/lib/graph/sink.c
index 063539f2..bee8403c 100644
--- a/lib/graph/sink.c
+++ b/lib/graph/sink.c
@@ -31,10 +31,13 @@
 
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/values.h>
+#include <babeltrace/graph/private-component.h>
 #include <babeltrace/graph/component-sink-internal.h>
 #include <babeltrace/graph/component-internal.h>
 #include <babeltrace/graph/notification.h>
 #include <babeltrace/graph/graph.h>
+#include <babeltrace/assert-internal.h>
+#include <babeltrace/assert-internal.h>
 
 BT_HIDDEN
 void bt_component_sink_destroy(struct bt_component *component)
@@ -43,7 +46,7 @@ void bt_component_sink_destroy(struct bt_component *component)
 
 BT_HIDDEN
 struct bt_component *bt_component_sink_create(
-		struct bt_component_class *class, struct bt_value *params)
+		struct bt_component_class *class)
 {
 	struct bt_component_sink *sink = NULL;
 
@@ -64,23 +67,10 @@ enum bt_component_status bt_component_sink_consume(
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	struct bt_component_class_sink *sink_class = NULL;
 
-	if (!component) {
-		BT_LOGW_STR("Invalid parameter: component is NULL.");
-		ret = BT_COMPONENT_STATUS_INVALID;
-		goto end;
-	}
-
-	if (bt_component_get_class_type(component) != BT_COMPONENT_CLASS_TYPE_SINK) {
-		BT_LOGW("Invalid parameter: component's class is not a sink component class: "
-			"comp-addr=%p, comp-name=\"%s\", comp-class-type=%s",
-			component, bt_component_get_name(component),
-			bt_component_class_type_string(component->class->type));
-		ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-		goto end;
-	}
-
+	BT_ASSERT(component);
+	BT_ASSERT(bt_component_get_class_type(component) == BT_COMPONENT_CLASS_TYPE_SINK);
 	sink_class = container_of(component->class, struct bt_component_class_sink, parent);
-	assert(sink_class->methods.consume);
+	BT_ASSERT(sink_class->methods.consume);
 	BT_LOGD("Calling user's consume method: "
 		"comp-addr=%p, comp-name=\"%s\"",
 		component, bt_component_get_name(component));
@@ -91,7 +81,6 @@ enum bt_component_status bt_component_sink_consume(
 		BT_LOGW_STR("Consume method failed.");
 	}
 
-end:
 	return ret;
 }
 
@@ -183,7 +172,7 @@ bt_private_component_sink_get_input_private_port_by_index(
 	/* bt_component_sink_get_input_port_by_index() logs details/errors */
 	return bt_private_port_from_port(
 		bt_component_sink_get_input_port_by_index(
-			bt_component_from_private(private_component), index));
+			bt_component_borrow_from_private(private_component), index));
 }
 
 struct bt_private_port *
@@ -194,7 +183,7 @@ bt_private_component_sink_get_input_private_port_by_name(
 	/* bt_component_sink_get_input_port_by_name() logs details/errors */
 	return bt_private_port_from_port(
 		bt_component_sink_get_input_port_by_name(
-			bt_component_from_private(private_component), name));
+			bt_component_borrow_from_private(private_component), name));
 }
 
 enum bt_component_status bt_private_component_sink_add_input_private_port(
@@ -205,7 +194,7 @@ enum bt_component_status bt_private_component_sink_add_input_private_port(
 	enum bt_component_status status = BT_COMPONENT_STATUS_OK;
 	struct bt_port *port = NULL;
 	struct bt_component *component =
-		bt_component_from_private(private_component);
+		bt_component_borrow_from_private(private_component);
 	struct bt_graph *graph;
 
 	if (!component) {
@@ -226,7 +215,7 @@ enum bt_component_status bt_private_component_sink_add_input_private_port(
 	graph = bt_component_borrow_graph(component);
 
 	if (graph && bt_graph_is_canceled(graph)) {
-		BT_LOGW("Cannot add output port to filter component: graph is canceled: "
+		BT_LOGW("Cannot add input port to sink component: graph is canceled: "
 			"comp-addr=%p, comp-name=\"%s\", graph-addr=%p",
 			component, bt_component_get_name(component),
 			bt_component_borrow_graph(component));