X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdestroy.c;h=a258f64097f275c0c116c4cae1232f5dba181544;hb=c8f61fd42dad6e45ff82402089f99af568de5984;hp=7cea7bf23303a6a2cadf48709f881f58c79964f5;hpb=bbbfd84979130a11aebf172cf7d0d24e28165258;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/destroy.c b/src/bin/lttng/commands/destroy.c
index 7cea7bf23..a258f6409 100644
--- a/src/bin/lttng/commands/destroy.c
+++ b/src/bin/lttng/commands/destroy.c
@@ -101,7 +101,7 @@ static int destroy_session(struct lttng_session *session)
 					fflush(stdout);
 				}
 
-				usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
+				usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME_US);
 				_MSG(".");
 				fflush(stdout);
 			}
@@ -127,7 +127,7 @@ static int destroy_session(struct lttng_session *session)
 
 	do {
 		status = lttng_destruction_handle_wait_for_completion(handle,
-				DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
+				DEFAULT_DATA_AVAILABILITY_WAIT_TIME_US / USEC_PER_MSEC);
 		switch (status) {
 		case LTTNG_DESTRUCTION_HANDLE_STATUS_TIMEOUT:
 			if (!printed_wait_msg) {
@@ -192,6 +192,7 @@ static int destroy_session(struct lttng_session *session)
 skip_wait_rotation:
 	MSG("%sSession \"%s\" destroyed", printed_wait_msg ? "\n" : "",
 			session->name);
+	printed_wait_msg = false;
 
 	session_name = get_session_name_quiet();
 	if (session_name && !strncmp(session->name, session_name, NAME_MAX)) {
@@ -208,6 +209,9 @@ skip_wait_rotation:
 
 	ret = CMD_SUCCESS;
 error:
+	if (printed_wait_msg) {
+		MSG("");
+	}
 	lttng_destruction_handle_destroy(handle);
 	free(session_name);
 	return ret;