X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=ff9d31d5287a92b29bf6ac16bff0e6a17876d837;hb=0d88e04674ead21c741c6f4ed7fadf666c5e7bce;hp=83b2143d727ca5aab4790d665ba229912a1501d6;hpb=d295668767ac8234e83984e1812d342d03293d88;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 83b2143d7..ff9d31d52 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -2513,6 +2513,13 @@ int commit_one_metadata_packet(struct lttng_consumer_stream *stream)
 			stream->ust_metadata_pushed);
 	ret = write_len;
 
+	/*
+	 * Switch packet (but don't open the next one) on every commit of
+	 * a metadata packet. Since the subbuffer is fully filled (with padding,
+	 * if needed), the stream is "quiescent" after this commit.
+	 */
+	ustctl_flush_buffer(stream->ustream, 1);
+	stream->quiescent = true;
 end:
 	pthread_mutex_unlock(&stream->chan->metadata_cache->lock);
 	return ret;
@@ -2557,7 +2564,6 @@ int lttng_ustconsumer_sync_metadata(struct lttng_consumer_local_data *ctx,
 		retry = 1;
 	}
 
-	ustctl_flush_buffer(metadata->ustream, 1);
 	ret = ustctl_snapshot(metadata->ustream);
 	if (ret < 0) {
 		if (errno != EAGAIN) {
@@ -2761,7 +2767,6 @@ retry:
 			if (ret <= 0) {
 				goto error;
 			}
-			ustctl_flush_buffer(stream->ustream, 1);
 			goto retry;
 		}