X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fgraph%2Fmessage%2Fpacket.c;fp=lib%2Fgraph%2Fmessage%2Fpacket.c;h=df3e0e993cbf8dd67a1e4306ff6ac39e1fb8c248;hp=ee378e583503f80142aac4d7e6aea0ed10ff6ef0;hb=649934d212dbc58e6d11dbd9eae6bdb931e65522;hpb=f06a3e4792a03eeb61f23640229c77945ca5eaf3

diff --git a/lib/graph/message/packet.c b/lib/graph/message/packet.c
index ee378e58..df3e0e99 100644
--- a/lib/graph/message/packet.c
+++ b/lib/graph/message/packet.c
@@ -82,11 +82,12 @@ static inline
 struct bt_message *create_packet_message(
 		struct bt_self_component_port_input_message_iterator *msg_iter,
 		struct bt_packet *packet, struct bt_object_pool *pool,
-		bool with_cs, uint64_t raw_value)
+		bool with_cs, bool is_beginning, uint64_t raw_value)
 {
 	struct bt_message_packet *message = NULL;
 	struct bt_stream *stream;
 	struct bt_stream_class *stream_class;
+	bool packet_has_default_clock_snapshot;
 
 	BT_ASSERT(msg_iter);
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
@@ -94,8 +95,21 @@ struct bt_message *create_packet_message(
 	BT_ASSERT(stream);
 	stream_class = bt_stream_borrow_class(stream);
 	BT_ASSERT(stream_class);
-	BT_ASSERT_PRE((with_cs && stream_class->default_clock_class) ||
-		(!with_cs && !stream_class->default_clock_class),
+
+	if (is_beginning) {
+		packet_has_default_clock_snapshot =
+			stream_class->packets_have_default_beginning_clock_snapshot;
+	} else {
+		packet_has_default_clock_snapshot =
+			stream_class->packets_have_default_end_clock_snapshot;
+	}
+
+	/*
+	 * `packet_has_default_clock_snapshot` implies that the stream
+	 * class has a default clock class (precondition).
+	 */
+	BT_ASSERT_PRE((with_cs && packet_has_default_clock_snapshot) ||
+		(!with_cs && !packet_has_default_clock_snapshot),
 		"Creating a packet message with a default clock snapshot, but without "
 		"a default clock class, or without a default clock snapshot, "
 		"but with a default clock class: ",
@@ -147,7 +161,7 @@ struct bt_message *bt_message_packet_beginning_create(
 
 	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);
+		&msg_iter->graph->packet_begin_msg_pool, false, true, 0);
 }
 
 struct bt_message *bt_message_packet_beginning_create_with_default_clock_snapshot(
@@ -159,7 +173,7 @@ struct bt_message *bt_message_packet_beginning_create_with_default_clock_snapsho
 
 	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);
+		&msg_iter->graph->packet_begin_msg_pool, true, true, raw_value);
 }
 
 struct bt_message *bt_message_packet_end_create(
@@ -171,7 +185,7 @@ struct bt_message *bt_message_packet_end_create(
 
 	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);
+		&msg_iter->graph->packet_end_msg_pool, false, false, 0);
 }
 
 struct bt_message *bt_message_packet_end_create_with_default_clock_snapshot(
@@ -183,7 +197,7 @@ struct bt_message *bt_message_packet_end_create_with_default_clock_snapshot(
 
 	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);
+		&msg_iter->graph->packet_end_msg_pool, true, false, raw_value);
 }
 
 BT_HIDDEN