From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Mon, 24 Jul 2017 20:06:18 +0000 (-0400)
Subject: Fix live-comm: only apply retry timeout for already seen inactive indexes.
X-Git-Tag: v1.4.3~2
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=ad5c40d00a36ef0e9c21a5a1a0eaa513c89dc1f3

Fix live-comm: only apply retry timeout for already seen inactive indexes.

Tested-by: Anton Smyk <anton.smyk@itiviti.com>
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c
index c19cc646..a1c95bbc 100644
--- a/formats/lttng-live/lttng-live-comm.c
+++ b/formats/lttng-live/lttng-live-comm.c
@@ -1033,6 +1033,13 @@ retry:
 	switch (be32toh(rp->status)) {
 	case LTTNG_VIEWER_INDEX_INACTIVE:
 		printf_verbose("get_next_index: inactive\n");
+
+		if (index->ts_cycles.timestamp_end ==
+				be64toh(rp->timestamp_end)) {
+			/* Already seen this timestamp. */
+			(void) poll(NULL, 0, ACTIVE_POLL_DELAY);
+		}
+
 		memset(index, 0, sizeof(struct packet_index));
 		index->ts_cycles.timestamp_end = be64toh(rp->timestamp_end);
 		*stream_id = be64toh(rp->stream_id);