X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdestroy.c;h=661c0a2356ae42acdf7dfb0fbd047a7bff45e5b0;hp=f74bf515c79ae44c7668e8cd674156ce24159da0;hb=4ba92f185fb1d0b112cbc804a261939f5f81dc34;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9

diff --git a/src/bin/lttng/commands/destroy.c b/src/bin/lttng/commands/destroy.c
index f74bf515c..661c0a235 100644
--- a/src/bin/lttng/commands/destroy.c
+++ b/src/bin/lttng/commands/destroy.c
@@ -23,6 +23,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <stdbool.h>
 
 #include "../command.h"
 
@@ -32,6 +33,7 @@
 
 static char *opt_session_name;
 static int opt_destroy_all;
+static int opt_no_wait;
 
 /* Mi writer */
 static struct mi_writer *writer;
@@ -46,6 +48,7 @@ static struct poptOption long_options[] = {
 	{"help",      'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
 	{"all",       'a', POPT_ARG_VAL, &opt_destroy_all, 1, 0, 0},
 	{"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
+	{"no-wait",   'n', POPT_ARG_VAL, &opt_no_wait, 1, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -63,6 +66,7 @@ static void usage(FILE *ofp)
 	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");
 }
 
@@ -76,17 +80,45 @@ static int destroy_session(struct lttng_session *session)
 {
 	int ret;
 	char *session_name = NULL;
+	bool session_was_stopped;
 
-	ret = lttng_destroy_session(session->name);
+	ret = lttng_stop_tracing_no_wait(session->name);
+	if (ret < 0 && ret != -LTTNG_ERR_TRACE_ALREADY_STOPPED) {
+		ERR("%s", lttng_strerror(ret));
+	}
+	session_was_stopped = ret == -LTTNG_ERR_TRACE_ALREADY_STOPPED;
+	if (!opt_no_wait) {
+		_MSG("Waiting for data availability");
+		fflush(stdout);
+		do {
+			ret = lttng_data_pending(session->name);
+			if (ret < 0) {
+				/* Return the data available call error. */
+				goto error;
+			}
+
+			/*
+			 * Data sleep time before retrying (in usec). Don't sleep if the call
+			 * returned value indicates availability.
+			 */
+			if (ret) {
+				usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
+				_MSG(".");
+				fflush(stdout);
+			}
+		} while (ret != 0);
+		MSG("");
+	}
+	if (!session_was_stopped) {
+		/*
+		 * Don't print the event and packet loss warnings since the user
+		 * already saw them when stopping the trace.
+		 */
+		print_session_stats(session->name);
+	}
+
+	ret = lttng_destroy_session_no_wait(session->name);
 	if (ret < 0) {
-		switch (-ret) {
-		case LTTNG_ERR_SESS_NOT_FOUND:
-			WARN("Session name %s not found", session->name);
-			break;
-		default:
-			ERR("%s", lttng_strerror(ret));
-			break;
-		}
 		goto error;
 	}
 
@@ -157,7 +189,7 @@ 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);