lib: fully configure graph (add components, connect ports), then run

[babeltrace.git] / lib / graph / port.c

diff --git a/lib/graph/port.c b/lib/graph/port.c
index 9c1634dcd95f952722dd0b0a5260eacc3a7cb804..a04049a1cf4616f831764511f90ba190d4ae582b 100644 (file)
--- a/lib/graph/port.c
+++ b/lib/graph/port.c
@@ -1,8 +1,7 @@
 /*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: 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
@@ -25,6 +24,8 @@
 #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>
@@ -35,10 +36,7 @@
 #include <babeltrace/graph/port-internal.h>
 #include <babeltrace/graph/connection-internal.h>
 #include <babeltrace/object-internal.h>
-#include <babeltrace/object.h>
 #include <babeltrace/compiler-internal.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/assert-pre-internal.h>
 
 static
 void destroy_port(struct bt_object *obj)
@@ -139,26 +137,34 @@ void bt_port_set_connection(struct bt_port *port,
                connection);
 }
 
-enum bt_self_component_port_status bt_self_component_port_remove_from_component(
-               struct bt_self_component_port *self_port)
+static inline
+bool port_connection_iterators_are_finalized(struct bt_port *port)
 {
-       struct bt_port *port = (void *) self_port;
-       struct bt_component *comp = NULL;
-
-       BT_ASSERT_PRE_NON_NULL(port, "Port");
+       bool ret = true;
+       struct bt_connection *conn = port->connection;
+       uint64_t i;
 
-       comp = (void *) bt_object_borrow_parent(&port->base);
-       if (!comp) {
-               BT_LIB_LOGV("Port already removed from its component: %!+p",
-                       port);
+       if (!conn) {
                goto end;
        }
 
-       /* bt_component_remove_port() logs details */
-       bt_component_remove_port(comp, port);
+       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 BT_SELF_PORT_STATUS_OK;
+       return ret;
 }
 
 bt_bool bt_port_is_connected(const struct bt_port *port)
@@ -172,3 +178,33 @@ void *bt_self_component_port_get_data(const struct bt_self_component_port *port)
        BT_ASSERT_PRE_NON_NULL(port, "Port");
        return ((struct bt_port *) port)->user_data;
 }
+
+void bt_port_get_ref(const struct bt_port *port)
+{
+       bt_object_get_ref(port);
+}
+
+void bt_port_put_ref(const struct bt_port *port)
+{
+       bt_object_put_ref(port);
+}
+
+void bt_port_input_get_ref(const struct bt_port_input *port_input)
+{
+       bt_object_get_ref(port_input);
+}
+
+void bt_port_input_put_ref(const struct bt_port_input *port_input)
+{
+       bt_object_put_ref(port_input);
+}
+
+void bt_port_output_get_ref(const struct bt_port_output *port_output)
+{
+       bt_object_get_ref(port_output);
+}
+
+void bt_port_output_put_ref(const struct bt_port_output *port_output)
+{
+       bt_object_put_ref(port_output);
+}