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

diff --git a/lib/graph/message/discarded-items.c b/lib/graph/message/discarded-items.c
index a4bc9e3b..82f00392 100644
--- a/lib/graph/message/discarded-items.c
+++ b/lib/graph/message/discarded-items.c
@@ -166,10 +166,9 @@ enum bt_property_availability get_discarded_items_message_count(
 }
 
 static inline
-enum bt_clock_snapshot_state
+const struct bt_clock_snapshot *
 borrow_discarded_items_message_default_beginning_clock_snapshot_const(
-		const struct bt_message *message,
-		const struct bt_clock_snapshot **snapshot)
+		const struct bt_message *message)
 {
 	struct bt_message_discarded_items *disc_items_msg = (void *) message;
 
@@ -178,16 +177,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
+const struct bt_clock_snapshot *
 borrow_discarded_items_message_default_end_clock_snapshot_const(
-		const struct bt_message *message,
-		const struct bt_clock_snapshot **snapshot)
+		const struct bt_message *message)
 {
 	struct bt_message_discarded_items *disc_items_msg = (void *) message;
 
@@ -196,9 +192,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(
@@ -236,26 +230,24 @@ void bt_message_discarded_events_set_count(struct bt_message *message,
 	set_discarded_items_message_count(message, count);
 }
 
-enum bt_clock_snapshot_state
+const struct bt_clock_snapshot *
 bt_message_discarded_events_borrow_default_beginning_clock_snapshot_const(
-		const struct bt_message *msg,
-		const struct bt_clock_snapshot **snapshot)
+		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);
+		msg);
 }
 
-enum bt_clock_snapshot_state
+const struct bt_clock_snapshot *
 bt_message_discarded_events_borrow_default_end_clock_snapshot_const(
-		const struct bt_message *msg,
-		const struct bt_clock_snapshot **snapshot)
+		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);
+		msg);
 }
 
 const struct bt_stream *
@@ -308,26 +300,24 @@ void bt_message_discarded_packets_set_count(struct bt_message *message,
 	set_discarded_items_message_count(message, count);
 }
 
-enum bt_clock_snapshot_state
+const struct bt_clock_snapshot *
 bt_message_discarded_packets_borrow_default_beginning_clock_snapshot_const(
-		const struct bt_message *msg,
-		const struct bt_clock_snapshot **snapshot)
+		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);
+		msg);
 }
 
-enum bt_clock_snapshot_state
+const struct bt_clock_snapshot *
 bt_message_discarded_packets_borrow_default_end_clock_snapshot_const(
-		const struct bt_message *msg,
-		const struct bt_clock_snapshot **snapshot)
+		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);
+		msg);
 }
 
 const struct bt_stream *
@@ -344,3 +334,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);
+}