X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fpacket.c;h=6798fe511b3f95dcd3b0eff4b06a806debb91e30;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=56808d0e477d5a54e5f335bf2ac2776fcb0f2d64;hpb=bdb288b3e94e412a33c8647d44f6cfac66ca0665;p=babeltrace.git

diff --git a/src/lib/graph/message/packet.c b/src/lib/graph/message/packet.c
index 56808d0e..6798fe51 100644
--- a/src/lib/graph/message/packet.c
+++ b/src/lib/graph/message/packet.c
@@ -24,6 +24,8 @@
 #define BT_LOG_TAG "LIB/MSG-PACKET"
 #include "lib/logging.h"
 
+#include <stdbool.h>
+
 #include "lib/assert-pre.h"
 #include "lib/assert-post.h"
 #include "compat/compiler.h"
@@ -34,10 +36,7 @@
 #include "lib/trace-ir/stream.h"
 #include "lib/trace-ir/stream-class.h"
 #include "lib/graph/graph.h"
-#include <babeltrace2/graph/message-packet-beginning-const.h>
-#include <babeltrace2/graph/message-packet-end-const.h>
-#include <babeltrace2/graph/message-packet-beginning.h>
-#include <babeltrace2/graph/message-packet-end.h>
+#include <babeltrace2/graph/message.h>
 #include "common/assert.h"
 #include "lib/object.h"
 #include <inttypes.h>
@@ -83,7 +82,7 @@ struct bt_message *bt_message_packet_end_new(struct bt_graph *graph)
 
 static inline
 struct bt_message *create_packet_message(
-		struct bt_self_component_port_input_message_iterator *msg_iter,
+		struct bt_message_iterator *msg_iter,
 		struct bt_packet *packet, struct bt_object_pool *pool,
 		bool with_cs, uint64_t raw_value)
 {
@@ -143,7 +142,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 +152,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: "
@@ -169,9 +168,10 @@ struct bt_message *bt_message_packet_beginning_create(
 		struct bt_self_message_iterator *self_msg_iter,
 		const struct bt_packet *packet)
 {
-	struct bt_self_component_port_input_message_iterator *msg_iter =
+	struct bt_message_iterator *msg_iter =
 		(void *) self_msg_iter;
 
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator");
 	return create_packet_message(msg_iter, (void *) packet,
 		&msg_iter->graph->packet_begin_msg_pool, false, 0);
@@ -181,9 +181,10 @@ struct bt_message *bt_message_packet_beginning_create_with_default_clock_snapsho
 		struct bt_self_message_iterator *self_msg_iter,
 		const struct bt_packet *packet, uint64_t raw_value)
 {
-	struct bt_self_component_port_input_message_iterator *msg_iter =
+	struct bt_message_iterator *msg_iter =
 		(void *) self_msg_iter;
 
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator");
 	return create_packet_message(msg_iter, (void *) packet,
 		&msg_iter->graph->packet_begin_msg_pool, true, raw_value);
@@ -193,9 +194,10 @@ struct bt_message *bt_message_packet_end_create(
 		struct bt_self_message_iterator *self_msg_iter,
 		const struct bt_packet *packet)
 {
-	struct bt_self_component_port_input_message_iterator *msg_iter =
+	struct bt_message_iterator *msg_iter =
 		(void *) self_msg_iter;
 
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator");
 	return create_packet_message(msg_iter, (void *) packet,
 		&msg_iter->graph->packet_end_msg_pool, false, 0);
@@ -205,9 +207,10 @@ struct bt_message *bt_message_packet_end_create_with_default_clock_snapshot(
 		struct bt_self_message_iterator *self_msg_iter,
 		const struct bt_packet *packet, uint64_t raw_value)
 {
-	struct bt_self_component_port_input_message_iterator *msg_iter =
+	struct bt_message_iterator *msg_iter =
 		(void *) self_msg_iter;
 
+	BT_ASSERT_PRE_DEV_NO_ERROR();
 	BT_ASSERT_PRE_NON_NULL(msg_iter, "Message iterator");
 	return create_packet_message(msg_iter, (void *) packet,
 		&msg_iter->graph->packet_end_msg_pool, true, raw_value);
@@ -237,7 +240,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);
@@ -318,7 +321,7 @@ borrow_packet_message_default_clock_snapshot_const(
 {
 	struct bt_message_packet *packet_msg = (void *) message;
 
-	BT_ASSERT(message);
+	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: "
@@ -352,7 +355,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;
 }