X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fmessage%2Fdiscarded-items.c;h=9a8b0a1d19d767ccbec570cec590b3d4c0046f80;hb=9b24b6aa4258079f2b59fa156dd3e070969f6f2a;hp=82f0039244c2bacb89e0da28b6fc8c9db5ace4a5;hpb=0cbc2c3316814e4b4bf3fd3ba3b361b165949e95;p=babeltrace.git

diff --git a/lib/graph/message/discarded-items.c b/lib/graph/message/discarded-items.c
index 82f00392..9a8b0a1d 100644
--- a/lib/graph/message/discarded-items.c
+++ b/lib/graph/message/discarded-items.c
@@ -69,16 +69,32 @@ struct bt_message *create_discarded_items_message(
 {
 	struct bt_message_discarded_items *message;
 	struct bt_stream_class *stream_class;
+	bool has_support;
+	bool has_default_clock_snapshots;
 
 	BT_ASSERT_PRE_NON_NULL(self_msg_iter, "Message iterator");
 	BT_ASSERT_PRE_NON_NULL(stream, "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),
-		"Creating a message with a default clock snapshot, but without "
-		"a default clock class, or without a default clock snapshot, "
-		"but with a default clock class: ",
+
+	if (type == BT_MESSAGE_TYPE_DISCARDED_EVENTS) {
+		has_support = stream_class->supports_discarded_events;
+		has_default_clock_snapshots =
+			stream_class->discarded_events_have_default_clock_snapshots;
+	} else {
+		has_support = stream_class->supports_discarded_packets;
+		has_default_clock_snapshots =
+			stream_class->discarded_packets_have_default_clock_snapshots;
+	}
+
+	BT_ASSERT_PRE(has_support,
+		"Stream class does not support discarded events or packets: "
+		"type=%s, %![stream-]+s, %![sc-]+S",
+		bt_message_type_string(type), stream, stream_class);
+	BT_ASSERT_PRE((with_cs && has_default_clock_snapshots) ||
+		(!with_cs && !has_default_clock_snapshots),
+		"Unexpected stream class configuration when creating "
+		"a discarded events or packets message: "
 		"type=%s, %![stream-]+s, %![sc-]+S, with-cs=%d, "
 		"cs-begin-val=%" PRIu64 ", cs-end-val=%" PRIu64,
 		bt_message_type_string(type), stream, stream_class,
@@ -167,7 +183,7 @@ enum bt_property_availability get_discarded_items_message_count(
 
 static inline
 const struct bt_clock_snapshot *
-borrow_discarded_items_message_default_beginning_clock_snapshot_const(
+borrow_discarded_items_message_beginning_default_clock_snapshot_const(
 		const struct bt_message *message)
 {
 	struct bt_message_discarded_items *disc_items_msg = (void *) message;
@@ -182,7 +198,7 @@ borrow_discarded_items_message_default_beginning_clock_snapshot_const(
 
 static inline
 const struct bt_clock_snapshot *
-borrow_discarded_items_message_default_end_clock_snapshot_const(
+borrow_discarded_items_message_end_default_clock_snapshot_const(
 		const struct bt_message *message)
 {
 	struct bt_message_discarded_items *disc_items_msg = (void *) message;
@@ -231,22 +247,22 @@ void bt_message_discarded_events_set_count(struct bt_message *message,
 }
 
 const struct bt_clock_snapshot *
-bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const(
+bt_message_discarded_events_borrow_beginning_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_DISCARDED_EVENTS);
-	return borrow_discarded_items_message_default_beginning_clock_snapshot_const(
+	return borrow_discarded_items_message_beginning_default_clock_snapshot_const(
 		msg);
 }
 
 const struct bt_clock_snapshot *
-bt_message_discarded_events_borrow_default_end_clock_snapshot_const(
+bt_message_discarded_events_borrow_end_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_DISCARDED_EVENTS);
-	return borrow_discarded_items_message_default_end_clock_snapshot_const(
+	return borrow_discarded_items_message_end_default_clock_snapshot_const(
 		msg);
 }
 
@@ -301,22 +317,22 @@ void bt_message_discarded_packets_set_count(struct bt_message *message,
 }
 
 const struct bt_clock_snapshot *
-bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const(
+bt_message_discarded_packets_borrow_beginning_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_DISCARDED_PACKETS);
-	return borrow_discarded_items_message_default_beginning_clock_snapshot_const(
+	return borrow_discarded_items_message_beginning_default_clock_snapshot_const(
 		msg);
 }
 
 const struct bt_clock_snapshot *
-bt_message_discarded_packets_borrow_default_end_clock_snapshot_const(
+bt_message_discarded_packets_borrow_end_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_DISCARDED_PACKETS);
-	return borrow_discarded_items_message_default_end_clock_snapshot_const(
+	return borrow_discarded_items_message_end_default_clock_snapshot_const(
 		msg);
 }