X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fcomponent.h;h=387996aac4ad5e592a8a35a3ebdbc57101898f2c;hb=157a98edd5aebe1b6ab7f60a49d8430450fabe76;hp=2155d5da203ca6bcbf5acb0edee384c440dae7fa;hpb=e874da19b9fd96ac87f70595e0463f8e03af29af;p=babeltrace.git

diff --git a/src/lib/graph/component.h b/src/lib/graph/component.h
index 2155d5da..387996aa 100644
--- a/src/lib/graph/component.h
+++ b/src/lib/graph/component.h
@@ -1,41 +1,35 @@
-#ifndef BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
-#define BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
-
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2015 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.
  */
 
+#ifndef BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
+#define BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
+
 #include "common/macros.h"
-#include <babeltrace2/graph/component-const.h>
+#include <babeltrace2/graph/component.h>
+#include <babeltrace2/graph/component-class.h>
 #include "lib/object.h"
 #include <babeltrace2/types.h>
 #include <babeltrace2/logging.h>
 #include "common/assert.h"
 #include <glib.h>
+#include <stdbool.h>
 #include <stdio.h>
 
 #include "component-class.h"
 #include "port.h"
 
+#define BT_ASSERT_PRE_INPUT_PORT_NAME_UNIQUE(comp, name) \
+	BT_ASSERT_PRE(bt_component_port_name_is_unique(comp->input_ports, name), \
+		"Input port name is not unique: name=\"%s\", %![comp-]c", name, comp);
+
+#define BT_ASSERT_PRE_OUTPUT_PORT_NAME_UNIQUE(comp, name) \
+	BT_ASSERT_PRE(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);
 
@@ -74,7 +68,7 @@ struct bt_component {
 static inline
 struct bt_graph *bt_component_borrow_graph(struct bt_component *comp)
 {
-	BT_ASSERT(comp);
+	BT_ASSERT_DBG(comp);
 	return (void *) bt_object_borrow_parent(&comp->base);
 }
 
@@ -84,12 +78,8 @@ int bt_component_create(struct bt_component_class *component_class,
 		struct bt_component **component);
 
 BT_HIDDEN
-enum bt_self_component_status bt_component_accept_port_connection(
-		struct bt_component *component, struct bt_port *self_port,
-		struct bt_port *other_port);
-
-BT_HIDDEN
-enum bt_self_component_status bt_component_port_connected(
+enum bt_component_class_port_connected_method_status
+bt_component_port_connected(
 		struct bt_component *comp,
 		struct bt_port *self_port, struct bt_port *other_port);
 
@@ -120,15 +110,18 @@ struct bt_port_output *bt_component_borrow_output_port_by_name(
 		struct bt_component *comp, const char *name);
 
 BT_HIDDEN
-enum bt_self_component_status bt_component_add_input_port(
+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);
 
 BT_HIDDEN
-enum bt_self_component_status bt_component_add_output_port(
+enum bt_self_component_add_port_status bt_component_add_output_port(
 		struct bt_component *component, const char *name,
 		void *user_data, struct bt_port **port);
 
+BT_HIDDEN
+bool bt_component_port_name_is_unique(GPtrArray *ports, const char *name);
+
 BT_HIDDEN
 void bt_component_remove_port(struct bt_component *component,
 		struct bt_port *port);
@@ -141,26 +134,4 @@ BT_HIDDEN
 void bt_component_remove_destroy_listener(struct bt_component *component,
 		bt_component_destroy_listener_func func, void *data);
 
-static inline
-const char *bt_self_component_status_string(
-		enum bt_self_component_status status)
-{
-	switch (status) {
-	case BT_SELF_COMPONENT_STATUS_OK:
-		return "BT_SELF_COMPONENT_STATUS_OK";
-	case BT_SELF_COMPONENT_STATUS_END:
-		return "BT_SELF_COMPONENT_STATUS_END";
-	case BT_SELF_COMPONENT_STATUS_AGAIN:
-		return "BT_SELF_COMPONENT_STATUS_AGAIN";
-	case BT_SELF_COMPONENT_STATUS_REFUSE_PORT_CONNECTION:
-		return "BT_SELF_COMPONENT_STATUS_REFUSE_PORT_CONNECTION";
-	case BT_SELF_COMPONENT_STATUS_ERROR:
-		return "BT_SELF_COMPONENT_STATUS_ERROR";
-	case BT_SELF_COMPONENT_STATUS_NOMEM:
-		return "BT_SELF_COMPONENT_STATUS_NOMEM";
-	default:
-		return "(unknown)";
-	}
-}
-
 #endif /* BABELTRACE_GRAPH_COMPONENT_INTERNAL_H */