End connection on destruction

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

diff --git a/lib/graph/port.c b/lib/graph/port.c
index c0d5e061d2cd49e271d794de3bbe1e064a67fd5f..944e1cd4d859b4e08c711e1d5347a4c029fb5e31 100644 (file)
--- a/lib/graph/port.c
+++ b/lib/graph/port.c
@@ -26,6 +26,10 @@
  * SOFTWARE.
  */
 
+#define BT_LOG_TAG "PORT"
+#include <babeltrace/lib-logging-internal.h>
+
+#include <babeltrace/graph/port.h>
 #include <babeltrace/graph/component-internal.h>
 #include <babeltrace/graph/port-internal.h>
 #include <babeltrace/graph/connection-internal.h>
@@ -37,9 +41,13 @@ void bt_port_destroy(struct bt_object *obj)
 {
        struct bt_port *port = container_of(obj, struct bt_port, base);
 
+       BT_LOGD("Destroying port: addr=%p, name=\"%s\", comp-addr=%p",
+               port, bt_port_get_name(port), obj->parent);
+
        if (port->name) {
                g_string_free(port->name, TRUE);
        }
+
        g_free(port);
 }
 
@@ -51,7 +59,7 @@ struct bt_port *bt_port_from_private_port(
 
 BT_HIDDEN
 struct bt_port *bt_port_create(struct bt_component *parent_component,
-               enum bt_port_type type, const char *name)
+               enum bt_port_type type, const char *name, void *user_data)
 {
        struct bt_port *port = NULL;
 
@@ -60,24 +68,39 @@ struct bt_port *bt_port_create(struct bt_component *parent_component,
        assert(type == BT_PORT_TYPE_INPUT || type == BT_PORT_TYPE_OUTPUT);
 
        if (strlen(name) == 0) {
+               BT_LOGW_STR("Invalid parameter: name is an empty string.");
                goto end;
        }
 
        port = g_new0(struct bt_port, 1);
        if (!port) {
+               BT_LOGE_STR("Failed to allocate one port.");
                goto end;
        }
 
+       BT_LOGD("Creating port for component: "
+               "comp-addr=%p, comp-name=\"%s\", port-type=%s, "
+               "port-name=\"%s\"",
+               parent_component, bt_component_get_name(parent_component),
+               bt_port_type_string(type), name);
+
        bt_object_init(port, bt_port_destroy);
        port->name = g_string_new(name);
        if (!port->name) {
+               BT_LOGE_STR("Failed to allocate one GString.");
                BT_PUT(port);
                goto end;
        }
 
        port->type = type;
-
+       port->user_data = user_data;
        bt_object_set_parent(port, &parent_component->base);
+       BT_LOGD("Created port for component: "
+               "comp-addr=%p, comp-name=\"%s\", port-type=%s, "
+               "port-name=\"%s\", port-addr=%p",
+               parent_component, bt_component_get_name(parent_component),
+               bt_port_type_string(type), name, port);
+
 end:
        return port;
 }
@@ -96,11 +119,18 @@ struct bt_connection *bt_port_get_connection(struct bt_port *port)
 {
        struct bt_connection *connection = NULL;
 
-       if (!port || !port->connection) {
+       if (!port) {
+               BT_LOGW_STR("Invalid parameter: port is NULL.");
+               goto end;
+       }
+
+       if (!port->connection) {
+               /* Not an error: means disconnected */
                goto end;
        }
 
        connection = bt_get(port->connection);
+
 end:
        return connection;
 }
@@ -134,6 +164,9 @@ void bt_port_set_connection(struct bt_port *port,
         * connection exists.
         */
        port->connection = connection;
+       BT_LOGV("Set port's connection: "
+               "port-addr=%p, port-name=\"%s\", conn-addr=%p",
+               port, bt_port_get_name(port), connection);
 }
 
 int bt_private_port_remove_from_component(
@@ -144,11 +177,14 @@ int bt_private_port_remove_from_component(
        struct bt_component *comp = NULL;
 
        if (!port) {
+               BT_LOGW_STR("Invalid parameter: private port is NULL.");
                ret = -1;
                goto end;
        }
 
        comp = (void *) bt_object_get_parent(port);
+
+       /* bt_component_remove_port() logs details */
        ret = bt_component_remove_port(comp, port);
 
 end:
@@ -161,23 +197,28 @@ int bt_port_disconnect(struct bt_port *port)
        int ret = 0;
 
        if (!port) {
+               BT_LOGW_STR("Invalid parameter: port is NULL.");
                ret = -1;
                goto end;
        }
 
        if (port->connection) {
-               bt_connection_disconnect_ports(port->connection);
+               bt_connection_end(port->connection, true);
+               BT_LOGV("Disconnected port: "
+                       "port-addr=%p, port-name=\"%s\"",
+                       port, bt_port_get_name(port));
        }
 
 end:
        return ret;
 }
 
-int bt_port_is_connected(struct bt_port *port)
+bt_bool bt_port_is_connected(struct bt_port *port)
 {
        int ret;
 
        if (!port) {
+               BT_LOGW_STR("Invalid parameter: port is NULL.");
                ret = -1;
                goto end;
        }
@@ -188,22 +229,6 @@ end:
        return ret;
 }
 
-int bt_private_port_set_user_data(
-               struct bt_private_port *private_port, void *user_data)
-{
-       int ret = 0;
-
-       if (!private_port) {
-               ret = -1;
-               goto end;
-       }
-
-       bt_port_from_private(private_port)->user_data = user_data;
-
-end:
-       return ret;
-}
-
 void *bt_private_port_get_user_data(
                struct bt_private_port *private_port)
 {