/*
- * Copyright (C) 2017 - Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2017 Julien Desfossez <jdesfossez@efficios.com>
*
- * 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
#include <common/mi-lttng.h>
#include "../command.h"
-#include <lttng/rotation.h>
-#include <lttng/location.h>
+#include <lttng/lttng.h>
-static char *opt_session_name;
static int opt_no_wait;
static struct mi_writer *writer;
}
if (rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
- ret = usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
+ ret = usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME_US);
if (ret) {
PERROR("\nusleep");
goto error;
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);
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);
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);
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;
}