X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Flib-logging.c;h=0872cc26bbc9af334654026e83e292cf5e95c3c8;hp=c48149be002e2ba80d4c73bd25382138a523ac60;hb=93875071881517bbcf7d479b7c955297906f87d0;hpb=8e53bed40d8ef5026ccfd0149a8e48e6e220d740

diff --git a/lib/lib-logging.c b/lib/lib-logging.c
index c48149be..0872cc26 100644
--- a/lib/lib-logging.c
+++ b/lib/lib-logging.c
@@ -524,17 +524,9 @@ static inline void format_stream_class(char **buf_ch, bool extended,
 		return;
 	}
 
-	BUF_APPEND(", %sassigns-auto-ec-id=%d, %sassigns-auto-stream-id=%d, "
-		"%spackets-have-discarded-ev-counter-snapshot=%d, "
-		"%spackets-have-packet-counter-snapshot=%d, "
-		"%spackets-have-default-begin-cs=%d, "
-		"%spackets-have-default-end-cs=%d",
+	BUF_APPEND(", %sassigns-auto-ec-id=%d, %sassigns-auto-stream-id=%d",
 		PRFIELD(stream_class->assigns_automatic_event_class_id),
-		PRFIELD(stream_class->assigns_automatic_stream_id),
-		PRFIELD(stream_class->packets_have_discarded_event_counter_snapshot),
-		PRFIELD(stream_class->packets_have_packet_counter_snapshot),
-		PRFIELD(stream_class->packets_have_default_beginning_cs),
-		PRFIELD(stream_class->packets_have_default_end_cs));
+		PRFIELD(stream_class->assigns_automatic_stream_id));
 	BUF_APPEND(", %strace-class-addr=%p", PRFIELD(trace_class));
 	SET_TMP_PREFIX("trace-class-");
 	format_trace_class(buf_ch, false, tmp_prefix, trace_class);
@@ -660,28 +652,6 @@ static inline void format_packet(char **buf_ch, bool extended,
 		return;
 	}
 
-	if (packet->default_beginning_cs) {
-		SET_TMP_PREFIX("default-begin-cs-");
-		format_clock_snapshot(buf_ch, true, tmp_prefix,
-			packet->default_beginning_cs);
-	}
-
-	if (packet->default_end_cs) {
-		SET_TMP_PREFIX("default-end-cs-");
-		format_clock_snapshot(buf_ch, true, tmp_prefix,
-			packet->default_end_cs);
-	}
-
-	if (packet->discarded_event_counter_snapshot.base.avail) {
-		BUF_APPEND(", %sdiscarded-ev-counter-snapshot=%" PRIu64,
-			PRFIELD(packet->discarded_event_counter_snapshot.value));
-	}
-
-	if (packet->packet_counter_snapshot.base.avail) {
-		BUF_APPEND(", %spacket-counter-snapshot=%" PRIu64,
-			PRFIELD(packet->packet_counter_snapshot.value));
-	}
-
 	BUF_APPEND(", %sstream-addr=%p", PRFIELD(stream));
 	SET_TMP_PREFIX("stream-");
 	format_stream(buf_ch, false, tmp_prefix, stream);