*/
#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>
+
#include <popt.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include <common/sessiond-comm/sessiond-comm.hpp>
-#include <common/mi-lttng.hpp>
-
-#include "../command.hpp"
-
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,
+ OPT_ENABLE_GLOB,
+ OPT_ALL,
};
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}
+ { "help", 'h', POPT_ARG_NONE, nullptr, OPT_HELP, nullptr, nullptr },
+ { "list-options", 0, POPT_ARG_NONE, nullptr, OPT_LIST_OPTIONS, nullptr, nullptr },
+ { "no-wait", 'n', POPT_ARG_VAL, &opt_no_wait, 1, 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 }
};
/*
* Mi print of partial session
*/
-static int mi_print_session(char *session_name, int enabled)
+static int mi_print_session(const char *session_name, int enabled)
{
int ret;
LTTNG_ASSERT(writer);
}
/* Print session name element */
- ret = mi_lttng_writer_write_element_string(writer, config_element_name,
- session_name);
+ ret = mi_lttng_writer_write_element_string(writer, config_element_name, session_name);
if (ret) {
goto end;
}
/* Is enabled ? */
- ret = mi_lttng_writer_write_element_bool(writer, config_element_enabled,
- enabled);
+ ret = mi_lttng_writer_write_element_bool(writer, config_element_enabled, enabled);
if (ret) {
goto end;
}
/*
* Start tracing for all trace of the session.
*/
-static int stop_tracing(const char *arg_session_name)
+static int stop_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) {
- ret = CMD_ERROR;
- goto error;
- }
ret = lttng_stop_tracing_no_wait(session_name);
if (ret < 0) {
ERR("%s", lttng_strerror(ret));
break;
}
- goto free_name;
+ goto error;
}
if (!opt_no_wait) {
ret = lttng_data_pending(session_name);
if (ret < 0) {
/* Return the data available call error. */
- goto free_name;
+ goto error;
}
/*
MSG("Tracing stopped for session %s", session_name);
if (lttng_opt_mi) {
ret = mi_print_session(session_name, 0);
- if (ret) {
- goto free_name;
- }
}
+error:
+ return ret;
+}
-free_name:
- free(session_name);
+static int stop_tracing(const struct session_spec& spec)
+{
+ int ret = CMD_SUCCESS;
+
+ try {
+ for (const auto& session : list_sessions(spec)) {
+ int const sub_ret = stop_tracing(session.name);
+
+ if (sub_ret != CMD_SUCCESS) {
+ ret = sub_ret;
+ }
+ }
+ } catch (lttng::ctl::error& error) {
+ ret = error.code();
+ }
-error:
return ret;
}
{
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) {
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;
}
/* Open command element */
- ret = mi_lttng_writer_command_open(writer,
- mi_lttng_element_command_stop);
+ ret = mi_lttng_writer_command_open(writer, mi_lttng_element_command_stop);
if (ret) {
ret = CMD_ERROR;
goto end;
}
/* Open output element */
- ret = mi_lttng_writer_open_element(writer,
- mi_lttng_element_command_output);
+ ret = mi_lttng_writer_open_element(writer, mi_lttng_element_command_output);
if (ret) {
ret = CMD_ERROR;
goto end;
* Open sessions element
* For validation
*/
- ret = mi_lttng_writer_open_element(writer,
- config_element_sessions);
+ ret = mi_lttng_writer_open_element(writer, config_element_sessions);
if (ret) {
ret = CMD_ERROR;
goto end;
}
}
- arg_session_name = poptGetArg(pc);
+ session_spec.value = poptGetArg(pc);
leftover = poptGetArg(pc);
if (leftover) {
goto end;
}
- command_ret = stop_tracing(arg_session_name);
+ command_ret = stop_tracing(session_spec);
if (command_ret) {
success = 0;
}
}
/* Success ? */
- ret = mi_lttng_writer_write_element_bool(writer,
- mi_lttng_element_command_success, success);
+ ret = mi_lttng_writer_write_element_bool(
+ writer, mi_lttng_element_command_success, success);
if (ret) {
ret = CMD_ERROR;
goto end;
projects / lttng-tools.git / blobdiff