X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fmessage%2Fevent.c;h=7544e33df6498782e1896adc478a56b1d07ae669;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=e79eb3de9d58702980780dd5e453bf626d528c8f;hpb=2c091c0465f433cc37e0042254c9132bac70a181;p=babeltrace.git

diff --git a/lib/graph/message/event.c b/lib/graph/message/event.c
index e79eb3de..7544e33d 100644
--- a/lib/graph/message/event.c
+++ b/lib/graph/message/event.c
@@ -22,23 +22,23 @@
  */
 
 #define BT_LOG_TAG "MSG-EVENT"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/object-internal.h>
-#include <babeltrace/trace-ir/event.h>
-#include <babeltrace/trace-ir/event-internal.h>
-#include <babeltrace/trace-ir/event-class-internal.h>
-#include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/trace-ir/trace.h>
-#include <babeltrace/trace-ir/clock-snapshot-internal.h>
-#include <babeltrace/graph/graph-internal.h>
-#include <babeltrace/graph/message-event-const.h>
-#include <babeltrace/graph/message-event.h>
-#include <babeltrace/graph/message-event-internal.h>
-#include <babeltrace/types.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-internal.h>
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/object-internal.h>
+#include <babeltrace2/trace-ir/event.h>
+#include <babeltrace2/trace-ir/event-internal.h>
+#include <babeltrace2/trace-ir/event-class-internal.h>
+#include <babeltrace2/trace-ir/stream-class-internal.h>
+#include <babeltrace2/trace-ir/trace.h>
+#include <babeltrace2/trace-ir/clock-snapshot-internal.h>
+#include <babeltrace2/graph/graph-internal.h>
+#include <babeltrace2/graph/message-event-const.h>
+#include <babeltrace2/graph/message-event.h>
+#include <babeltrace2/graph/message-event-internal.h>
+#include <babeltrace2/types.h>
 #include <stdbool.h>
 #include <inttypes.h>
 
@@ -47,7 +47,7 @@ static inline bool event_class_has_trace(struct bt_event_class *event_class)
 {
 	struct bt_stream_class *stream_class;
 
-	stream_class = bt_event_class_borrow_stream_class(event_class);
+	stream_class = bt_event_class_borrow_stream_class_inline(event_class);
 	BT_ASSERT(stream_class);
 	return bt_stream_class_borrow_trace_class(stream_class) != NULL;
 }
@@ -255,24 +255,35 @@ const struct bt_event *bt_message_event_borrow_event_const(
 	return borrow_event((void *) message);
 }
 
-enum bt_clock_snapshot_state
+const struct bt_clock_snapshot *
 bt_message_event_borrow_default_clock_snapshot_const(
-		const struct bt_message *msg,
-		const struct bt_clock_snapshot **snapshot)
+		const struct bt_message *msg)
 {
 	struct bt_message_event *event_msg = (void *) msg;
 	struct bt_stream_class *stream_class;
 
 	BT_ASSERT_PRE_NON_NULL(msg, "Message");
 	BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_EVENT);
-	BT_ASSERT(msg);
-	stream_class = bt_event_class_borrow_stream_class(
+	stream_class = bt_event_class_borrow_stream_class_inline(
 		event_msg->event->class);
 	BT_ASSERT(stream_class);
 	BT_ASSERT_PRE(stream_class->default_clock_class,
 		"Message's stream's class has no default clock class: "
 		"%![msg-]+n, %![sc-]+S", msg, stream_class);
-	BT_ASSERT_PRE_NON_NULL(snapshot, "Clock snapshot (output)");
-	*snapshot = event_msg->default_cs;
-	return BT_CLOCK_SNAPSHOT_STATE_KNOWN;
+	return event_msg->default_cs;
+}
+
+const bt_clock_class *
+bt_message_event_borrow_stream_class_default_clock_class_const(
+		const bt_message *msg)
+{
+	struct bt_message_event *event_msg = (void *) msg;
+	struct bt_stream_class *stream_class;
+
+	BT_ASSERT_PRE_NON_NULL(msg, "Message");
+	BT_ASSERT_PRE_MSG_IS_TYPE(msg, BT_MESSAGE_TYPE_EVENT);
+	stream_class = bt_event_class_borrow_stream_class_inline(
+		event_msg->event->class);
+	BT_ASSERT(stream_class);
+	return stream_class->default_clock_class;
 }