X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdestroy.c;h=02c7139c3547e4e9a4dff2516e223597081faa76;hb=efcbc78c435a4ce7689ab6920b35e78372aa0194;hp=ad181d7c4343b72182269556bf689d593bd21d4d;hpb=20fb9e0220fe6ca9d6fd52e4e3e41b898452a8f1;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/destroy.c b/src/bin/lttng/commands/destroy.c
index ad181d7c4..02c7139c3 100644
--- a/src/bin/lttng/commands/destroy.c
+++ b/src/bin/lttng/commands/destroy.c
@@ -35,6 +35,12 @@ static char *opt_session_name;
 static int opt_destroy_all;
 static int opt_no_wait;
 
+#ifdef LTTNG_EMBED_HELP
+static const char help_msg[] =
+#include <lttng-destroy.1.h>
+;
+#endif
+
 /* Mi writer */
 static struct mi_writer *writer;
 
@@ -52,24 +58,6 @@ static struct poptOption long_options[] = {
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
-/*
- * usage
- */
-static void usage(FILE *ofp)
-{
-	fprintf(ofp, "usage: lttng destroy [NAME] [OPTIONS]\n");
-	fprintf(ofp, "\n");
-	fprintf(ofp, "Where NAME is an optional session name. If not specified, lttng will\n");
-	fprintf(ofp, "get it from the configuration directory (.lttng).\n");
-	fprintf(ofp, "\n");
-	fprintf(ofp, "Options:\n");
-	fprintf(ofp, "  -h, --help           Show this help\n");
-	fprintf(ofp, "  -a, --all            Destroy all sessions\n");
-	fprintf(ofp, "      --list-options   Simple listing of options\n");
-	fprintf(ofp, "  -n, --no-wait        Don't wait for data availability\n");
-	fprintf(ofp, "\n");
-}
-
 /*
  * destroy_session
  *
@@ -88,8 +76,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) {
@@ -102,12 +90,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) {
 		/*
@@ -189,13 +185,12 @@ int cmd_destroy(int argc, const char **argv)
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case OPT_HELP:
-			usage(stdout);
+			SHOW_HELP();
 			break;
 		case OPT_LIST_OPTIONS:
 			list_cmd_options(stdout, long_options);
 			break;
 		default:
-			usage(stderr);
 			ret = CMD_UNDEFINED;
 			break;
 		}
@@ -237,7 +232,8 @@ int cmd_destroy(int argc, const char **argv)
 	/* Recuperate all sessions for further operation */
 	count = lttng_list_sessions(&sessions);
 	if (count < 0) {
-		command_ret = count;
+		ERR("%s", lttng_strerror(count));
+		command_ret = CMD_ERROR;
 		success = 0;
 		goto mi_closing;
 	}