X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fmessage%2Fstream-activity.c;h=7ecbd461a27209de5efd076e2b6cb19f25b69285;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=fcee3dd1d4a26812dcb6063b57dd98be36eb8adc;hpb=678aa684b19e576a94f4eaf6033a38c7acd2639f;p=babeltrace.git

diff --git a/lib/graph/message/stream-activity.c b/lib/graph/message/stream-activity.c
index fcee3dd1..7ecbd461 100644
--- a/lib/graph/message/stream-activity.c
+++ b/lib/graph/message/stream-activity.c
@@ -21,21 +21,21 @@
  */
 
 #define BT_LOG_TAG "MSG-STREAM-ACTIVITY"
-#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/graph/message-internal.h>
-#include <babeltrace/graph/message-stream-activity-beginning-const.h>
-#include <babeltrace/graph/message-stream-activity-end-const.h>
-#include <babeltrace/graph/message-stream-activity-beginning.h>
-#include <babeltrace/graph/message-stream-activity-end.h>
-#include <babeltrace/graph/message-stream-activity-internal.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/graph/message-internal.h>
+#include <babeltrace2/graph/message-stream-activity-beginning-const.h>
+#include <babeltrace2/graph/message-stream-activity-end-const.h>
+#include <babeltrace2/graph/message-stream-activity-beginning.h>
+#include <babeltrace2/graph/message-stream-activity-end.h>
+#include <babeltrace2/graph/message-stream-activity-internal.h>
 
 static
 void destroy_stream_activity_message(struct bt_object *obj)
@@ -102,17 +102,17 @@ error:
 
 struct bt_message *bt_message_stream_activity_beginning_create(
 		struct bt_self_message_iterator *self_msg_iter,
-		struct bt_stream *stream)
+		const struct bt_stream *stream)
 {
-	return create_stream_activity_message(self_msg_iter, stream,
+	return create_stream_activity_message(self_msg_iter, (void *) stream,
 		BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING);
 }
 
 struct bt_message *bt_message_stream_activity_end_create(
 		struct bt_self_message_iterator *self_msg_iter,
-		struct bt_stream *stream)
+		const struct bt_stream *stream)
 {
-	return create_stream_activity_message(self_msg_iter, stream,
+	return create_stream_activity_message(self_msg_iter, (void *) stream,
 		BT_MESSAGE_TYPE_STREAM_ACTIVITY_END);
 }
 
@@ -269,3 +269,35 @@ void bt_message_stream_activity_end_set_default_clock_snapshot_state(
 		BT_MESSAGE_TYPE_STREAM_ACTIVITY_END);
 	set_stream_activity_message_default_clock_snapshot_state(msg, state);
 }
+
+static inline
+const struct bt_clock_class *
+borrow_stream_activity_message_stream_class_default_clock_class(
+		const struct bt_message *msg)
+{
+	struct bt_message_stream_activity *stream_act_msg = (void *) msg;
+
+	BT_ASSERT(msg);
+	return stream_act_msg->stream->class->default_clock_class;
+}
+
+const struct bt_clock_class *
+bt_message_stream_activity_beginning_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_STREAM_ACTIVITY_BEGINNING);
+	return borrow_stream_activity_message_stream_class_default_clock_class(
+		msg);
+}
+
+const struct bt_clock_class *
+bt_message_stream_activity_end_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_STREAM_ACTIVITY_END);
+	return borrow_stream_activity_message_stream_class_default_clock_class(
+		msg);
+}