lib: remove duplicated assertion in bt_self_component_source_add_output_port

The use of BT_ASSERT_PRE_OUTPUT_PORT_NAME_UNIQUE in
bt_self_component_source_add_output_port is not necessary, as
bt_component_add_output_port checks the same thing:

	BT_ASSERT_PRE_FROM_FUNC(api_func, "output-port-name-is-unique",
		bt_component_port_name_is_unique(component->output_ports, name),
		"Output port name is not unique: name=\"%s\", %![comp-]c",
		name, component);

Remove this use of BT_ASSERT_PRE_OUTPUT_PORT_NAME_UNIQUE, and then
remove BT_ASSERT_PRE_OUTPUT_PORT_NAME_UNIQUE itself.  Then, make
bt_component_port_name_is_unique static to component.c, since it's only
used in that file now.

Change-Id: Ia341be570596d798179d1937b40726f829cbebfe
Reviewed-on: https://review.lttng.org/c/babeltrace/+/10035
Tested-by: jenkins <jenkins@lttng.org>
CI-Build: Simon Marchi <simon.marchi@efficios.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/src/lib/graph/component-source.c b/src/lib/graph/component-source.c
index 5701563ac7d5d74c834102ed720574c0cd264157..1a8d7fce23b361d187876a4327b3e274a2f271ec 100644 (file)
--- a/src/lib/graph/component-source.c
+++ b/src/lib/graph/component-source.c
@@ -129,7 +129,6 @@ enum bt_self_component_add_port_status bt_self_component_source_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/errors and checks

diff --git a/src/lib/graph/component.c b/src/lib/graph/component.c
index 14653172c9f0b4c47a0047ada268417e14fd1922..85d6aae9a456930944316b8230b430242c72de6f 100644 (file)
--- a/src/lib/graph/component.c
+++ b/src/lib/graph/component.c
@@ -450,6 +450,27 @@ struct bt_port_output *bt_component_borrow_output_port_by_index(
                borrow_port_by_index(comp->output_ports, index, api_func);
 }
 
+static
+bool port_name_is_unique(GPtrArray *ports, const char *name)
+{
+       guint i;
+       bool unique;
+
+       for (i = 0; i < ports->len; i++) {
+               struct bt_port *port = g_ptr_array_index(ports, i);
+
+               if (strcmp(port->name->str, name) == 0) {
+                       unique = false;
+                       goto end;
+               }
+       }
+
+       unique = true;
+
+end:
+       return unique;
+}
+
 enum bt_self_component_add_port_status bt_component_add_input_port(
                struct bt_component *component, const char *name,
                void *user_data, struct bt_port **port, const char *api_func)
@@ -457,7 +478,7 @@ enum bt_self_component_add_port_status bt_component_add_input_port(
        BT_ASSERT_PRE_COMP_NON_NULL_FROM_FUNC(api_func, component);
        BT_ASSERT_PRE_NAME_NON_NULL_FROM_FUNC(api_func, name);
        BT_ASSERT_PRE_FROM_FUNC(api_func, "input-port-name-is-unique",
-               bt_component_port_name_is_unique(component->input_ports, name),
+               port_name_is_unique(component->input_ports, name),
                "Input port name is not unique: name=\"%s\", %![comp-]c",
                name, component);
 
@@ -474,7 +495,7 @@ enum bt_self_component_add_port_status bt_component_add_output_port(
        BT_ASSERT_PRE_COMP_NON_NULL_FROM_FUNC(api_func, component);
        BT_ASSERT_PRE_NAME_NON_NULL_FROM_FUNC(api_func, name);
        BT_ASSERT_PRE_FROM_FUNC(api_func, "output-port-name-is-unique",
-               bt_component_port_name_is_unique(component->output_ports, name),
+               port_name_is_unique(component->output_ports, name),
                "Output port name is not unique: name=\"%s\", %![comp-]c",
                name, component);
 
@@ -483,26 +504,6 @@ enum bt_self_component_add_port_status bt_component_add_output_port(
                BT_PORT_TYPE_OUTPUT, name, user_data, port, api_func);
 }
 
-bool bt_component_port_name_is_unique(GPtrArray *ports, const char *name)
-{
-       guint i;
-       bool unique;
-
-       for (i = 0; i < ports->len; i++) {
-               struct bt_port *port = g_ptr_array_index(ports, i);
-
-               if (strcmp(port->name->str, name) == 0) {
-                       unique = false;
-                       goto end;
-               }
-       }
-
-       unique = true;
-
-end:
-       return unique;
-}
-
 enum bt_component_class_port_connected_method_status
 bt_component_port_connected(
                struct bt_component *comp, struct bt_port *self_port,

diff --git a/src/lib/graph/component.h b/src/lib/graph/component.h
index 9751ca96e473e6ec10c776c85961c8a9ecc92571..a562d3d5fbea6189894185e8e65b29b4cf459053 100644 (file)
--- a/src/lib/graph/component.h
+++ b/src/lib/graph/component.h
@@ -22,11 +22,6 @@
 #include "component-class.h"
 #include "port.h"
 
-#define BT_ASSERT_PRE_OUTPUT_PORT_NAME_UNIQUE(comp, name)              \
-       BT_ASSERT_PRE("output-port-is-unique",                          \
-               bt_component_port_name_is_unique(comp->output_ports, name), \
-               "Output port name is not unique: name=\"%s\", %![comp-]c", name, comp);
-
 typedef void (*bt_component_destroy_listener_func)(
                struct bt_component *class, void *data);
 
@@ -113,8 +108,6 @@ enum bt_self_component_add_port_status bt_component_add_output_port(
                void *user_data, struct bt_port **port,
                const char *api_func);
 
-bool bt_component_port_name_is_unique(GPtrArray *ports, const char *name);
-
 void bt_component_remove_port(struct bt_component *component,
                struct bt_port *port);