X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent-filter.c;h=ba940dea6d19b252bd579b92c016e77a81cf310d;hb=1353b066072e6c389ff35853bac83f65597e7a6a;hp=3541514fbac87009dba6c22ef98847f1b8c1369f;hpb=157a98edd5aebe1b6ab7f60a49d8430450fabe76;p=babeltrace.git

diff --git a/src/lib/graph/component-filter.c b/src/lib/graph/component-filter.c
index 3541514f..ba940dea 100644
--- a/src/lib/graph/component-filter.c
+++ b/src/lib/graph/component-filter.c
@@ -9,7 +9,7 @@
 #include "lib/logging.h"
 
 #include "common/assert.h"
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
 #include "compat/compiler.h"
 #include <babeltrace2/value.h>
 #include <babeltrace2/graph/self-component.h>
@@ -21,19 +21,15 @@
 #include "component-class.h"
 #include "lib/func-status.h"
 
-BT_HIDDEN
 void bt_component_filter_destroy(struct bt_component *component)
 {
 }
 
-BT_HIDDEN
 struct bt_component *bt_component_filter_create(
 		const struct bt_component_class *class)
 {
 	struct bt_component_filter *filter = NULL;
 
-	BT_ASSERT_PRE_NO_ERROR();
-
 	filter = g_new0(struct bt_component_filter, 1);
 	if (!filter) {
 		BT_LIB_LOGE_APPEND_CAUSE(
@@ -45,13 +41,14 @@ end:
 	return (void *) filter;
 }
 
+BT_EXPORT
 const bt_component_class_filter *
 bt_component_filter_borrow_class_const(
 		const bt_component_filter *component)
 {
 	struct bt_component_class *cls;
 
-	BT_ASSERT_PRE_DEV_NON_NULL(component, "Component");
+	BT_ASSERT_PRE_DEV_COMP_NON_NULL(component);
 
 	cls = component->parent.class;
 
@@ -61,44 +58,67 @@ bt_component_filter_borrow_class_const(
 	return (bt_component_class_filter *) cls;
 }
 
+BT_EXPORT
 uint64_t bt_component_filter_get_output_port_count(
 		const struct bt_component_filter *comp)
 {
-	return bt_component_get_output_port_count((void *) comp);
+	/* bt_component_get_output_port_count() checks preconditions */
+	return bt_component_get_output_port_count((void *) comp, __func__);
 }
 
+BT_EXPORT
 const struct bt_port_output *
 bt_component_filter_borrow_output_port_by_name_const(
 		const struct bt_component_filter *comp, const char *name)
 {
+	/*
+	 * bt_component_borrow_output_port_by_name() logs details/errors
+	 * and checks preconditions.
+	 */
 	return bt_component_borrow_output_port_by_name(
-		(void *) comp, name);
+		(void *) comp, name, __func__);
 }
 
+BT_EXPORT
 struct bt_self_component_port_output *
 bt_self_component_filter_borrow_output_port_by_name(
 		struct bt_self_component_filter *comp, const char *name)
 {
+	/*
+	 * bt_component_borrow_output_port_by_name() logs details/errors
+	 * and checks preconditions.
+	 */
 	return (void *) bt_component_borrow_output_port_by_name(
-		(void *) comp, name);
+		(void *) comp, name, __func__);
 }
 
+BT_EXPORT
 const struct bt_port_output *
 bt_component_filter_borrow_output_port_by_index_const(
 		const struct bt_component_filter *comp, uint64_t index)
 {
+	/*
+	 * bt_component_borrow_output_port_by_index() logs
+	 * details/errors and checks preconditions.
+	 */
 	return bt_component_borrow_output_port_by_index(
-		(void *) comp, index);
+		(void *) comp, index, __func__);
 }
 
+BT_EXPORT
 struct bt_self_component_port_output *
 bt_self_component_filter_borrow_output_port_by_index(
 		struct bt_self_component_filter *comp, uint64_t index)
 {
+	/*
+	 * bt_component_borrow_output_port_by_index() logs
+	 * details/errors and checks preconditions.
+	 */
 	return (void *) bt_component_borrow_output_port_by_index(
-		(void *) comp, index);
+		(void *) comp, index, __func__);
 }
 
