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

diff --git a/src/bin/lttng/commands/stop.c b/src/bin/lttng/commands/stop.c
index f2ab45308..cb45f12ce 100644
--- a/src/bin/lttng/commands/stop.c
+++ b/src/bin/lttng/commands/stop.c
@@ -1,19 +1,18 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -27,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,
@@ -38,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}
 };
 
@@ -46,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");
 }
 
@@ -74,12 +79,42 @@ 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) {
-		/* 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;
 	}
 
+	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);