X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fstop.c;h=b1aa14b271f6ce2060954cacebbb8447d4c61a06;hb=b7f4ea0f4c6ac71da5e4e6fe988df4d35734332a;hp=e946d4fdb503ad274a4e58f596d3fe28647760f5;hpb=4ba92f185fb1d0b112cbc804a261939f5f81dc34;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/stop.c b/src/bin/lttng/commands/stop.c
index e946d4fdb..b1aa14b27 100644
--- a/src/bin/lttng/commands/stop.c
+++ b/src/bin/lttng/commands/stop.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  *
- * 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.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -30,10 +20,15 @@
 
 #include "../command.h"
 
-static char *opt_session_name;
 static int opt_no_wait;
 static struct mi_writer *writer;
 
+#ifdef LTTNG_EMBED_HELP
+static const char help_msg[] =
+#include <lttng-stop.1.h>
+;
+#endif
+
 enum {
 	OPT_HELP = 1,
 	OPT_LIST_OPTIONS,
@@ -47,22 +42,6 @@ static struct poptOption long_options[] = {
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
-/*
- * usage
- */
-static void usage(FILE *ofp)
-{
-	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");
-}
 /*
  * Mi print of partial session
  */
@@ -102,19 +81,23 @@ end:
 /*
  * Start tracing for all trace of the session.
  */
-static int stop_tracing(void)
+static int stop_tracing(const char *arg_session_name)
 {
 	int ret;
 	char *session_name;
 
-	if (opt_session_name == NULL) {
+	if (arg_session_name == NULL) {
 		session_name = get_session_name();
+	} else {
+		session_name = strdup(arg_session_name);
 		if (session_name == NULL) {
-			ret = CMD_ERROR;
-			goto error;
+			PERROR("Failed to copy session name");
 		}
-	} else {
-		session_name = opt_session_name;
+	}
+
+	if (session_name == NULL) {
+		ret = CMD_ERROR;
+		goto error;
 	}
 
 	ret = lttng_stop_tracing_no_wait(session_name);
@@ -145,7 +128,7 @@ static int stop_tracing(void)
 			 * returned value indicates availability.
 			 */
 			if (ret) {
-				usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
+				usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME_US);
 				_MSG(".");
 				fflush(stdout);
 			}
@@ -165,9 +148,7 @@ static int stop_tracing(void)
 	}
 
 free_name:
-	if (opt_session_name == NULL) {
-		free(session_name);
-	}
+	free(session_name);
 
 error:
 	return ret;
@@ -182,6 +163,8 @@ int cmd_stop(int argc, const char **argv)
 {
 	int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1;
 	static poptContext pc;
+	const char *arg_session_name = NULL;
+	const char *leftover = NULL;
 
 	pc = poptGetContext(NULL, argc, argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
@@ -195,7 +178,6 @@ int cmd_stop(int argc, const char **argv)
 			list_cmd_options(stdout, long_options);
 			goto end;
 		default:
-			usage(stderr);
 			ret = CMD_UNDEFINED;
 			goto end;
 		}
@@ -237,9 +219,16 @@ int cmd_stop(int argc, const char **argv)
 		}
 	}
 
-	opt_session_name = (char*) poptGetArg(pc);
+	arg_session_name = poptGetArg(pc);
+
+	leftover = poptGetArg(pc);
+	if (leftover) {
+		ERR("Unknown argument: %s", leftover);
+		ret = CMD_ERROR;
+		goto end;
+	}
 
-	command_ret = stop_tracing();
+	command_ret = stop_tracing(arg_session_name);
 	if (command_ret) {
 		success = 0;
 	}