X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fport.c;h=f119d60b6dfb5414ac805cc90b3b1550c4296f2b;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=86d01b92ac82e0bc1ee6023772e375bc8629468c;hpb=d0fea13089e4ea4825826b1022ff0d8110ef2898;p=babeltrace.git

diff --git a/lib/graph/port.c b/lib/graph/port.c
index 86d01b92..f119d60b 100644
--- a/lib/graph/port.c
+++ b/lib/graph/port.c
@@ -22,21 +22,21 @@
  */
 
 #define BT_LOG_TAG "PORT"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/graph/port-const.h>
-#include <babeltrace/graph/port-input-const.h>
-#include <babeltrace/graph/port-output-const.h>
-#include <babeltrace/graph/self-component-port.h>
-#include <babeltrace/graph/self-component-port-input.h>
-#include <babeltrace/graph/self-component-port-output.h>
-#include <babeltrace/graph/component-internal.h>
-#include <babeltrace/graph/port-internal.h>
-#include <babeltrace/graph/connection-internal.h>
-#include <babeltrace/object-internal.h>
-#include <babeltrace/compiler-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/graph/port-const.h>
+#include <babeltrace2/graph/port-input-const.h>
+#include <babeltrace2/graph/port-output-const.h>
+#include <babeltrace2/graph/self-component-port.h>
+#include <babeltrace2/graph/self-component-port-input.h>
+#include <babeltrace2/graph/self-component-port-output.h>
+#include <babeltrace2/graph/component-internal.h>
+#include <babeltrace2/graph/port-internal.h>
+#include <babeltrace2/graph/connection-internal.h>
+#include <babeltrace2/object-internal.h>
+#include <babeltrace2/compiler-internal.h>
 
 static
 void destroy_port(struct bt_object *obj)
@@ -137,59 +137,6 @@ void bt_port_set_connection(struct bt_port *port,
 		connection);
 }
 
-static inline
-bool port_connection_iterators_are_finalized(struct bt_port *port)
-{
-	bool ret = true;
-	struct bt_connection *conn = port->connection;
-	uint64_t i;
-
-	if (!conn) {
-		goto end;
-	}
-
-	for (i = 0; i < conn->iterators->len; i++) {
-		struct bt_self_component_port_input_message_iterator *iterator =
-			conn->iterators->pdata[i];
-
-		BT_ASSERT(iterator);
-
-		if (iterator->state != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZING &&
-				iterator->state != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZED) {
-			BT_ASSERT_PRE_MSG("Message iterator is not being finalized or finalized: "
-				"%!+i", iterator);
-			ret = false;
-			goto end;
-		}
-	}
-
-end:
-	return ret;
-}
-
-enum bt_self_component_port_status bt_self_component_port_remove_from_component(
-		struct bt_self_component_port *self_port)
-{
-	struct bt_port *port = (void *) self_port;
-	struct bt_component *comp = NULL;
-
-	BT_ASSERT_PRE_NON_NULL(port, "Port");
-	BT_ASSERT_PRE(port_connection_iterators_are_finalized(port),
-		"At least one message iterator using this port has the wrong state.");
-	comp = (void *) bt_object_borrow_parent(&port->base);
-	if (!comp) {
-		BT_LIB_LOGV("Port already removed from its component: %!+p",
-			port);
-		goto end;
-	}
-
-	/* bt_component_remove_port() logs details */
-	bt_component_remove_port(comp, port);
-
-end:
-	return BT_SELF_PORT_STATUS_OK;
-}
-
 bt_bool bt_port_is_connected(const struct bt_port *port)
 {
 	BT_ASSERT_PRE_NON_NULL(port, "Port");