X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-sink.c;h=1f4a5a66589533e65d83c10d5849788f31058f37;hb=157a98edd5aebe1b6ab7f60a49d8430450fabe76;hp=b218144d145d863f3630843c21880a3b6d2e6d87;hpb=bdb288b3e94e412a33c8647d44f6cfac66ca0665;p=babeltrace.git

diff --git a/src/lib/graph/component-sink.c b/src/lib/graph/component-sink.c
index b218144d..1f4a5a66 100644
--- a/src/lib/graph/component-sink.c
+++ b/src/lib/graph/component-sink.c
@@ -1,24 +1,8 @@
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@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.
- *
- * 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.
  */
 
 #define BT_LOG_TAG "LIB/COMPONENT-SINK"
@@ -26,14 +10,16 @@
 
 #include "common/assert.h"
 #include "lib/assert-pre.h"
+#include "lib/assert-post.h"
 #include "compat/compiler.h"
 #include <babeltrace2/value.h>
-#include <babeltrace2/graph/self-component-sink.h>
-#include <babeltrace2/graph/component-sink-const.h>
+#include <babeltrace2/graph/self-component.h>
+#include <babeltrace2/graph/component.h>
 #include <babeltrace2/graph/graph.h>
 
 #include "component-sink.h"
 #include "component.h"
+#include "graph.h"
 #include "lib/func-status.h"
 
 BT_HIDDEN
@@ -47,6 +33,8 @@ struct bt_component *bt_component_sink_create(
 {
 	struct bt_component_sink *sink = NULL;
 
+	BT_ASSERT_PRE_NO_ERROR();
+
 	sink = g_new0(struct bt_component_sink, 1);
 	if (!sink) {
 		BT_LIB_LOGE_APPEND_CAUSE(
@@ -68,8 +56,8 @@ bt_component_sink_borrow_class_const(
 
 	cls = component->parent.class;
 
-	BT_ASSERT(cls);
-	BT_ASSERT(cls->type == BT_COMPONENT_CLASS_TYPE_SINK);
+	BT_ASSERT_DBG(cls);
+	BT_ASSERT_DBG(cls->type == BT_COMPONENT_CLASS_TYPE_SINK);
 
 	return (bt_component_class_sink *) cls;
 }
@@ -124,6 +112,9 @@ enum bt_self_component_add_port_status bt_self_component_sink_add_input_port(
 	struct bt_port *port = NULL;
 	struct bt_component *comp = (void *) self_comp;
 
+	BT_ASSERT_PRE_NO_ERROR();
+	BT_ASSERT_PRE_INPUT_PORT_NAME_UNIQUE(comp, name);
+
 	/* bt_component_add_input_port() logs details/errors */
 	status = bt_component_add_input_port(comp, name, user_data, &port);
 	if (status != BT_FUNC_STATUS_OK) {
@@ -133,7 +124,6 @@ enum bt_self_component_add_port_status bt_self_component_sink_add_input_port(
 	if (self_port) {
 		/* Move reference to user */
 		*self_port = (void *) port;
-		port = NULL;
 	}
 
 end:
@@ -141,6 +131,16 @@ end:
 	return status;
 }
 
+bt_bool bt_self_component_sink_is_interrupted(
+		const struct bt_self_component_sink *self_comp)
+{
+	struct bt_component *comp = (void *) self_comp;
+
+	BT_ASSERT_PRE_NON_NULL(comp, "Component");
+	return (bt_bool) bt_graph_is_interrupted(
+		bt_component_borrow_graph(comp));
+}
+
 void bt_component_sink_get_ref(
 		const struct bt_component_sink *component_sink)
 {