X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fmessage%2Fdiscarded-items.c;h=5f7108f829db3633b14b5a1a54ac2dd8422916c8;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=78b30e45b9f82fc2dfe22aed113fe772b7ac0b2b;hpb=58085ca4d234fafe66bf875c32364598e180eafa;p=babeltrace.git

diff --git a/lib/graph/message/discarded-items.c b/lib/graph/message/discarded-items.c
index 78b30e45..5f7108f8 100644
--- a/lib/graph/message/discarded-items.c
+++ b/lib/graph/message/discarded-items.c
@@ -21,22 +21,22 @@
  */
 
 #define BT_LOG_TAG "MSG-DISCARDED-ITEMS"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/object-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/trace-ir/clock-class.h>
-#include <babeltrace/trace-ir/clock-snapshot-internal.h>
-#include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/trace-ir/stream-internal.h>
-#include <babeltrace/property-internal.h>
-#include <babeltrace/graph/message-internal.h>
-#include <babeltrace/graph/message-discarded-items-internal.h>
-#include <babeltrace/graph/message-discarded-events.h>
-#include <babeltrace/graph/message-discarded-events-const.h>
-#include <babeltrace/graph/message-discarded-packets.h>
-#include <babeltrace/graph/message-discarded-packets-const.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/object-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/trace-ir/clock-class.h>
+#include <babeltrace2/trace-ir/clock-snapshot-internal.h>
+#include <babeltrace2/trace-ir/stream-class-internal.h>
+#include <babeltrace2/trace-ir/stream-internal.h>
+#include <babeltrace2/property-internal.h>
+#include <babeltrace2/graph/message-internal.h>
+#include <babeltrace2/graph/message-discarded-items-internal.h>
+#include <babeltrace2/graph/message-discarded-events.h>
+#include <babeltrace2/graph/message-discarded-events-const.h>
+#include <babeltrace2/graph/message-discarded-packets.h>
+#include <babeltrace2/graph/message-discarded-packets-const.h>
 
 static
 void destroy_discarded_items_message(struct bt_object *obj)
