X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Flib-logging.c;h=096428e1de4d268bbc261c0402e8261d55660348;hb=5df26c89c52ed58a96fc1bce64d6e49d69b655ee;hp=017f2540bc1c9cdae7b96d7d5b0ac7596afe0710;hpb=8ca9c2f15b3efb3d16a44b8839b085d1f5cf903d;p=babeltrace.git

diff --git a/lib/lib-logging.c b/lib/lib-logging.c
index 017f2540..096428e1 100644
--- a/lib/lib-logging.c
+++ b/lib/lib-logging.c
@@ -67,6 +67,7 @@
 #include <babeltrace/graph/message-iterator-internal.h>
 #include <babeltrace/graph/message-packet-internal.h>
 #include <babeltrace/graph/message-stream-internal.h>
+#include <babeltrace/graph/message-stream-activity-internal.h>
 #include <babeltrace/graph/port-internal.h>
 #include <babeltrace/plugin/plugin-internal.h>
 #include <babeltrace/plugin/plugin-so-internal.h>
@@ -908,55 +909,58 @@ static inline void format_message(char **buf_ch, bool extended,
 
 		if (msg_event->event) {
 			SET_TMP_PREFIX("event-");
-			format_event(buf_ch, true, tmp_prefix, msg_event->event);
+			format_event(buf_ch, true, tmp_prefix,
+				msg_event->event);
 		}
 
 		break;
 	}
 	case BT_MESSAGE_TYPE_STREAM_BEGINNING:
+	case BT_MESSAGE_TYPE_STREAM_END:
 	{
-		const struct bt_message_stream_beginning *msg_stream =
-			(const void *) msg;
+		const struct bt_message_stream *msg_stream = (const void *) msg;
 
 		if (msg_stream->stream) {
 			SET_TMP_PREFIX("stream-");
-			format_stream(buf_ch, true, tmp_prefix, msg_stream->stream);
+			format_stream(buf_ch, true, tmp_prefix,
+				msg_stream->stream);
 		}
 
 		break;
 	}
-	case BT_MESSAGE_TYPE_STREAM_END:
+	case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING:
+	case BT_MESSAGE_TYPE_STREAM_ACTIVITY_END:
 	{
-		const struct bt_message_stream_end *msg_stream =
+		const struct bt_message_stream_activity *msg_stream_activity =
 			(const void *) msg;
 
-		if (msg_stream->stream) {
+		if (msg_stream_activity->stream) {
 			SET_TMP_PREFIX("stream-");
-			format_stream(buf_ch, true, tmp_prefix, msg_stream->stream);
+			format_stream(buf_ch, true, tmp_prefix,
+				msg_stream_activity->stream);
 		}
 
-		break;
-	}
-	case BT_MESSAGE_TYPE_PACKET_BEGINNING:
-	{
-		const struct bt_message_packet_beginning *msg_packet =
-			(const void *) msg;
+		BUF_APPEND(", %sdefault-cs-state=%s",
+			PRFIELD(bt_message_stream_activity_clock_snapshot_state_string(
+				msg_stream_activity->default_cs_state)));
 
-		if (msg_packet->packet) {
-			SET_TMP_PREFIX("packet-");
-			format_packet(buf_ch, true, tmp_prefix, msg_packet->packet);
+		if (msg_stream_activity->default_cs) {
+			SET_TMP_PREFIX("default-cs-");
+			format_clock_snapshot(buf_ch, true, tmp_prefix,
+				msg_stream_activity->default_cs);
 		}
 
 		break;
 	}
+	case BT_MESSAGE_TYPE_PACKET_BEGINNING:
 	case BT_MESSAGE_TYPE_PACKET_END:
 	{
-		const struct bt_message_packet_end *msg_packet =
-			(const void *) msg;
+		const struct bt_message_packet *msg_packet = (const void *) msg;
 
 		if (msg_packet->packet) {
 			SET_TMP_PREFIX("packet-");
-			format_packet(buf_ch, true, tmp_prefix, msg_packet->packet);
+			format_packet(buf_ch, true, tmp_prefix,
+				msg_packet->packet);
 		}
 
 		break;