X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-stream.c;h=a4539fda4441964a75967bc8d6346d8a270b588f;hb=ec8b7679bd90bf89e77b22fb6b3c7fca93b86e5a;hp=1b8d2f902337af65154d13c308d0d1394d1f241a;hpb=8d18bcaede97b6d87e434310da9c13d269983c77;p=lttng-tools.git

diff --git a/src/common/consumer/consumer-stream.c b/src/common/consumer/consumer-stream.c
index 1b8d2f902..a4539fda4 100644
--- a/src/common/consumer/consumer-stream.c
+++ b/src/common/consumer/consumer-stream.c
@@ -79,8 +79,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. */
@@ -403,12 +402,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);
@@ -1063,3 +1058,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);
+	}
+}