X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-class-sink-simple.c;h=f8ac7ad1a2ff25b3dde46c5729a76946b29a005e;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=6a9d2e5395464610027b78f54a0050f2b972e6e0;hpb=59225a3e0e13a9c674234755e55055d9ff68d635;p=babeltrace.git

diff --git a/src/lib/graph/component-class-sink-simple.c b/src/lib/graph/component-class-sink-simple.c
index 6a9d2e53..f8ac7ad1 100644
--- a/src/lib/graph/component-class-sink-simple.c
+++ b/src/lib/graph/component-class-sink-simple.c
@@ -27,11 +27,10 @@
 #include "common/common.h"
 #include "lib/assert-pre.h"
 #include "lib/object.h"
-#include <babeltrace2/graph/component-class-sink.h>
-#include <babeltrace2/graph/self-component-sink.h>
+#include <babeltrace2/graph/component-class.h>
 #include <babeltrace2/graph/self-component-port.h>
-#include <babeltrace2/graph/self-component-port-input-message-iterator.h>
 #include <babeltrace2/graph/self-component.h>
+#include <babeltrace2/graph/message-iterator.h>
 #include <glib.h>
 
 #include "component-class-sink-simple.h"
@@ -46,12 +45,12 @@ static
 struct bt_component_class_sink *simple_comp_cls;
 
 struct simple_sink_data {
-	bt_self_component_port_input_message_iterator *msg_iter;
+	bt_message_iterator *msg_iter;
 	struct simple_sink_init_method_data init_method_data;
 };
 
 static
-enum bt_component_class_init_method_status simple_sink_init(
+enum bt_component_class_initialize_method_status simple_sink_init(
 		bt_self_component_sink *self_comp,
 		bt_self_component_sink_configuration *config,
 		const struct bt_value *params, void *init_method_data)
@@ -111,7 +110,7 @@ simple_sink_graph_is_configured(
 	bt_self_component_sink *self_comp)
 {
 	bt_component_class_sink_graph_is_configured_method_status status;
-	bt_self_component_port_input_message_iterator_create_from_sink_component_status
+	bt_message_iterator_create_from_sink_component_status
 		msg_iter_status;
 	struct simple_sink_data *data = bt_self_component_get_data(
 		bt_self_component_sink_as_self_component(self_comp));
@@ -130,9 +129,9 @@ simple_sink_graph_is_configured(
 	}
 
 	BT_ASSERT(data);
-	msg_iter_status = bt_self_component_port_input_message_iterator_create_from_sink_component(
+	msg_iter_status = bt_message_iterator_create_from_sink_component(
 		self_comp, self_port, &data->msg_iter);
-	if (msg_iter_status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
+	if (msg_iter_status != BT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
 		BT_LIB_LOGE_APPEND_CAUSE(
 			"Cannot create input port message iterator: "
 			"%![comp-]+c, %![port-]+p", self_comp, self_port);
@@ -141,12 +140,12 @@ simple_sink_graph_is_configured(
 	}
 
 	if (data->init_method_data.init_func) {
-		bt_graph_simple_sink_component_init_func_status init_status;
+		bt_graph_simple_sink_component_initialize_func_status init_status;
 
 		/* Call user's initialization function */
 		init_status = data->init_method_data.init_func(data->msg_iter,
 			data->init_method_data.user_data);
-		if (init_status != BT_GRAPH_SIMPLE_SINK_COMPONENT_INIT_FUNC_STATUS_OK) {
+		if (init_status != BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_OK) {
 			BT_LIB_LOGW_APPEND_CAUSE(
 				"Simple sink component's user's initialization function failed: "
 				"status=%s, %![comp-]+c, %![port-]+p",
@@ -171,14 +170,14 @@ enum bt_component_class_sink_consume_method_status simple_sink_consume(
 	struct simple_sink_data *data = bt_self_component_get_data(
 		bt_self_component_sink_as_self_component(self_comp));
 
-	BT_ASSERT(data);
-	BT_ASSERT(data->init_method_data.consume_func);
-	BT_ASSERT(data->msg_iter);
+	BT_ASSERT_DBG(data);
+	BT_ASSERT_DBG(data->init_method_data.consume_func);
+	BT_ASSERT_DBG(data->msg_iter);
 
 	/* Call user's "consume" function */
 	status = data->init_method_data.consume_func(data->msg_iter,
 		data->init_method_data.user_data);
-	if (status != BT_FUNC_STATUS_OK) {
+	if (status < 0) {
 		BT_LIB_LOGW_APPEND_CAUSE(
 			"Simple sink component's user's \"consume\" function failed: "
 			"status=%s, %![comp-]+c",
@@ -192,6 +191,8 @@ struct bt_component_class_sink *bt_component_class_sink_simple_borrow(void)
 {
 	enum bt_component_class_set_method_status set_method_status;
 
+	BT_ASSERT_PRE_NO_ERROR();
+
 	if (simple_comp_cls) {
 		goto end;
 	}
@@ -204,7 +205,7 @@ struct bt_component_class_sink *bt_component_class_sink_simple_borrow(void)
 		goto end;
 	}
 
-	set_method_status = bt_component_class_sink_set_init_method(
+	set_method_status = bt_component_class_sink_set_initialize_method(
 		simple_comp_cls, simple_sink_init);
 	BT_ASSERT(set_method_status == BT_FUNC_STATUS_OK);
 	set_method_status = bt_component_class_sink_set_finalize_method(