#include <babeltrace/graph/connection-internal.h>
#include <babeltrace/object-internal.h>
#include <babeltrace/compiler-internal.h>
+#include <babeltrace/assert-internal.h>
static
void bt_port_destroy(struct bt_object *obj)
g_free(port);
}
-struct bt_port *bt_port_from_private_port(
+struct bt_port *bt_port_borrow_from_private(
struct bt_private_port *private_port)
{
- return bt_get(bt_port_from_private(private_port));
+ return (void *) private_port;
}
BT_HIDDEN
{
struct bt_port *port = NULL;
- assert(name);
- assert(parent_component);
- assert(type == BT_PORT_TYPE_INPUT || type == BT_PORT_TYPE_OUTPUT);
+ BT_ASSERT(name);
+ BT_ASSERT(parent_component);
+ BT_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.");
parent_component, bt_component_get_name(parent_component),
bt_port_type_string(type), name);
- bt_object_init(port, bt_port_destroy);
+ bt_object_init_shared_with_parent(&port->base, bt_port_destroy);
port->name = g_string_new(name);
if (!port->name) {
BT_LOGE_STR("Failed to allocate one GString.");
- BT_PUT(port);
+ BT_OBJECT_PUT_REF_AND_RESET(port);
goto end;
}
port->type = type;
port->user_data = user_data;
- bt_object_set_parent(port, &parent_component->base);
+ bt_object_set_parent(&port->base, &parent_component->base);
BT_LOGD("Created port for component: "
"comp-addr=%p, comp-name=\"%s\", port-type=%s, "
"port-name=\"%s\", port-addr=%p",
goto end;
}
- connection = bt_get(port->connection);
+ connection = bt_object_get_ref(port->connection);
end:
return connection;
struct bt_component *bt_port_get_component(struct bt_port *port)
{
- return (struct bt_component *) bt_object_get_parent(port);
+ return (struct bt_component *) bt_object_get_parent(&port->base);
}
-struct bt_private_connection *bt_private_port_get_private_connection(
+struct bt_private_connection *bt_private_port_get_connection(
struct bt_private_port *private_port)
{
return bt_private_connection_from_connection(bt_port_get_connection(
- bt_port_from_private(private_port)));
+ bt_port_borrow_from_private(private_port)));
}
-struct bt_private_component *bt_private_port_get_private_component(
+struct bt_private_component *bt_private_port_get_component(
struct bt_private_port *private_port)
{
return bt_private_component_from_component(bt_port_get_component(
- bt_port_from_private(private_port)));
+ bt_port_borrow_from_private(private_port)));
}
BT_HIDDEN
port, bt_port_get_name(port), connection);
}
-int bt_private_port_remove_from_component(
+enum bt_port_status bt_private_port_remove_from_component(
struct bt_private_port *private_port)
{
- int ret = 0;
- struct bt_port *port = bt_port_from_private(private_port);
+ enum bt_port_status status = BT_PORT_STATUS_OK;
+ struct bt_port *port = bt_port_borrow_from_private(private_port);
struct bt_component *comp = NULL;
+ enum bt_component_status comp_status;
if (!port) {
BT_LOGW_STR("Invalid parameter: private port is NULL.");
- ret = -1;
+ status = BT_PORT_STATUS_INVALID;
goto end;
}
- comp = (void *) bt_object_get_parent(port);
+ comp = (void *) bt_object_get_parent(&port->base);
+ if (!comp) {
+ BT_LOGV("Port already removed from its component: "
+ "port-addr=%p, port-name=\"%s\", ",
+ port, bt_port_get_name(port));
+ goto end;
+ }
/* bt_component_remove_port() logs details */
- ret = bt_component_remove_port(comp, port);
+ comp_status = bt_component_remove_port(comp, port);
+ BT_ASSERT(comp_status != BT_COMPONENT_STATUS_INVALID);
+ if (comp_status < 0) {
+ status = BT_PORT_STATUS_ERROR;
+ goto end;
+ }
end:
- bt_put(comp);
- return ret;
+ bt_object_put_ref(comp);
+ return status;
}
-int bt_port_disconnect(struct bt_port *port)
+enum bt_port_status bt_port_disconnect(struct bt_port *port)
{
- int ret = 0;
+ enum bt_port_status status = BT_PORT_STATUS_OK;
if (!port) {
BT_LOGW_STR("Invalid parameter: port is NULL.");
- ret = -1;
+ status = BT_PORT_STATUS_INVALID;
goto end;
}
}
end:
- return ret;
+ return status;
}
bt_bool bt_port_is_connected(struct bt_port *port)
struct bt_private_port *private_port)
{
return private_port ?
- bt_port_from_private(private_port)->user_data : NULL;
+ bt_port_borrow_from_private(private_port)->user_data : NULL;
}