X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fstop.c;h=60a1dac8fe8ca4db4fd58c19d7d4a904012acd70;hp=fbabc510039f2f5fc8c5486b6240bf64d6326780;hb=38ee087f699718e57d1bc5614c2f79c3c30ccca9;hpb=d14d33bf091e72b23b1f90ea18a0a01bed098b76

diff --git a/src/bin/lttng/commands/stop.c b/src/bin/lttng/commands/stop.c
index fbabc5100..60a1dac8f 100644
--- a/src/bin/lttng/commands/stop.c
+++ b/src/bin/lttng/commands/stop.c
@@ -26,7 +26,10 @@
 
 #include "../command.h"
 
+#include <common/sessiond-comm/sessiond-comm.h>
+
 static char *opt_session_name;
+static int opt_no_wait;
 
 enum {
 	OPT_HELP = 1,
@@ -37,6 +40,7 @@ static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
 	{"help",      'h', POPT_ARG_NONE, 0, OPT_HELP, 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}
 };
 
@@ -45,13 +49,15 @@ static struct poptOption long_options[] = {
  */
 static void usage(FILE *ofp)
 {
-	fprintf(ofp, "usage: lttng stop [options] [NAME]\n");
+	fprintf(ofp, "usage: lttng stop [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, "      --list-options       Simple listing of options\n");
+	fprintf(ofp, "  -n, --no-wait            Don't wait for data availability\n");
 	fprintf(ofp, "\n");
 }
 
@@ -73,9 +79,20 @@ static int stop_tracing(void)
 		session_name = opt_session_name;
 	}
 
-	ret = lttng_stop_tracing(session_name);
+	if (opt_no_wait) {
+		ret = lttng_stop_tracing_no_wait(session_name);
+	} else {
+		ret = lttng_stop_tracing(session_name);
+	}
 	if (ret < 0) {
-		/* Don't set ret so lttng can interpret the sessiond error. */
+		switch (-ret) {
+		case LTTNG_ERR_TRACE_ALREADY_STOPPED:
+			WARN("Tracing already stopped for session %s", session_name);
+			break;
+		default:
+			ERR("%s", lttng_strerror(ret));
+			break;
+		}
 		goto free_name;
 	}