X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fstart.cpp;h=1d787ce653a09730448570089f33df2cb77ac7de;hb=9183bb278808f35193c0d248c537950495c719dc;hp=e00cac4c6ad6d8395a2a224d7ff40ec3ab979fcc;hpb=28ab034a2c3582d07d3423d2d746731f87d3969f;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/start.cpp b/src/bin/lttng/commands/start.cpp
index e00cac4c6..1d787ce65 100644
--- a/src/bin/lttng/commands/start.cpp
+++ b/src/bin/lttng/commands/start.cpp
@@ -7,7 +7,9 @@
 
 #define _LGPL_SOURCE
 #include "../command.hpp"
+#include "../utils.hpp"
 
+#include <common/exception.hpp>
 #include <common/mi-lttng.hpp>
 #include <common/sessiond-comm/sessiond-comm.hpp>
 
@@ -19,27 +21,32 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-static struct mi_writer *writer;
+enum {
+	OPT_HELP = 1,
+	OPT_LIST_OPTIONS,
+	OPT_ENABLE_GLOB,
+	OPT_ALL,
+};
+
+namespace {
+struct mi_writer *writer;
 
 #ifdef LTTNG_EMBED_HELP
-static const char help_msg[] =
+const char help_msg[] =
 #include <lttng-start.1.h>
 	;
 #endif
 
-enum {
-	OPT_HELP = 1,
-	OPT_LIST_OPTIONS,
-};
-
-static struct poptOption long_options[] = {
+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 },
-	{ 0, 0, 0, 0, 0, 0, 0 }
+	{ "help", 'h', POPT_ARG_NONE, nullptr, OPT_HELP, nullptr, nullptr },
+	{ "list-options", 0, POPT_ARG_NONE, nullptr, OPT_LIST_OPTIONS, nullptr, nullptr },
+	{ "glob", 'g', POPT_ARG_NONE, nullptr, OPT_ENABLE_GLOB, nullptr, nullptr },
+	{ "all", 'a', POPT_ARG_NONE, nullptr, OPT_ALL, nullptr, nullptr },
+	{ nullptr, 0, 0, nullptr, 0, nullptr, nullptr }
 };
 
-static int mi_print_session(char *session_name, int enabled)
+int mi_print_session(const char *session_name, int enabled)
 {
 	int ret;
 
@@ -72,21 +79,11 @@ end:
  *
  *  Start tracing for all trace of the session.
  */
-static int start_tracing(const char *arg_session_name)
+int start_tracing(const char *session_name)
 {
 	int ret;
-	char *session_name;
-
-	if (arg_session_name == NULL) {
-		session_name = get_session_name();
-	} else {
-		session_name = strdup(arg_session_name);
-		if (session_name == NULL) {
-			PERROR("Failed to copy session name");
-		}
-	}
 
-	if (session_name == NULL) {
+	if (session_name == nullptr) {
 		ret = CMD_ERROR;
 		goto error;
 	}
@@ -103,7 +100,7 @@ static int start_tracing(const char *arg_session_name)
 			ERR("%s", lttng_strerror(ret));
 			break;
 		}
-		goto free_name;
+		goto error;
 	}
 
 	ret = CMD_SUCCESS;
@@ -113,16 +110,47 @@ static int start_tracing(const char *arg_session_name)
 		ret = mi_print_session(session_name, 1);
 		if (ret) {
 			ret = CMD_ERROR;
-			goto free_name;
+			goto error;
 		}
 	}
 
-free_name:
-	free(session_name);
 error:
 	return ret;
 }
 
+int start_tracing(const struct session_spec& spec)
+{
+	int ret = CMD_SUCCESS;
+	bool had_warning = false;
+
+	try {
+		for (const auto& session : list_sessions(spec)) {
+			const auto sub_ret = start_tracing(session.name);
+
+			switch (sub_ret) {
+			case CMD_WARNING:
+				had_warning = true;
+				/* fall-through. */
+			case CMD_SUCCESS:
+				continue;
+			default:
+				ret = sub_ret;
+				break;
+			}
+		}
+	} catch (const std::exception& e) {
+		ERR_FMT("{}", e.what());
+		return CMD_FATAL;
+	}
+
+	if (ret == CMD_SUCCESS && had_warning) {
+		ret = CMD_WARNING;
+	}
+
+	return ret;
+}
+} /* namespace */
+
 /*
  *  cmd_start
  *
@@ -132,10 +160,13 @@ int cmd_start(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;
+	const char *leftover = nullptr;
+	struct session_spec session_spec = {
+		.type = session_spec::NAME,
+		.value = nullptr,
+	};
 
-	pc = poptGetContext(NULL, argc, argv, long_options, 0);
+	pc = poptGetContext(nullptr, argc, argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
 
 	while ((opt = poptGetNextOpt(pc)) != -1) {
@@ -146,13 +177,19 @@ int cmd_start(int argc, const char **argv)
 		case OPT_LIST_OPTIONS:
 			list_cmd_options(stdout, long_options);
 			goto end;
+		case OPT_ENABLE_GLOB:
+			session_spec.type = session_spec::GLOB_PATTERN;
+			break;
+		case OPT_ALL:
+			session_spec.type = session_spec::ALL;
+			break;
 		default:
 			ret = CMD_UNDEFINED;
 			goto end;
 		}
 	}
 
-	arg_session_name = poptGetArg(pc);
+	session_spec.value = poptGetArg(pc);
 
 	leftover = poptGetArg(pc);
 	if (leftover) {
@@ -194,7 +231,7 @@ int cmd_start(int argc, const char **argv)
 		}
 	}
 
-	command_ret = start_tracing(arg_session_name);
+	command_ret = start_tracing(session_spec);
 	if (command_ret) {
 		success = 0;
 	}