X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-class-sink-simple.c;h=69b40c1dee5e28477e6e5b554ecabaf7b3e28038;hb=d98421f2abfc5adab28ab7ee9b63537a6c7261cc;hp=b347280f7a8588b573c52d8bd8df097fc08eee1d;hpb=21559c8e6692c8afb1aab0b161bdda380a2bb19d;p=babeltrace.git

diff --git a/src/lib/graph/component-class-sink-simple.c b/src/lib/graph/component-class-sink-simple.c
index b347280f..69b40c1d 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:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
  *
- * 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,7 +29,7 @@ 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;
 };
 
@@ -111,7 +94,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 +113,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);
@@ -192,6 +175,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;
 	}