+BT_EXPORT
 enum bt_self_component_add_port_status bt_self_component_filter_add_output_port(
 		struct bt_self_component_filter *self_comp,
 		const char *name, void *user_data,
@@ -109,10 +129,13 @@ enum bt_self_component_add_port_status bt_self_component_filter_add_output_port(
 	struct bt_port *port = NULL;
 
 	BT_ASSERT_PRE_NO_ERROR();
-	BT_ASSERT_PRE_OUTPUT_PORT_NAME_UNIQUE(comp, name);
 
-	/* bt_component_add_output_port() logs details and errors */
-	status = bt_component_add_output_port(comp, name, user_data, &port);
+	/*
+	 * bt_component_add_output_port() logs details/errors and checks
+	 * preconditions.
+	 */
+	status = bt_component_add_output_port(comp, name, user_data, &port,
+		__func__);
 	if (status != BT_FUNC_STATUS_OK) {
 		goto end;
 	}
@@ -127,48 +150,66 @@ end:
 	return status;
 }
 
+BT_EXPORT
 uint64_t bt_component_filter_get_input_port_count(
 		const struct bt_component_filter *component)
 {
-	/* bt_component_get_input_port_count() logs details/errors */
-	return bt_component_get_input_port_count((void *) component);
+	/* bt_component_get_input_port_count() checks preconditions */
+	return bt_component_get_input_port_count((void *) component, __func__);
 }
 
+BT_EXPORT
 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 */
+	/*
+	 * bt_component_borrow_input_port_by_name() logs details/errors
+	 * and checks preconditions.
+	 */
 	return bt_component_borrow_input_port_by_name(
-		(void *) component, name);
+		(void *) component, name, __func__);
 }
 
+BT_EXPORT
 struct bt_self_component_port_input *
 bt_self_component_filter_borrow_input_port_by_name(
 		struct bt_self_component_filter *component, const char *name)
 {
-	/* bt_component_borrow_input_port_by_name() logs details/errors */
+	/*
+	 * bt_component_borrow_input_port_by_name() logs details/errors
+	 * and checks preconditions.
+	 */
 	return (void *) bt_component_borrow_input_port_by_name(
-		(void *) component, name);
+		(void *) component, name, __func__);
 }
 
+BT_EXPORT
 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 */
+	/*
+	 * bt_component_borrow_input_port_by_index() logs details/errors
+	 * and checks preconditions.
+	 */
 	return bt_component_borrow_input_port_by_index(
-		(void *) component, index);
+		(void *) component, index, __func__);
 }
 
+BT_EXPORT
 struct bt_self_component_port_input *
 bt_self_component_filter_borrow_input_port_by_index(
 		struct bt_self_component_filter *component, uint64_t index)
 {
-	/* bt_component_borrow_input_port_by_index() logs details/errors */
+	/*
+	 * bt_component_borrow_input_port_by_index() logs details/errors
+	 * and checks preconditions.
+	 */
 	return (void *) bt_component_borrow_input_port_by_index(
-		(void *) component, index);
+		(void *) component, index, __func__);
 }
 
+BT_EXPORT
 enum bt_self_component_add_port_status bt_self_component_filter_add_input_port(
 		struct bt_self_component_filter *self_comp,
 		const char *name, void *user_data,
@@ -179,10 +220,13 @@ enum bt_self_component_add_port_status bt_self_component_filter_add_input_port(
 	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);
+	/*
+	 * bt_component_add_input_port() logs details/errors and checks
+	 * preconditions.
+	 */
+	status = bt_component_add_input_port(comp, name, user_data, &port,
+		__func__);
 	if (status != BT_FUNC_STATUS_OK) {
 		goto end;
 	}
@@ -197,12 +241,14 @@ end:
 	return status;
 }
 
+BT_EXPORT
 void bt_component_filter_get_ref(
 		const struct bt_component_filter *component_filter)
 {
 	bt_object_get_ref(component_filter);
 }
 
+BT_EXPORT
 void bt_component_filter_put_ref(
 		const struct bt_component_filter *component_filter)
 {