X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flib-logging.c;h=b48c5db7b4274de39f04905cbad53bf2e9452aa1;hb=6162e6b7a6d907974d954419c2375f654f39eb72;hp=4c69d62f5b034cf778f0c0fb9bb91a6c6bb51310;hpb=335a2da576e59d32c17de2ece1e7e339c50e9c25;p=babeltrace.git

diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index 4c69d62f..b48c5db7 100644
--- a/src/lib/lib-logging.c
+++ b/src/lib/lib-logging.c
@@ -32,6 +32,7 @@
 #include <wchar.h>
 #include <glib.h>
 #include "common/common.h"
+#include "common/uuid.h"
 #include <babeltrace2/trace-ir/event-const.h>
 #include <babeltrace2/trace-ir/packet-const.h>
 #include <babeltrace2/trace-ir/stream-const.h>
@@ -56,7 +57,6 @@
 #include "graph/message/message.h"
 #include "graph/message/message-iterator-inactivity.h"
 #include "graph/message/packet.h"
-#include "graph/message/stream-activity.h"
 #include "graph/message/stream.h"
 #include "graph/port.h"
 #include "plugin/plugin.h"
@@ -135,23 +135,7 @@ static inline void format_object(char **buf_ch, bool extended,
 
 static inline void format_uuid(char **buf_ch, bt_uuid uuid)
 {
-	BUF_APPEND("\"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\"",
-		(unsigned int) uuid[0],
-		(unsigned int) uuid[1],
-		(unsigned int) uuid[2],
-		(unsigned int) uuid[3],
-		(unsigned int) uuid[4],
-		(unsigned int) uuid[5],
-		(unsigned int) uuid[6],
-		(unsigned int) uuid[7],
-		(unsigned int) uuid[8],
-		(unsigned int) uuid[9],
-		(unsigned int) uuid[10],
-		(unsigned int) uuid[11],
-		(unsigned int) uuid[12],
-		(unsigned int) uuid[13],
-		(unsigned int) uuid[14],
-		(unsigned int) uuid[15]);
+	BUF_APPEND("\"" BT_UUID_FMT "\"", BT_UUID_FMT_VALUES(uuid));
 }
 
 static inline void format_object_pool(char **buf_ch, bool extended,
@@ -925,28 +909,14 @@ static inline void format_message(char **buf_ch, bool extended,
 				msg_stream->stream);
 		}
 
-		break;
-	}
-	case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING:
-	case BT_MESSAGE_TYPE_STREAM_ACTIVITY_END:
-	{
-		const struct bt_message_stream_activity *msg_stream_activity =
-			(const void *) msg;
-
-		if (msg_stream_activity->stream) {
-			SET_TMP_PREFIX("stream-");
-			format_stream(buf_ch, true, tmp_prefix,
-				msg_stream_activity->stream);
-		}
-
 		BUF_APPEND(", %sdefault-cs-state=%s",
-			PRFIELD(bt_message_stream_activity_clock_snapshot_state_string(
-				msg_stream_activity->default_cs_state)));
+			PRFIELD(bt_message_stream_clock_snapshot_state_string(
+				msg_stream->default_cs_state)));
 
-		if (msg_stream_activity->default_cs) {
+		if (msg_stream->default_cs_state == BT_MESSAGE_STREAM_CLOCK_SNAPSHOT_STATE_KNOWN) {
 			SET_TMP_PREFIX("default-cs-");
 			format_clock_snapshot(buf_ch, true, tmp_prefix,
-				msg_stream_activity->default_cs);
+				msg_stream->default_cs);
 		}
 
 		break;