*/
#define _LGPL_SOURCE
+#include "../command.hpp"
+
+#include <common/mi-lttng.hpp>
+#include <common/utils.hpp>
+
+#include <lttng/lttng.h>
+
#include <inttypes.h>
#include <popt.h>
#include <stdio.h>
#include <sys/types.h>
#include <unistd.h>
-#include <common/utils.h>
-#include <common/mi-lttng.h>
-#include <lttng/lttng.h>
-
-#include "../command.h"
-
static const char *opt_session_name;
static const char *opt_output_name;
static const char *opt_data_url;
#ifdef LTTNG_EMBED_HELP
static const char help_msg[] =
#include <lttng-snapshot.1.h>
-;
+ ;
#endif
enum {
static struct poptOption snapshot_opts[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
- {"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
- {"session", 's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
- {"ctrl-url", 'C', POPT_ARG_STRING, &opt_ctrl_url, 0, 0, 0},
- {"data-url", 'D', POPT_ARG_STRING, &opt_data_url, 0, 0, 0},
- {"name", 'n', POPT_ARG_STRING, &opt_output_name, 0, 0, 0},
- {"max-size", 'm', POPT_ARG_STRING, 0, OPT_MAX_SIZE, 0, 0},
- {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
- {"list-commands", 0, POPT_ARG_NONE, NULL, OPT_LIST_COMMANDS},
- {0, 0, 0, 0, 0, 0, 0}
+ { "help", 'h', POPT_ARG_NONE, nullptr, OPT_HELP, nullptr, nullptr },
+ { "session", 's', POPT_ARG_STRING, &opt_session_name, 0, nullptr, nullptr },
+ { "ctrl-url", 'C', POPT_ARG_STRING, &opt_ctrl_url, 0, nullptr, nullptr },
+ { "data-url", 'D', POPT_ARG_STRING, &opt_data_url, 0, nullptr, nullptr },
+ { "name", 'n', POPT_ARG_STRING, &opt_output_name, 0, nullptr, nullptr },
+ { "max-size", 'm', POPT_ARG_STRING, nullptr, OPT_MAX_SIZE, nullptr, nullptr },
+ { "list-options", 0, POPT_ARG_NONE, nullptr, OPT_LIST_OPTIONS, nullptr, nullptr },
+ { "list-commands", 0, POPT_ARG_NONE, nullptr, OPT_LIST_COMMANDS, nullptr, nullptr },
+ { nullptr, 0, 0, nullptr, 0, nullptr, nullptr }
};
static struct cmd_struct actions[] = {
{ "del-output", cmd_del_output },
{ "list-output", cmd_list_output },
{ "record", cmd_record },
- { NULL, NULL } /* Array closure */
+ { nullptr, nullptr } /* Array closure */
};
/*
LTTNG_ASSERT(argv);
- while (argv[i] != NULL) {
+ while (argv[i] != nullptr) {
i++;
}
static struct lttng_snapshot_output *create_output_from_args(const char *url)
{
int ret = 0;
- struct lttng_snapshot_output *output = NULL;
+ struct lttng_snapshot_output *output = nullptr;
output = lttng_snapshot_output_create();
if (!output) {
error:
lttng_snapshot_output_destroy(output);
error_create:
- return NULL;
+ return nullptr;
}
-static int list_output(void)
+static int list_output()
{
int ret, output_seen = 0;
struct lttng_snapshot_output *s_iter;
MSG("Snapshot output list for session %s", current_session_name);
if (lttng_opt_mi) {
- ret = mi_lttng_snapshot_output_session_name(writer,
- current_session_name);
+ ret = mi_lttng_snapshot_output_session_name(writer, current_session_name);
if (ret) {
ret = CMD_ERROR;
goto end;
}
}
- while ((s_iter = lttng_snapshot_output_list_get_next(list)) != NULL) {
+ while ((s_iter = lttng_snapshot_output_list_get_next(list)) != nullptr) {
if (lttng_snapshot_output_get_maxsize(s_iter)) {
- MSG("%s[%" PRIu32 "] %s: %s (max size: %" PRIu64 " bytes)", indent4,
- lttng_snapshot_output_get_id(s_iter),
- lttng_snapshot_output_get_name(s_iter),
- lttng_snapshot_output_get_ctrl_url(s_iter),
- lttng_snapshot_output_get_maxsize(s_iter));
+ MSG("%s[%" PRIu32 "] %s: %s (max size: %" PRIu64 " bytes)",
+ indent4,
+ lttng_snapshot_output_get_id(s_iter),
+ lttng_snapshot_output_get_name(s_iter),
+ lttng_snapshot_output_get_ctrl_url(s_iter),
+ lttng_snapshot_output_get_maxsize(s_iter));
} else {
- MSG("%s[%" PRIu32 "] %s: %s", indent4,
- lttng_snapshot_output_get_id(s_iter),
- lttng_snapshot_output_get_name(s_iter),
- lttng_snapshot_output_get_ctrl_url(s_iter));
+ MSG("%s[%" PRIu32 "] %s: %s",
+ indent4,
+ lttng_snapshot_output_get_id(s_iter),
+ lttng_snapshot_output_get_name(s_iter),
+ lttng_snapshot_output_get_ctrl_url(s_iter));
}
output_seen = 1;
if (lttng_opt_mi) {
static int del_output(uint32_t id, const char *name)
{
int ret;
- struct lttng_snapshot_output *output = NULL;
+ struct lttng_snapshot_output *output = nullptr;
output = lttng_snapshot_output_create();
if (!output) {
if (id != UINT32_MAX) {
MSG("Snapshot output id %" PRIu32 " successfully deleted for session %s",
- id, current_session_name);
+ id,
+ current_session_name);
} else {
MSG("Snapshot output %s successfully deleted for session %s",
- name, current_session_name);
+ name,
+ current_session_name);
}
if (lttng_opt_mi) {
- ret = mi_lttng_snapshot_del_output(writer, id, name,
- current_session_name);
+ ret = mi_lttng_snapshot_del_output(writer, id, name, current_session_name);
if (ret) {
ret = CMD_ERROR;
}
static int add_output(const char *url)
{
int ret;
- struct lttng_snapshot_output *output = NULL;
+ struct lttng_snapshot_output *output = nullptr;
char name[NAME_MAX];
const char *n_ptr;
n_ptr = lttng_snapshot_output_get_name(output);
if (*n_ptr == '\0') {
int pret;
- pret = snprintf(name, sizeof(name), DEFAULT_SNAPSHOT_NAME "-%" PRIu32,
+ pret = snprintf(name,
+ sizeof(name),
+ DEFAULT_SNAPSHOT_NAME "-%" PRIu32,
lttng_snapshot_output_get_id(output));
if (pret < 0) {
PERROR("snprintf add output name");
n_ptr = name;
}
- MSG("Snapshot output successfully added for session %s",
- current_session_name);
+ MSG("Snapshot output successfully added for session %s", current_session_name);
if (opt_max_size) {
MSG(" [%" PRIu32 "] %s: %s (max size: %" PRIu64 " bytes)",
- lttng_snapshot_output_get_id(output), n_ptr,
- lttng_snapshot_output_get_ctrl_url(output),
- lttng_snapshot_output_get_maxsize(output));
+ lttng_snapshot_output_get_id(output),
+ n_ptr,
+ lttng_snapshot_output_get_ctrl_url(output),
+ lttng_snapshot_output_get_maxsize(output));
} else {
MSG(" [%" PRIu32 "] %s: %s",
- lttng_snapshot_output_get_id(output), n_ptr,
- lttng_snapshot_output_get_ctrl_url(output));
+ lttng_snapshot_output_get_id(output),
+ n_ptr,
+ lttng_snapshot_output_get_ctrl_url(output));
}
if (lttng_opt_mi) {
- ret = mi_lttng_snapshot_add_output(writer, current_session_name,
- n_ptr, output);
+ ret = mi_lttng_snapshot_add_output(writer, current_session_name, n_ptr, output);
if (ret) {
ret = CMD_ERROR;
}
switch (-ret) {
case LTTNG_ERR_SNAPSHOT_UNSUPPORTED:
ERR("Session \"%s\" contains a channel that is incompatible with the snapshot functionality.\nMake sure all channels are configured in 'mmap' output mode.",
- current_session_name);
+ current_session_name);
ret = CMD_ERROR;
break;
default:
if (id == 0 && (errno == 0 || errno == EINVAL)) {
ret = del_output(UINT32_MAX, name);
} else if (errno == 0 && *name == '\0') {
- ret = del_output(id, NULL);
+ ret = del_output(id, nullptr);
} else {
ERR("Argument %s not recognized", argv[1]);
ret = -1;
return ret;
}
-static int cmd_list_output(int argc, const char **argv)
+static int cmd_list_output(int argc __attribute__((unused)),
+ const char **argv __attribute__((unused)))
{
int ret;
static int record(const char *url)
{
int ret;
- struct lttng_snapshot_output *output = NULL;
+ struct lttng_snapshot_output *output = nullptr;
output = create_output_from_args(url);
if (!output) {
if (url) {
MSG("Snapshot written at: %s", url);
} else if (opt_ctrl_url) {
- MSG("Snapshot written to ctrl: %s, data: %s", opt_ctrl_url,
- opt_data_url);
+ MSG("Snapshot written to ctrl: %s, data: %s", opt_ctrl_url, opt_data_url);
}
if (lttng_opt_mi) {
- ret = mi_lttng_snapshot_record(writer, current_session_name, url,
- opt_ctrl_url, opt_data_url);
+ ret = mi_lttng_snapshot_record(writer, url, opt_ctrl_url, opt_data_url);
if (ret) {
ret = CMD_ERROR;
}
if (argc == 2) {
ret = record(argv[1]);
} else {
- ret = record(NULL);
+ ret = record(nullptr);
}
return ret;
goto end;
}
- if ((!opt_ctrl_url && opt_data_url) ||
- (opt_ctrl_url && !opt_data_url)) {
+ if ((!opt_ctrl_url && opt_data_url) || (opt_ctrl_url && !opt_data_url)) {
ERR("URLs must be specified for both data and control");
cmd_ret = CMD_ERROR;
goto end;
LTTNG_ASSERT(argc > 0);
cmd = &actions[i];
- while (cmd->func != NULL) {
+ while (cmd->func != nullptr) {
/* Find command */
if (strcmp(argv[0], cmd->name) == 0) {
int result;
if (lttng_opt_mi) {
/* Action element */
- mi_ret = mi_lttng_writer_open_element(writer,
- mi_lttng_element_command_action);
+ mi_ret = mi_lttng_writer_open_element(
+ writer, mi_lttng_element_command_action);
if (mi_ret) {
cmd_ret = CMD_ERROR;
goto end;
}
/* Name of the action */
- mi_ret = mi_lttng_writer_write_element_string(writer,
- config_element_name, argv[0]);
+ mi_ret = mi_lttng_writer_write_element_string(
+ writer, config_element_name, argv[0]);
if (mi_ret) {
cmd_ret = CMD_ERROR;
goto end;
}
/* Open output element */
- mi_ret = mi_lttng_writer_open_element(writer,
- mi_lttng_element_command_output);
+ mi_ret = mi_lttng_writer_open_element(
+ writer, mi_lttng_element_command_output);
if (mi_ret) {
cmd_ret = CMD_ERROR;
goto end;
cmd_ret = CMD_SUCCESS;
}
-
if (lttng_opt_mi) {
/* Close output and action element */
mi_ret = mi_lttng_close_multi_element(writer, 2);
int opt;
int mi_ret;
enum cmd_error_code cmd_ret = CMD_SUCCESS;
- char *session_name = NULL;
+ char *session_name = nullptr;
static poptContext pc;
- pc = poptGetContext(NULL, argc, argv, snapshot_opts, 0);
+ pc = poptGetContext(nullptr, argc, argv, snapshot_opts, 0);
poptReadDefaultConfig(pc, 0);
/* Mi check */
}
/* Open command element */
- mi_ret = mi_lttng_writer_command_open(writer,
- mi_lttng_element_command_snapshot);
+ mi_ret = mi_lttng_writer_command_open(writer, mi_lttng_element_command_snapshot);
if (mi_ret) {
cmd_ret = CMD_ERROR;
goto end;
}
/* Open output element */
- mi_ret = mi_lttng_writer_open_element(writer,
- mi_lttng_element_command_output);
+ mi_ret = mi_lttng_writer_open_element(writer, mi_lttng_element_command_output);
if (mi_ret) {
cmd_ret = CMD_ERROR;
goto end;
case OPT_MAX_SIZE:
{
uint64_t val;
- const char *max_size_arg = poptGetOptArg(pc);
+ char *max_size_arg = poptGetOptArg(pc);
+ const int parse_ret = utils_parse_size_suffix((char *) max_size_arg, &val);
- if (utils_parse_size_suffix((char *) max_size_arg, &val) < 0) {
- ERR("Unable to handle max-size value %s",
- max_size_arg);
+ if (parse_ret < 0) {
+ ERR("Unable to handle max-size value %s", max_size_arg);
cmd_ret = CMD_ERROR;
+ free(max_size_arg);
goto end;
}
opt_max_size = val;
-
+ free(max_size_arg);
break;
}
default:
if (!opt_session_name) {
session_name = get_session_name();
- if (session_name == NULL) {
+ if (session_name == nullptr) {
cmd_ret = CMD_ERROR;
goto end;
}
}
/* Success ? */
- mi_ret = mi_lttng_writer_write_element_bool(writer,
- mi_lttng_element_command_success,
- cmd_ret == CMD_SUCCESS);
+ mi_ret = mi_lttng_writer_write_element_bool(
+ writer, mi_lttng_element_command_success, cmd_ret == CMD_SUCCESS);
if (mi_ret) {
cmd_ret = CMD_ERROR;
goto end;