X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fcomponent-filter.c;h=8c79b6381b153eae8d904a1c200eb3c455920681;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=d9cb06e3001c15c4657ef9790a733a7d8e89bc33;hpb=d94d92ac6656fd252a5d7bb4f6c76935ba18e62e;p=babeltrace.git

diff --git a/lib/graph/component-filter.c b/lib/graph/component-filter.c
index d9cb06e3..8c79b638 100644
--- a/lib/graph/component-filter.c
+++ b/lib/graph/component-filter.c
@@ -1,8 +1,7 @@
 /*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2016 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,21 +22,18 @@
  */
 
 #define BT_LOG_TAG "COMP-FILTER"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/values.h>
-#include <babeltrace/graph/self-component-filter.h>
-#include <babeltrace/graph/component-filter.h>
-#include <babeltrace/graph/component-filter-internal.h>
-#include <babeltrace/graph/component-internal.h>
-#include <babeltrace/graph/component-class-internal.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-iterator-internal.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-filter.h>
+#include <babeltrace2/graph/component-filter-const.h>
+#include <babeltrace2/graph/component-filter-internal.h>
+#include <babeltrace2/graph/component-internal.h>
+#include <babeltrace2/graph/component-class-internal.h>
+#include <babeltrace2/graph/graph.h>
 
 BT_HIDDEN
 void bt_component_filter_destroy(struct bt_component *component)
@@ -46,7 +42,7 @@ void bt_component_filter_destroy(struct bt_component *component)
 
 BT_HIDDEN
 struct bt_component *bt_component_filter_create(
-		struct bt_component_class *class)
+		const struct bt_component_class *class)
 {
 	struct bt_component_filter *filter = NULL;
 
@@ -60,14 +56,31 @@ end:
 	return (void *) filter;
 }
 
+const bt_component_class_filter *
+bt_component_filter_borrow_class_const(
+		const bt_component_filter *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_FILTER);
+
+	return (bt_component_class_filter *) cls;
+}
+
 uint64_t bt_component_filter_get_output_port_count(
-		struct bt_component_filter *comp)
+		const struct bt_component_filter *comp)
 {
 	return bt_component_get_output_port_count((void *) comp);
 }
 
-struct bt_port_output *bt_component_filter_borrow_output_port_by_name(
-		struct bt_component_filter *comp, const char *name)
+const struct bt_port_output *
+bt_component_filter_borrow_output_port_by_name_const(
+		const struct bt_component_filter *comp, const char *name)
 {
 	return bt_component_borrow_output_port_by_name(
 		(void *) comp, name);
@@ -81,8 +94,9 @@ bt_self_component_filter_borrow_output_port_by_name(
 		(void *) comp, name);
 }
 
-struct bt_port_output *bt_component_filter_borrow_output_port_by_index(
-		struct bt_component_filter *comp, uint64_t index)
+const struct bt_port_output *
+bt_component_filter_borrow_output_port_by_index_const(
+		const struct bt_component_filter *comp, uint64_t index)
 {
 	return bt_component_borrow_output_port_by_index(
 		(void *) comp, index);
@@ -102,13 +116,12 @@ enum bt_self_component_status bt_self_component_filter_add_output_port(
 		struct bt_self_component_port_output **self_port)
 {
 	struct bt_component *comp = (void *) self_comp;
-	int status = BT_SELF_COMPONENT_STATUS_OK;
+	enum bt_self_component_status status;
 	struct bt_port *port = NULL;
 
 	/* bt_component_add_output_port() logs details and errors */
-	port = (void *) bt_component_add_output_port(comp, name, user_data);
-	if (!port) {
-		status = BT_SELF_COMPONENT_STATUS_NOMEM;
+	status = bt_component_add_output_port(comp, name, user_data, &port);
+	if (status != BT_SELF_COMPONENT_STATUS_OK) {
 		goto end;
 	}
 
@@ -124,14 +137,14 @@ end:
 }
 
 uint64_t bt_component_filter_get_input_port_count(
-		struct bt_component_filter *component)
+		const struct bt_component_filter *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_filter_borrow_input_port_by_name(
-		struct bt_component_filter *component, const char *name)
+const struct bt_port_input *bt_component_filter_borrow_input_port_by_name_const(
+		const struct bt_component_filter *component, const char *name)
 {
 	/* bt_component_borrow_input_port_by_name() logs details/errors */
 	return bt_component_borrow_input_port_by_name(
@@ -147,8 +160,9 @@ bt_self_component_filter_borrow_input_port_by_name(
 		(void *) component, name);
 }
 
-struct bt_port_input *bt_component_filter_borrow_input_port_by_index(
-		struct bt_component_filter *component, uint64_t index)
+const struct bt_port_input *
+bt_component_filter_borrow_input_port_by_index_const(
+		const struct bt_component_filter *component, uint64_t index)
 {
 	/* bt_component_borrow_input_port_by_index() logs details/errors */
 	return bt_component_borrow_input_port_by_index(
@@ -169,14 +183,13 @@ enum bt_self_component_status bt_self_component_filter_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;
 	}
 
@@ -190,3 +203,15 @@ end:
 	bt_object_put_ref(port);
 	return status;
 }
+
+void bt_component_filter_get_ref(
+		const struct bt_component_filter *component_filter)
+{
+	bt_object_get_ref(component_filter);
+}
+
+void bt_component_filter_put_ref(
+		const struct bt_component_filter *component_filter)
+{
+	bt_object_put_ref(component_filter);
+}