lib: make BT_ASSERT_{PRE,POST}() always on; add BT_ASSERT_{PRE,POST}_DEV()

[babeltrace.git] / src / lib / graph / connection.c

diff --git a/src/lib/graph/connection.c b/src/lib/graph/connection.c
index 8c31c38e0485114a28b03a0b438a95ec4028902a..a50828fbdc415be82d11e798ba6c5be9c5b597b5 100644 (file)
--- a/src/lib/graph/connection.c
+++ b/src/lib/graph/connection.c
@@ -22,10 +22,11 @@
  */
 
 #define BT_LOG_TAG "LIB/CONNECTION"
-#include "lib/lib-logging.h"
+#include "lib/logging.h"
 
 #include "common/assert.h"
 #include "lib/assert-pre.h"
+#include "lib/assert-post.h"
 #include <babeltrace2/graph/connection-const.h>
 #include "lib/object.h"
 #include "compat/compiler.h"
@@ -125,7 +126,7 @@ struct bt_connection *bt_connection_create(struct bt_graph *graph,
                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;
        }
 
@@ -135,7 +136,7 @@ struct bt_connection *bt_connection_create(struct bt_graph *graph,
                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;
        }
@@ -231,14 +232,14 @@ void bt_connection_end(struct bt_connection *conn, bool try_remove_from_graph)
 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;
 }