X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-stream.c;h=0c6dc8f518bbaf54af0c04fb352d52400e7feac1;hp=deebb58fe41b321cb5f41a76e4ee771c1b5ced4d;hb=e66d26f5110d65c1f9549904a33986797a3759a4;hpb=f5ba75b4f0c0b44092c76bc931b25b24a2e62718

diff --git a/src/common/consumer/consumer-stream.c b/src/common/consumer/consumer-stream.c
index deebb58fe..0c6dc8f51 100644
--- a/src/common/consumer/consumer-stream.c
+++ b/src/common/consumer/consumer-stream.c
@@ -69,8 +69,7 @@ static int consumer_stream_update_stats(struct lttng_consumer_stream *stream,
 {
 	int ret = 0;
 	uint64_t sequence_number;
-	const uint64_t discarded_events =
-			LTTNG_OPTIONAL_GET(subbuf->info.data.sequence_number);
+	const uint64_t discarded_events = subbuf->info.data.events_discarded;
 
 	if (!subbuf->info.data.sequence_number.is_set) {
 		/* Command not supported by the tracer. */
@@ -393,12 +392,8 @@ int metadata_stream_check_version(struct lttng_consumer_stream *stream,
 	}
 
 	DBG("New metadata version detected");
-	stream->metadata_version = subbuffer->info.metadata.version;
-	stream->reset_metadata_flag = 1;
-
-	if (stream->metadata_bucket) {
-		metadata_bucket_reset(stream->metadata_bucket);
-	}
+	consumer_stream_metadata_set_version(stream,
+			subbuffer->info.metadata.version);
 
 	if (stream->read_subbuffer_ops.reset_metadata) {
 		stream->read_subbuffer_ops.reset_metadata(stream);
@@ -1053,3 +1048,15 @@ int consumer_stream_enable_metadata_bucketization(
 end:
 	return ret;
 }
+
+void consumer_stream_metadata_set_version(
+		struct lttng_consumer_stream *stream, uint64_t new_version)
+{
+	assert(new_version > stream->metadata_version);
+	stream->metadata_version = new_version;
+	stream->reset_metadata_flag = 1;
+
+	if (stream->metadata_bucket) {
+		metadata_bucket_reset(stream->metadata_bucket);
+	}
+}