X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fpacket.c;h=637156d3c1f6b18cb6553c8cd99466bcb6fa3f61;hb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;hp=b00f2dfc0b7026c540affb5787f21d7c79377387;hpb=26fc5aedf48df3f1654fe4d0b6ada1a10cd804f2;p=babeltrace.git

diff --git a/src/lib/graph/message/packet.c b/src/lib/graph/message/packet.c
index b00f2dfc..637156d3 100644
--- a/src/lib/graph/message/packet.c
+++ b/src/lib/graph/message/packet.c
@@ -143,7 +143,7 @@ struct bt_message *create_packet_message(
 		message->default_cs = bt_clock_snapshot_create(
 			stream_class->default_clock_class);
 		if (!message->default_cs) {
-			bt_object_put_no_null_check(message);
+			bt_object_put_ref_no_null_check(message);
 			message = NULL;
 			goto end;
 		}
@@ -153,7 +153,7 @@ struct bt_message *create_packet_message(
 
 	BT_ASSERT(!message->packet);
 	message->packet = packet;
-	bt_object_get_no_null_check_no_parent_check(
+	bt_object_get_ref_no_null_check_no_parent_check(
 		&message->packet->base);
 	bt_packet_set_is_frozen(packet, true);
 	BT_LIB_LOGD("Created packet message object: "
@@ -237,7 +237,7 @@ void recycle_packet_message(struct bt_message *msg, struct bt_object_pool *pool)
 
 	BT_LIB_LOGD("Recycling packet message: %!+n", msg);
 	bt_message_reset(msg);
-	bt_object_put_no_null_check(&packet_msg->packet->base);
+	bt_object_put_ref_no_null_check(&packet_msg->packet->base);
 
 	if (packet_msg->default_cs) {
 		bt_clock_snapshot_recycle(packet_msg->default_cs);
@@ -280,8 +280,8 @@ struct bt_packet *bt_message_packet_beginning_borrow_packet(
 {
 	struct bt_message_packet *packet_msg = (void *) message;
 
-	BT_ASSERT_PRE_NON_NULL(message, "Message");
-	BT_ASSERT_PRE_MSG_IS_TYPE(message,
+	BT_ASSERT_PRE_DEV_NON_NULL(message, "Message");
+	BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message,
 		BT_MESSAGE_TYPE_PACKET_BEGINNING);
 	return packet_msg->packet;
 }
@@ -298,8 +298,8 @@ struct bt_packet *bt_message_packet_end_borrow_packet(
 {
 	struct bt_message_packet *packet_msg = (void *) message;
 
-	BT_ASSERT_PRE_NON_NULL(message, "Message");
-	BT_ASSERT_PRE_MSG_IS_TYPE(message,
+	BT_ASSERT_PRE_DEV_NON_NULL(message, "Message");
+	BT_ASSERT_PRE_DEV_MSG_IS_TYPE(message,
 		BT_MESSAGE_TYPE_PACKET_END);
 	return packet_msg->packet;
 }
@@ -318,8 +318,9 @@ borrow_packet_message_default_clock_snapshot_const(
 {
 	struct bt_message_packet *packet_msg = (void *) message;
 
-	BT_ASSERT(message);
-	BT_ASSERT_PRE(packet_msg->packet->stream->class->default_clock_class,
+	BT_ASSERT_DBG(message);
+	BT_ASSERT_PRE_DEV(
+		packet_msg->packet->stream->class->default_clock_class,
 		"Message's stream's class has no default clock class: "
 		"%![msg-]+n, %![sc-]+S",
 		message, packet_msg->packet->stream->class);
@@ -330,8 +331,8 @@ const struct bt_clock_snapshot *
 bt_message_packet_beginning_borrow_default_clock_snapshot_const(
 		const struct bt_message *msg)
 {
-	BT_ASSERT_PRE_NON_NULL(msg, "Message");
-	BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_BEGINNING);
+	BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
+	BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_BEGINNING);
 	return borrow_packet_message_default_clock_snapshot_const(msg);
 }
 
@@ -339,8 +340,8 @@ const struct bt_clock_snapshot *
 bt_message_packet_end_borrow_default_clock_snapshot_const(
 		const struct bt_message *msg)
 {
-	BT_ASSERT_PRE_NON_NULL(msg, "Message");
-	BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_END);
+	BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
+	BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_END);
 	return borrow_packet_message_default_clock_snapshot_const(msg);
 }
 
@@ -351,7 +352,7 @@ borrow_packet_message_stream_class_default_clock_class(
 {
 	struct bt_message_packet *packet_msg = (void *) msg;
 
-	BT_ASSERT(msg);
+	BT_ASSERT_DBG(msg);
 	return packet_msg->packet->stream->class->default_clock_class;
 }
 
@@ -359,8 +360,8 @@ const struct bt_clock_class *
 bt_message_packet_beginning_borrow_stream_class_default_clock_class_const(
 		const struct bt_message *msg)
 {
-	BT_ASSERT_PRE_NON_NULL(msg, "Message");
-	BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_BEGINNING);
+	BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
+	BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_BEGINNING);
 	return borrow_packet_message_stream_class_default_clock_class(msg);
 }
 
@@ -368,7 +369,7 @@ const struct bt_clock_class *
 bt_message_packet_end_borrow_stream_class_default_clock_class_const(
 		const struct bt_message *msg)
 {
-	BT_ASSERT_PRE_NON_NULL(msg, "Message");
-	BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_END);
+	BT_ASSERT_PRE_DEV_NON_NULL(msg, "Message");
+	BT_ASSERT_PRE_DEV_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_PACKET_END);
 	return borrow_packet_message_stream_class_default_clock_class(msg);
 }