*/
#define _LGPL_SOURCE
+#include "../command.hpp"
+
+#include <common/mi-lttng.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+
+#include <lttng/lttng.h>
+
+#include <ctype.h>
+#include <inttypes.h>
#include <popt.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
-#include <inttypes.h>
-#include <ctype.h>
-#include <common/sessiond-comm/sessiond-comm.hpp>
-#include <common/mi-lttng.hpp>
-
-#include "../command.hpp"
-#include <lttng/lttng.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-rotate.1.h>
-;
+ ;
#endif
enum {
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, 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 }
};
static int rotate_tracing(char *session_name)
}
do {
- rotation_status = lttng_rotation_handle_get_state(handle,
- &rotation_state);
+ rotation_status = lttng_rotation_handle_get_state(handle, &rotation_state);
if (rotation_status != LTTNG_ROTATION_STATUS_OK) {
MSG("");
ERR("Failed to query the state of the rotation.");
skip_wait:
switch (rotation_state) {
case LTTNG_ROTATION_STATE_COMPLETED:
- rotation_status = lttng_rotation_handle_get_archive_location(
- handle, &location);
+ rotation_status = lttng_rotation_handle_get_archive_location(handle, &location);
if (rotation_status != LTTNG_ROTATION_STATUS_OK) {
ERR("Failed to retrieve the rotation's completed chunk archive location.");
cmd_ret = CMD_ERROR;
}
if (!lttng_opt_mi && print_location) {
- ret = print_trace_archive_location(location,
- session_name);
+ ret = print_trace_archive_location(location, session_name);
} else if (lttng_opt_mi) {
- ret = mi_lttng_rotate(writer, session_name, rotation_state,
- location);
+ ret = mi_lttng_rotate(writer, session_name, rotation_state, location);
}
if (ret < 0) {
enum cmd_error_code cmd_ret = CMD_SUCCESS;
int popt_ret;
static poptContext pc;
+ const char *arg_session_name = NULL;
char *session_name = NULL;
- bool free_session_name = false;
pc = poptGetContext(NULL, argc, argv, long_options, 0);
popt_ret = poptReadDefaultConfig(pc, 0);
if (popt_ret) {
ERR("poptReadDefaultConfig");
- goto error;
+ cmd_ret = CMD_ERROR;
+ goto end;
}
while ((opt = poptGetNextOpt(pc)) != -1) {
}
}
- opt_session_name = (char*) poptGetArg(pc);
-
- if (!opt_session_name) {
+ arg_session_name = poptGetArg(pc);
+ if (arg_session_name == NULL) {
session_name = get_session_name();
- if (!session_name) {
- goto error;
- }
- free_session_name = true;
} else {
- session_name = opt_session_name;
+ session_name = strdup(arg_session_name);
+ if (session_name == NULL) {
+ PERROR("Failed to copy session name");
+ }
+ }
+
+ if (session_name == NULL) {
+ cmd_ret = CMD_ERROR;
+ goto end;
}
/* Mi check */
if (lttng_opt_mi) {
writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi);
if (!writer) {
- goto error;
+ cmd_ret = CMD_ERROR;
+ goto end;
}
/* Open rotate command */
- ret = mi_lttng_writer_command_open(writer,
- mi_lttng_element_command_rotate);
+ ret = mi_lttng_writer_command_open(writer, mi_lttng_element_command_rotate);
if (ret) {
- goto error;
+ cmd_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) {
- goto error;
+ cmd_ret = CMD_ERROR;
+ goto end;
}
}
/* Close output element */
ret = mi_lttng_writer_close_element(writer);
if (ret) {
- goto error;
+ cmd_ret = CMD_ERROR;
+ goto end;
}
/* Success ? */
- ret = mi_lttng_writer_write_element_bool(writer,
- mi_lttng_element_command_success,
- cmd_ret == CMD_SUCCESS);
+ ret = mi_lttng_writer_write_element_bool(
+ writer, mi_lttng_element_command_success, cmd_ret == CMD_SUCCESS);
if (ret) {
- goto error;
+ cmd_ret = CMD_ERROR;
+ goto end;
}
/* Command element close */
ret = mi_lttng_writer_command_close(writer);
if (ret) {
- goto error;
+ cmd_ret = CMD_ERROR;
+ goto end;
}
}
/* Mi clean-up */
if (writer && mi_lttng_writer_destroy(writer)) {
- goto error;
+ cmd_ret = CMD_ERROR;
+ goto end;
}
end:
+ free(session_name);
poptFreeContext(pc);
- if (free_session_name) {
- free(session_name);
- }
return cmd_ret;
-error:
- cmd_ret = CMD_ERROR;
- goto end;
}