X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-class-sink-simple.c;h=812e3b5fe4ed86e32a6b61506669535f9fe4a7e7;hb=46c7e45bc65331d6b43ffc44c7c30265d0a03480;hp=797ee50a61d1ffae98d49fa47dbe5549d2344ade;hpb=078033edee10d9764e5779f081b38507af41bdcf;p=babeltrace.git

diff --git a/src/lib/graph/component-class-sink-simple.c b/src/lib/graph/component-class-sink-simple.c
index 797ee50a..812e3b5f 100644
--- a/src/lib/graph/component-class-sink-simple.c
+++ b/src/lib/graph/component-class-sink-simple.c
@@ -1,23 +1,7 @@
 /*
- * Copyright 2017-2019 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2017-2019 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_LOG_TAG "LIB/COMPONENT-CLASS-SINK-SIMPLE"
@@ -25,13 +9,12 @@
 
 #include "common/assert.h"
 #include "common/common.h"
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.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,13 +29,23 @@ 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(
-		struct bt_self_component_sink *self_comp,
+void simple_sink_data_destroy(struct simple_sink_data *data)
+{
+	if (data) {
+		BT_OBJECT_PUT_REF_AND_RESET(data->msg_iter);
+		g_free(data);
+	}
+}
+
+static
+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)
 {
 	int status = BT_FUNC_STATUS_OK;
@@ -79,10 +72,13 @@ enum bt_component_class_init_method_status simple_sink_init(
 		goto end;
 	}
 
+	/* Transfer ownership to component */
 	bt_self_component_set_data(
 		bt_self_component_sink_as_self_component(self_comp), data);
+	data = NULL;
 
 end:
+	simple_sink_data_destroy(data);
 	return status;
 }
 
@@ -92,16 +88,15 @@ void simple_sink_finalize(struct bt_self_component_sink *self_comp)
 	struct simple_sink_data *data = bt_self_component_get_data(
 		bt_self_component_sink_as_self_component(self_comp));
 
-	if (data) {
-		if (data->init_method_data.finalize_func) {
-			/* Call user's finalization function */
-			data->init_method_data.finalize_func(
-				data->init_method_data.user_data);
-		}
+	BT_ASSERT(data);
 
-		BT_OBJECT_PUT_REF_AND_RESET(data->msg_iter);
-		g_free(data);
+	if (data->init_method_data.finalize_func) {
+		/* Call user's finalization function */
+		data->init_method_data.finalize_func(
+			data->init_method_data.user_data);
 	}
+
+	simple_sink_data_destroy(data);
 }
 
 static
@@ -109,7 +104,9 @@ enum bt_component_class_sink_graph_is_configured_method_status
 simple_sink_graph_is_configured(
 	bt_self_component_sink *self_comp)
 {
-	int status = BT_FUNC_STATUS_OK;
+	bt_component_class_sink_graph_is_configured_method_status 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));
 
@@ -122,36 +119,40 @@ simple_sink_graph_is_configured(
 		BT_LIB_LOGE_APPEND_CAUSE(
 			"Simple sink component's input port is not connected: "
 			"%![comp-]+c, %![port-]+p", self_comp, self_port);
-		status = BT_FUNC_STATUS_ERROR;
+		status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_ERROR;
 		goto end;
 	}
 
 	BT_ASSERT(data);
-	data->msg_iter =
-		bt_self_component_port_input_message_iterator_create_from_sink_component(
-			self_comp, self_port);
-	if (!data->msg_iter) {
+	msg_iter_status = bt_message_iterator_create_from_sink_component(
+		self_comp, self_port, &data->msg_iter);
+	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);
-		status = BT_FUNC_STATUS_MEMORY_ERROR;
+		status = (int) msg_iter_status;
 		goto end;
 	}
 
 	if (data->init_method_data.init_func) {
+		bt_graph_simple_sink_component_initialize_func_status init_status;
+
 		/* Call user's initialization function */
-		status = data->init_method_data.init_func(data->msg_iter,
+		init_status = data->init_method_data.init_func(data->msg_iter,
 			data->init_method_data.user_data);
-		if (status != BT_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",
-				bt_common_func_status_string(status),
+				bt_common_func_status_string(init_status),
 				self_comp, self_port);
+			status = (int) init_status;
 			goto end;
 		}
 	}
 
+	status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
+
 end:
 	return status;
 }
@@ -164,14 +165,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",
@@ -181,6 +182,7 @@ enum bt_component_class_sink_consume_method_status simple_sink_consume(
 	return status;
 }
 
+BT_HIDDEN
 struct bt_component_class_sink *bt_component_class_sink_simple_borrow(void)
 {
 	enum bt_component_class_set_method_status set_method_status;
@@ -197,7 +199,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(