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

diff --git a/src/lib/graph/component-filter.c b/src/lib/graph/component-filter.c
index 5efff1ab..3541514f 100644
--- a/src/lib/graph/component-filter.c
+++ b/src/lib/graph/component-filter.c
@@ -1,24 +1,8 @@
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2016 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-FILTER"
@@ -28,8 +12,8 @@
 #include "lib/assert-pre.h"
 #include "compat/compiler.h"
 #include <babeltrace2/value.h>
-#include <babeltrace2/graph/self-component-filter.h>
-#include <babeltrace2/graph/component-filter-const.h>
+#include <babeltrace2/graph/self-component.h>
+#include <babeltrace2/graph/component.h>
 #include <babeltrace2/graph/graph.h>
 
 #include "component-filter.h"
@@ -48,9 +32,12 @@ struct bt_component *bt_component_filter_create(
 {
 	struct bt_component_filter *filter = NULL;
 
+	BT_ASSERT_PRE_NO_ERROR();
+
 	filter = g_new0(struct bt_component_filter, 1);
 	if (!filter) {
-		BT_LOGE_STR("Failed to allocate one filter component.");
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to allocate one filter component.");
 		goto end;
 	}
 
@@ -64,12 +51,12 @@ bt_component_filter_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;
 
-	BT_ASSERT(cls);
-	BT_ASSERT(cls->type == BT_COMPONENT_CLASS_TYPE_FILTER);
+	BT_ASSERT_DBG(cls);
+	BT_ASSERT_DBG(cls->type == BT_COMPONENT_CLASS_TYPE_FILTER);
 
 	return (bt_component_class_filter *) cls;
 }
@@ -121,6 +108,9 @@ enum bt_self_component_add_port_status bt_self_component_filter_add_output_port(
 	enum bt_self_component_add_port_status status;
 	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);
 	if (status != BT_FUNC_STATUS_OK) {
@@ -130,7 +120,6 @@ enum bt_self_component_add_port_status bt_self_component_filter_add_output_port(
 	if (self_port) {
 		/* Move reference to user */
 		*self_port = (void *) port;
-		port = NULL;
 	}
 
 end:
@@ -189,6 +178,9 @@ enum bt_self_component_add_port_status bt_self_component_filter_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) {
@@ -198,7 +190,6 @@ enum bt_self_component_add_port_status bt_self_component_filter_add_input_port(
 	if (self_port) {
 		/* Move reference to user */
 		*self_port = (void *) port;
-		port = NULL;
 	}
 
 end: