X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-sink.c;h=9d4e11d47cc17d9a4859cb77db6d6f8f0ddb02ca;hp=598392454b12c093cc35045880e71bd4fae3ac6c;hb=9b4f9b425f2efce9a6ccc25f7ae062ebc1116a7d;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d

diff --git a/src/lib/graph/component-sink.c b/src/lib/graph/component-sink.c
index 59839245..9d4e11d4 100644
--- a/src/lib/graph/component-sink.c
+++ b/src/lib/graph/component-sink.c
@@ -21,11 +21,12 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "COMP-SINK"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/COMPONENT-SINK"
+#include "lib/logging.h"
 
 #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>
@@ -34,6 +35,8 @@
 
 #include "component-sink.h"
 #include "component.h"
+#include "graph.h"
+#include "lib/func-status.h"
 
 BT_HIDDEN
 void bt_component_sink_destroy(struct bt_component *component)
@@ -48,7 +51,8 @@ struct bt_component *bt_component_sink_create(
 
 	sink = g_new0(struct bt_component_sink, 1);
 	if (!sink) {
-		BT_LOGE_STR("Failed to allocate one sink component.");
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to allocate one sink component.");
 		goto end;
 	}
 
@@ -62,7 +66,7 @@ bt_component_sink_borrow_class_const(
 {
 	struct bt_component_class *cls;
 
-	BT_ASSERT_PRE_NON_NULL(component, "Component");
+	BT_ASSERT_PRE_DEV_NON_NULL(component, "Component");
 
 	cls = component->parent.class;
 
@@ -113,18 +117,18 @@ bt_self_component_sink_borrow_input_port_by_index(
 		(void *) component, index);
 }
 
-enum bt_self_component_status bt_self_component_sink_add_input_port(
+enum bt_self_component_add_port_status bt_self_component_sink_add_input_port(
 		struct bt_self_component_sink *self_comp,
 		const char *name, void *user_data,
 		struct bt_self_component_port_input **self_port)
 {
-	enum bt_self_component_status status;
+	enum bt_self_component_add_port_status status;
 	struct bt_port *port = NULL;
 	struct bt_component *comp = (void *) self_comp;
 
 	/* bt_component_add_input_port() logs details/errors */
 	status = bt_component_add_input_port(comp, name, user_data, &port);
-	if (status != BT_SELF_COMPONENT_STATUS_OK) {
+	if (status != BT_FUNC_STATUS_OK) {
 		goto end;
 	}
 
@@ -139,6 +143,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)
 {