X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fcomponent-sink.c;h=1887fbfd3bb68edea03d9387fc7895010bb940d2;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=65403b8a78dc8d4e77a24a7eec50946ea31b2828;hpb=d94d92ac6656fd252a5d7bb4f6c76935ba18e62e;p=babeltrace.git

diff --git a/lib/graph/component-sink.c b/lib/graph/component-sink.c
index 65403b8a..1887fbfd 100644
--- a/lib/graph/component-sink.c
+++ b/lib/graph/component-sink.c
@@ -1,8 +1,7 @@
 /*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: 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
@@ -23,19 +22,17 @@
  */
 
 #define BT_LOG_TAG "COMP-SINK"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/values.h>
-#include <babeltrace/graph/self-component-sink.h>
-#include <babeltrace/graph/component-sink.h>
-#include <babeltrace/graph/component-sink-internal.h>
-#include <babeltrace/graph/component-internal.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/graph.h>
-#include <babeltrace/object.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/assert-pre-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/value.h>
+#include <babeltrace2/graph/self-component-sink.h>
+#include <babeltrace2/graph/component-sink-const.h>
+#include <babeltrace2/graph/component-sink-internal.h>
+#include <babeltrace2/graph/component-internal.h>
+#include <babeltrace2/graph/graph.h>
 
 BT_HIDDEN
 void bt_component_sink_destroy(struct bt_component *component)
@@ -43,7 +40,8 @@ void bt_component_sink_destroy(struct bt_component *component)
 }
 
 BT_HIDDEN
-struct bt_component *bt_component_sink_create(struct bt_component_class *class)
+struct bt_component *bt_component_sink_create(
+		const struct bt_component_class *class)
 {
 	struct bt_component_sink *sink = NULL;
 
@@ -57,15 +55,32 @@ end:
 	return (void *) sink;
 }
 
+const bt_component_class_sink *
+bt_component_sink_borrow_class_const(
+		const bt_component_sink *component)
+{
+	struct bt_component_class *cls;
+
+	BT_ASSERT_PRE_NON_NULL(component, "Component");
+
+	cls = component->parent.class;
+
+	BT_ASSERT(cls);
+	BT_ASSERT(cls->type == BT_COMPONENT_CLASS_TYPE_SINK);
+
+	return (bt_component_class_sink *) cls;
+}
+
 uint64_t bt_component_sink_get_input_port_count(
-		struct bt_component_sink *component)
+		const struct bt_component_sink *component)
 {
 	/* bt_component_get_input_port_count() logs details/errors */
 	return bt_component_get_input_port_count((void *) component);
 }
 
-struct bt_port_input *bt_component_sink_borrow_input_port_by_name(
-		struct bt_component_sink *component, const char *name)
+const struct bt_port_input *
+bt_component_sink_borrow_input_port_by_name_const(
+		const struct bt_component_sink *component, const char *name)
 {
 	/* bt_component_borrow_input_port_by_name() logs details/errors */
 	return bt_component_borrow_input_port_by_name((void *) component, name);
@@ -80,8 +95,8 @@ bt_self_component_sink_borrow_input_port_by_name(
 		(void *) component, name);
 }
 
-struct bt_port_input *bt_component_sink_borrow_input_port_by_index(
-		struct bt_component_sink *component, uint64_t index)
+const struct bt_port_input *bt_component_sink_borrow_input_port_by_index_const(
+		const struct bt_component_sink *component, uint64_t index)
 {
 	/* bt_component_borrow_input_port_by_index() logs details/errors */
 	return bt_component_borrow_input_port_by_index(
@@ -102,14 +117,13 @@ enum bt_self_component_status bt_self_component_sink_add_input_port(
 		const char *name, void *user_data,
 		struct bt_self_component_port_input **self_port)
 {
-	int status = BT_SELF_COMPONENT_STATUS_OK;
+	enum bt_self_component_status status;
 	struct bt_port *port = NULL;
 	struct bt_component *comp = (void *) self_comp;
 
 	/* bt_component_add_input_port() logs details/errors */
-	port = (void *) bt_component_add_input_port(comp, name, user_data);
-	if (!port) {
-		status = BT_SELF_COMPONENT_STATUS_NOMEM;
+	status = bt_component_add_input_port(comp, name, user_data, &port);
+	if (status != BT_SELF_COMPONENT_STATUS_OK) {
 		goto end;
 	}
 
@@ -123,3 +137,15 @@ end:
 	bt_object_put_ref(port);
 	return status;
 }
+
+void bt_component_sink_get_ref(
+		const struct bt_component_sink *component_sink)
+{
+	bt_object_get_ref(component_sink);
+}
+
+void bt_component_sink_put_ref(
+		const struct bt_component_sink *component_sink)
+{
+	bt_object_put_ref(component_sink);
+}