X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=01d5ecf6505cc0667a41194d5cb1f07d06e3540b;hb=83f4233dde73280d45fcfb799add96cce32098ce;hp=a66f305cd02e433f41bf31d0591c0e545d524a1a;hpb=0dd01979d6f26886199ef746377640b57260421c;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index a66f305cd..01d5ecf65 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -1111,7 +1111,13 @@ static int snapshot_channel(uint64_t key, char *path, uint64_t relayd_id,
 			}
 		}
 
-		ustctl_flush_buffer(stream->ustream, 1);
+		/*
+		 * If tracing is active, we want to perform a "full" buffer flush.
+		 * Else, if quiescent, it has already been done by the prior stop.
+		 */
+		if (!stream->quiescent) {
+			ustctl_flush_buffer(stream->ustream, 0);
+		}
 
 		ret = lttng_ustconsumer_take_snapshot(stream);
 		if (ret < 0) {
@@ -2392,8 +2398,8 @@ int update_stream_stats(struct lttng_consumer_stream *stream)
 	}
 	if (discarded < stream->last_discarded_events) {
 		/*
-		 * Overflow has occured. We assume only one wrap-around
-		 * has occured.
+		 * Overflow has occurred. We assume only one wrap-around
+		 * has occurred.
 		 */
 		stream->chan->discarded_events +=
 				(1ULL << (CAA_BITS_PER_LONG - 1)) -