From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Fri, 18 Mar 2016 19:00:17 +0000 (-0400)
Subject: Data pending message is printed when unnecessary
X-Git-Tag: v2.8.0-rc1~9
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=01f55be4d700e2241e96f50794d7f887024744c2

Data pending message is printed when unnecessary

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng/commands/destroy.c b/src/bin/lttng/commands/destroy.c
index aad4bdd23..e0bafc475 100644
--- a/src/bin/lttng/commands/destroy.c
+++ b/src/bin/lttng/commands/destroy.c
@@ -70,8 +70,8 @@ static int destroy_session(struct lttng_session *session)
 	}
 	session_was_stopped = ret == -LTTNG_ERR_TRACE_ALREADY_STOPPED;
 	if (!opt_no_wait) {
-		_MSG("Waiting for data availability");
-		fflush(stdout);
+		bool printed_wait_msg = false;
+
 		do {
 			ret = lttng_data_pending(session->name);
 			if (ret < 0) {
@@ -84,12 +84,20 @@ static int destroy_session(struct lttng_session *session)
 			 * returned value indicates availability.
 			 */
 			if (ret) {
+				if (!printed_wait_msg) {
+					_MSG("Waiting for data availability");
+					fflush(stdout);
+				}
+
+				printed_wait_msg = true;
 				usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
 				_MSG(".");
 				fflush(stdout);
 			}
 		} while (ret != 0);
-		MSG("");
+		if (printed_wait_msg) {
+			MSG("");
+		}
 	}
 	if (!session_was_stopped) {
 		/*