* SOFTWARE.
*/
-#define BT_LOG_TAG "CONNECTION"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/CONNECTION"
+#include "lib/logging.h"
#include "common/assert.h"
#include "lib/assert-pre.h"
-#include <babeltrace2/graph/connection-const.h>
+#include "lib/assert-post.h"
+#include <babeltrace2/graph/connection.h>
#include "lib/object.h"
#include "compat/compiler.h"
+#include <stdbool.h>
#include <stdlib.h>
#include <glib.h>
struct bt_connection *connection = container_of(obj,
struct bt_connection, base);
- BT_LIB_LOGD("Destroying connection: %!+x", connection);
+ BT_LIB_LOGI("Destroying connection: %!+x", connection);
/*
* Make sure that each message iterator which was created for
* this connection is finalized before we destroy it. Once a
- * message iterator is finalized, all its method return NULL or
- * the BT_MESSAGE_ITERATOR_STATUS_CANCELED status.
+ * message iterator is finalized, you cannot use it.
*
* Because connections are destroyed before components within a
* graph, this ensures that message iterators are always
{
struct bt_connection *connection = NULL;
- BT_LIB_LOGD("Creating connection: "
+ BT_LIB_LOGI("Creating connection: "
"%![graph-]+g, %![up-port-]+p, %![down-port-]+p",
graph, upstream_port, downstream_port);
connection = g_new0(struct bt_connection, 1);
if (!connection) {
- BT_LOGE_STR("Failed to allocate one connection.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one connection.");
goto end;
}
parent_is_owner);
connection->iterators = g_ptr_array_new();
if (!connection->iterators) {
- BT_LOGE_STR("Failed to allocate a GPtrArray.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GPtrArray.");
BT_OBJECT_PUT_REF_AND_RESET(connection);
goto end;
}
downstream_port);
bt_port_set_connection(downstream_port, connection);
bt_object_set_parent(&connection->base, &graph->base);
- BT_LIB_LOGD("Created connection: %!+x", connection);
+ BT_LIB_LOGI("Created connection: %!+x", connection);
end:
return connection;
struct bt_port *upstream_port = conn->upstream_port;
size_t i;
- BT_LIB_LOGD("Ending connection: %!+x, try-remove-from-graph=%d",
+ BT_LIB_LOGI("Ending connection: %!+x, try-remove-from-graph=%d",
conn, try_remove_from_graph);
/*
* which is on graph destruction.
*/
for (i = 0; i < conn->iterators->len; i++) {
- struct bt_self_component_port_input_message_iterator *iterator =
+ struct bt_message_iterator *iterator =
g_ptr_array_index(conn->iterators, i);
BT_LIB_LOGD("Finalizing message iterator created by "
"this ended connection: %![iter-]+i", iterator);
- bt_self_component_port_input_message_iterator_try_finalize(
+ bt_message_iterator_try_finalize(
iterator);
/*
* from this connection's iterators on destruction
* because this connection won't exist anymore.
*/
- bt_self_component_port_input_message_iterator_set_connection(
+ bt_message_iterator_set_connection(
iterator, NULL);
}
const struct bt_port_output *bt_connection_borrow_upstream_port_const(
const struct bt_connection *connection)
{
- BT_ASSERT_PRE_NON_NULL(connection, "Connection");
+ BT_ASSERT_PRE_DEV_NON_NULL(connection, "Connection");
return (void *) connection->upstream_port;
}
const struct bt_port_input *bt_connection_borrow_downstream_port_const(
const struct bt_connection *connection)
{
- BT_ASSERT_PRE_NON_NULL(connection, "Connection");
+ BT_ASSERT_PRE_DEV_NON_NULL(connection, "Connection");
return (void *) connection->downstream_port;
}
BT_HIDDEN
void bt_connection_remove_iterator(struct bt_connection *conn,
- struct bt_self_component_port_input_message_iterator *iterator)
+ struct bt_message_iterator *iterator)
{
g_ptr_array_remove(conn->iterators, iterator);
- BT_LIB_LOGV("Removed message iterator from connection: "
+ BT_LIB_LOGD("Removed message iterator from connection: "
"%![conn-]+x, %![iter-]+i", conn, iterator);
try_remove_connection_from_graph(conn);
}