From: David Goulet <dgoulet@efficios.com>
Date: Tue, 27 Aug 2013 21:30:51 +0000 (-0400)
Subject: Fix: missing check for metadata data pending
X-Git-Tag: v2.3.0-rc3~11
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e6ee4eabf5141d475fd734376c752d821e74e670;p=lttng-tools.git

Fix: missing check for metadata data pending

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 9b1675e8b..08161c27e 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -1746,6 +1746,12 @@ int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream)
 	}
 
 	if (stream->chan->type == CONSUMER_CHANNEL_TYPE_METADATA) {
+		uint64_t contiguous, pushed;
+
+		/* Ease our life a bit. */
+		contiguous = stream->chan->metadata_cache->contiguous;
+		pushed = stream->ust_metadata_pushed;
+
 		/*
 		 * We can simply check whether all contiguously available data
 		 * has been pushed to the ring buffer, since the push operation
@@ -1757,10 +1763,10 @@ int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream)
 		 * metadata has been consumed from the metadata stream.
 		 */
 		DBG("UST consumer metadata pending check: contiguous %" PRIu64 " vs pushed %" PRIu64,
-			stream->chan->metadata_cache->contiguous,
-			stream->ust_metadata_pushed);
-		if (stream->chan->metadata_cache->contiguous
-				!= stream->ust_metadata_pushed) {
+				contiguous, pushed);
+		assert(contiguous - pushed >= 0);
+		if ((contiguous != pushed) ||
+				(contiguous - pushed > 0 || contiguous == 0)) {
 			ret = 1;	/* Data is pending */
 			goto end;
 		}