X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fstop.c;h=cb45f12ce56085a15bd2cdc5f52ca1fd41a69c72;hb=8eb7a5e2b9006c5f675c3809055e8abcdffcdb6f;hp=998a2a42a425c1472c6b704fdf993a39e8772dc9;hpb=32a6298d8929c91842c9a5c09f1a3f4660c32eec;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/stop.c b/src/bin/lttng/commands/stop.c
index 998a2a42a..cb45f12ce 100644
--- a/src/bin/lttng/commands/stop.c
+++ b/src/bin/lttng/commands/stop.c
@@ -29,6 +29,7 @@
 #include <common/sessiond-comm/sessiond-comm.h>
 
 static char *opt_session_name;
+static int opt_no_wait;
 
 enum {
 	OPT_HELP = 1,
@@ -39,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}
 };
 
@@ -55,6 +57,7 @@ static void usage(FILE *ofp)
 	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");
 }
 
@@ -76,10 +79,10 @@ static int stop_tracing(void)
 		session_name = opt_session_name;
 	}
 
-	ret = lttng_stop_tracing(session_name);
+	ret = lttng_stop_tracing_no_wait(session_name);
 	if (ret < 0) {
 		switch (-ret) {
-		case LTTCOMM_TRACE_ALREADY_STOPPED:
+		case LTTNG_ERR_TRACE_ALREADY_STOPPED:
 			WARN("Tracing already stopped for session %s", session_name);
 			break;
 		default:
@@ -89,6 +92,29 @@ static int stop_tracing(void)
 		goto free_name;
 	}
 
+	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("");
+	}
+
 	ret = CMD_SUCCESS;
 
 	MSG("Tracing stopped for session %s", session_name);