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

diff --git a/src/lib/graph/message/packet.c b/src/lib/graph/message/packet.c
index 06125417..6798fe51 100644
--- a/src/lib/graph/message/packet.c
+++ b/src/lib/graph/message/packet.c
@@ -36,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>
@@ -85,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)
 {
@@ -171,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);
@@ -183,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);
@@ -195,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);
@@ -207,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);