@@ -69,11 +69,36 @@ 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);
+
+	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,
+		with_cs, beginning_raw_value, end_raw_value);
 	BT_LIB_LOGD("Creating discarded items message object: "
 		"type=%s, %![stream-]+s, %![sc-]+S, with-cs=%d, "
 		"cs-begin-val=%" PRIu64 ", cs-end-val=%" PRIu64,
@@ -91,6 +116,7 @@ struct bt_message *create_discarded_items_message(
 	bt_object_get_no_null_check(message->stream);
 
 	if (with_cs) {
+		BT_ASSERT(stream_class->default_clock_class);
 		message->default_begin_cs = bt_clock_snapshot_create(
 			stream_class->default_clock_class);
 		if (!message->default_begin_cs) {
@@ -156,10 +182,9 @@ enum bt_property_availability get_discarded_items_message_count(
 }
 
 static inline
-enum bt_clock_snapshot_state
-borrow_discarded_items_message_default_beginning_clock_snapshot_const(
-		const struct bt_message *message,
-		const struct bt_clock_snapshot **snapshot)
+const struct bt_clock_snapshot *
+borrow_discarded_items_message_beginning_default_clock_snapshot_const(
+		const struct bt_message *message)
 {
 	struct bt_message_discarded_items *disc_items_msg = (void *) message;
 
@@ -168,16 +193,13 @@ borrow_discarded_items_message_default_beginning_clock_snapshot_const(
 		"Message's stream's class has no default clock class: "
 		"%![msg-]+n, %![sc-]+S",
 		message, disc_items_msg->stream->class);
-	BT_ASSERT_PRE_NON_NULL(snapshot, "Clock snapshot (output)");
-	*snapshot = disc_items_msg->default_begin_cs;
-	return BT_CLOCK_SNAPSHOT_STATE_KNOWN;
+	return disc_items_msg->default_begin_cs;
 }
 
 static inline
-enum bt_clock_snapshot_state
-borrow_discarded_items_message_default_end_clock_snapshot_const(
-		const struct bt_message *message,
-		const struct bt_clock_snapshot **snapshot)
+const struct bt_clock_snapshot *
+borrow_discarded_items_message_end_default_clock_snapshot_const(
+		const struct bt_message *message)
 {
 	struct bt_message_discarded_items *disc_items_msg = (void *) message;
 
@@ -186,9 +208,7 @@ borrow_discarded_items_message_default_end_clock_snapshot_const(
 		"Message's stream's class has no default clock class: "
 		"%![msg-]+n, %![sc-]+S",
 		message, disc_items_msg->stream->class);
-	BT_ASSERT_PRE_NON_NULL(snapshot, "Clock snapshot (output)");
-	*snapshot = disc_items_msg->default_end_cs;
-	return BT_CLOCK_SNAPSHOT_STATE_KNOWN;
+	return disc_items_msg->default_end_cs;
 }
 
 struct bt_message *bt_message_discarded_events_create(
@@ -226,26 +246,24 @@ void bt_message_discarded_events_set_count(struct bt_message *message,
 	set_discarded_items_message_count(message, count);
 }
 
-enum bt_clock_snapshot_state
-bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const(
-		const struct bt_message *msg,
-		const struct bt_clock_snapshot **snapshot)
+const struct bt_clock_snapshot *
+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(
-		msg, snapshot);
+	return borrow_discarded_items_message_beginning_default_clock_snapshot_const(
+		msg);
 }
 
-enum bt_clock_snapshot_state
-bt_message_discarded_events_borrow_default_end_clock_snapshot_const(
-		const struct bt_message *msg,
-		const struct bt_clock_snapshot **snapshot)
+const struct bt_clock_snapshot *
+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(
-		msg, snapshot);
+	return borrow_discarded_items_message_end_default_clock_snapshot_const(
+		msg);
 }
 
 const struct bt_stream *
@@ -298,26 +316,24 @@ void bt_message_discarded_packets_set_count(struct bt_message *message,
 	set_discarded_items_message_count(message, count);
 }
 
-enum bt_clock_snapshot_state
-bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const(
-		const struct bt_message *msg,
-		const struct bt_clock_snapshot **snapshot)
+const struct bt_clock_snapshot *
+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(
-		msg, snapshot);
+	return borrow_discarded_items_message_beginning_default_clock_snapshot_const(
+		msg);
 }
 
-enum bt_clock_snapshot_state
-bt_message_discarded_packets_borrow_default_end_clock_snapshot_const(
-		const struct bt_message *msg,
-		const struct bt_clock_snapshot **snapshot)
+const struct bt_clock_snapshot *
+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(
-		msg, snapshot);
+	return borrow_discarded_items_message_end_default_clock_snapshot_const(
+		msg);
 }
 
 const struct bt_stream *
@@ -334,3 +350,34 @@ enum bt_property_availability bt_message_discarded_packets_get_count(
 	BT_ASSERT_PRE_MSG_IS_TYPE(message, BT_MESSAGE_TYPE_DISCARDED_PACKETS);
 	return get_discarded_items_message_count(message, count);
 }
+
+static inline
+const struct bt_clock_class *
+borrow_discarded_items_message_stream_class_default_clock_class(
+		const struct bt_message *msg)
+{
+	struct bt_message_discarded_items *disc_items_msg = (void *) msg;
+
+	BT_ASSERT(msg);
+	return disc_items_msg->stream->class->default_clock_class;
+}
+
+const struct bt_clock_class *
+bt_message_discarded_events_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_DISCARDED_EVENTS);
+	return borrow_discarded_items_message_stream_class_default_clock_class(
+		msg);
+}
+
+const struct bt_clock_class *
+bt_message_discarded_packets_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_DISCARDED_PACKETS);
+	return borrow_discarded_items_message_stream_class_default_clock_class(
+		msg);
+}