X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Frotate.cpp;h=9c4347e43191467e3de3b4ecd28b7576e1749dd9;hb=HEAD;hp=27263da16b5b0441de69d0e64beb91157fb3d598;hpb=5b915816f16e7cb3134dd7279abad79b31c2486c;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/rotate.cpp b/src/bin/lttng/commands/rotate.cpp
index 27263da16..9c4347e43 100644
--- a/src/bin/lttng/commands/rotate.cpp
+++ b/src/bin/lttng/commands/rotate.cpp
@@ -6,6 +6,15 @@
  */
 
 #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>
@@ -13,14 +22,6 @@
 #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 int opt_no_wait;
 static struct mi_writer *writer;
@@ -28,7 +29,7 @@ static struct mi_writer *writer;
 #ifdef LTTNG_EMBED_HELP
 static const char help_msg[] =
 #include <lttng-rotate.1.h>
-;
+	;
 #endif
 
 enum {
@@ -38,25 +39,25 @@ 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, 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 },
+	{ nullptr, 0, 0, nullptr, 0, nullptr, nullptr }
 };
 
 static int rotate_tracing(char *session_name)
 {
 	int ret;
 	enum cmd_error_code cmd_ret = CMD_SUCCESS;
-	struct lttng_rotation_handle *handle = NULL;
+	struct lttng_rotation_handle *handle = nullptr;
 	enum lttng_rotation_status rotation_status;
 	enum lttng_rotation_state rotation_state = LTTNG_ROTATION_STATE_ONGOING;
-	const struct lttng_trace_archive_location *location = NULL;
+	const struct lttng_trace_archive_location *location = nullptr;
 	bool print_location = true;
 
 	DBG("Rotating the output files of session %s", session_name);
 
-	ret = lttng_rotate_session(session_name, NULL, &handle);
+	ret = lttng_rotate_session(session_name, nullptr, &handle);
 	if (ret < 0) {
 		switch (-ret) {
 		case LTTNG_ERR_SESSION_NOT_STARTED:
@@ -82,8 +83,7 @@ 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.");
@@ -110,8 +110,7 @@ static int rotate_tracing(char *session_name)
 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;
@@ -132,11 +131,9 @@ skip_wait:
 	}
 
 	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) {
@@ -162,10 +159,10 @@ int cmd_rotate(int argc, const char **argv)
 	enum cmd_error_code cmd_ret = CMD_SUCCESS;
 	int popt_ret;
 	static poptContext pc;
-	const char *arg_session_name = NULL;
-	char *session_name = NULL;
+	const char *arg_session_name = nullptr;
+	char *session_name = nullptr;
 
-	pc = poptGetContext(NULL, argc, argv, long_options, 0);
+	pc = poptGetContext(nullptr, argc, argv, long_options, 0);
 	popt_ret = poptReadDefaultConfig(pc, 0);
 	if (popt_ret) {
 		ERR("poptReadDefaultConfig");
@@ -188,16 +185,16 @@ int cmd_rotate(int argc, const char **argv)
 	}
 
 	arg_session_name = poptGetArg(pc);
-	if (arg_session_name == NULL) {
+	if (arg_session_name == nullptr) {
 		session_name = get_session_name();
 	} else {
 		session_name = strdup(arg_session_name);
-		if (session_name == NULL) {
+		if (session_name == nullptr) {
 			PERROR("Failed to copy session name");
 		}
 	}
 
-	if (session_name == NULL) {
+	if (session_name == nullptr) {
 		cmd_ret = CMD_ERROR;
 		goto end;
 	}
@@ -211,16 +208,14 @@ int cmd_rotate(int argc, const char **argv)
 		}
 
 		/* 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) {
 			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) {
 			cmd_ret = CMD_ERROR;
 			goto end;
@@ -238,9 +233,8 @@ int cmd_rotate(int argc, const char **argv)
 			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) {
 			cmd_ret = CMD_ERROR;
 			goto end;