X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdisable_rotation.cpp;h=a75af66ba347026a359aa325d3a575207161fd3c;hb=HEAD;hp=8229f63e01bb4608d337759e7132c3a7f6160344;hpb=48a4000561343808724f7cb5fa8c131877489ccd;p=lttng-tools.git diff --git a/src/bin/lttng/commands/disable_rotation.cpp b/src/bin/lttng/commands/disable_rotation.cpp index 8229f63e0..a75af66ba 100644 --- a/src/bin/lttng/commands/disable_rotation.cpp +++ b/src/bin/lttng/commands/disable_rotation.cpp @@ -6,6 +6,15 @@ */ #define _LGPL_SOURCE +#include "../command.hpp" + +#include +#include + +#include + +#include +#include #include #include #include @@ -13,14 +22,6 @@ #include #include #include -#include -#include - -#include -#include - -#include "../command.h" -#include static char *opt_session_name; static struct mi_writer *writer; @@ -28,7 +29,7 @@ static struct mi_writer *writer; #ifdef LTTNG_EMBED_HELP static const char help_msg[] = #include -; + ; #endif enum { @@ -40,12 +41,12 @@ 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}, - {"session", 's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0}, - {"timer", 0, POPT_ARG_NONE, 0, OPT_TIMER, 0, 0}, - {"size", 0, POPT_ARG_NONE, 0, OPT_SIZE, 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 }, + { "session", 's', POPT_ARG_STRING, &opt_session_name, 0, nullptr, nullptr }, + { "timer", 0, POPT_ARG_NONE, nullptr, OPT_TIMER, nullptr, nullptr }, + { "size", 0, POPT_ARG_NONE, nullptr, OPT_SIZE, nullptr, nullptr }, + { nullptr, 0, 0, nullptr, 0, nullptr, nullptr } }; static const char *schedule_type_str[] = { @@ -53,34 +54,32 @@ static const char *schedule_type_str[] = { "size-based", }; -static const struct lttng_rotation_schedule *get_schedule( - const char *session_name, - const struct lttng_rotation_schedules *schedules, - enum lttng_rotation_schedule_type schedule_type) +static const struct lttng_rotation_schedule * +get_schedule(const char *session_name, + const struct lttng_rotation_schedules *schedules, + enum lttng_rotation_schedule_type schedule_type) { unsigned int count, i; enum lttng_rotation_status status; - const struct lttng_rotation_schedule *ret = NULL; + const struct lttng_rotation_schedule *ret = nullptr; status = lttng_rotation_schedules_get_count(schedules, &count); if (status != LTTNG_ROTATION_STATUS_OK) { ERR("Unable to determine the number of rotation schedules of session %s", - session_name); + session_name); goto end; } for (i = 0; i < count; i++) { - const struct lttng_rotation_schedule *schedule = NULL; + const struct lttng_rotation_schedule *schedule = nullptr; schedule = lttng_rotation_schedules_get_at_index(schedules, i); if (!schedule) { - ERR("Unable to retrieve rotation schedule at index %u", - i); + ERR("Unable to retrieve rotation schedule at index %u", i); goto end; } - if (lttng_rotation_schedule_get_type(schedule) == - schedule_type) { + if (lttng_rotation_schedule_get_type(schedule) == schedule_type) { ret = schedule; break; } @@ -88,16 +87,16 @@ static const struct lttng_rotation_schedule *get_schedule( if (!ret) { ERR("No %s rotation schedule active on session %s", - schedule_type_str[schedule_type], session_name); + schedule_type_str[schedule_type], + session_name); } end: return ret; } -static struct lttng_rotation_schedule *create_empty_schedule( - enum lttng_rotation_schedule_type type) +static struct lttng_rotation_schedule *create_empty_schedule(enum lttng_rotation_schedule_type type) { - struct lttng_rotation_schedule *schedule = NULL; + struct lttng_rotation_schedule *schedule = nullptr; switch (type) { case LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC: @@ -113,15 +112,15 @@ static struct lttng_rotation_schedule *create_empty_schedule( } static enum cmd_error_code remove_schedule(const char *session_name, - enum lttng_rotation_schedule_type schedule_type) + enum lttng_rotation_schedule_type schedule_type) { enum cmd_error_code cmd_ret; int ret; - const struct lttng_rotation_schedule *schedule = NULL; - struct lttng_rotation_schedules *schedules = NULL; + const struct lttng_rotation_schedule *schedule = nullptr; + struct lttng_rotation_schedules *schedules = nullptr; enum lttng_rotation_status status; const char *schedule_type_name; - struct lttng_rotation_schedule *empty_schedule = NULL; + struct lttng_rotation_schedule *empty_schedule = nullptr; switch (schedule_type) { case LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC: @@ -136,8 +135,7 @@ static enum cmd_error_code remove_schedule(const char *session_name, ret = lttng_session_list_rotation_schedules(session_name, &schedules); if (ret != LTTNG_OK) { - ERR("Failed to list rotation schedules of session %s", - session_name); + ERR("Failed to list rotation schedules of session %s", session_name); goto error; } @@ -160,30 +158,27 @@ static enum cmd_error_code remove_schedule(const char *session_name, status = lttng_session_remove_rotation_schedule(session_name, schedule); switch (status) { case LTTNG_ROTATION_STATUS_OK: - MSG("Disabled %s rotation on session %s", - schedule_type_name, session_name); + MSG("Disabled %s rotation on session %s", schedule_type_name, session_name); cmd_ret = CMD_SUCCESS; break; case LTTNG_ROTATION_STATUS_SCHEDULE_NOT_SET: - ERR("No %s rotation schedule set on session %s", - schedule_type_name, - session_name); + ERR("No %s rotation schedule set on session %s", schedule_type_name, session_name); cmd_ret = CMD_ERROR; break; case LTTNG_ROTATION_STATUS_ERROR: case LTTNG_ROTATION_STATUS_INVALID: default: ERR("Failed to disable %s rotation schedule on session %s", - schedule_type_name, session_name); + schedule_type_name, + session_name); cmd_ret = CMD_ERROR; break; } skip_removal: if (lttng_opt_mi) { - ret = mi_lttng_rotation_schedule_result(writer, - schedule ? schedule : empty_schedule, - cmd_ret == CMD_SUCCESS); + ret = mi_lttng_rotation_schedule_result( + writer, schedule ? schedule : empty_schedule, cmd_ret == CMD_SUCCESS); if (ret < 0) { goto error; } @@ -208,11 +203,11 @@ int cmd_disable_rotation(int argc, const char **argv) int popt_ret, opt, ret = 0; enum cmd_error_code cmd_ret = CMD_SUCCESS; static poptContext pc; - char *session_name = NULL; + char *session_name = nullptr; bool free_session_name = false; bool periodic_rotation = false, size_rotation = false; - pc = poptGetContext(NULL, argc, argv, long_options, 0); + pc = poptGetContext(nullptr, argc, argv, long_options, 0); popt_ret = poptReadDefaultConfig(pc, 0); if (popt_ret) { cmd_ret = CMD_ERROR; @@ -240,9 +235,9 @@ int cmd_disable_rotation(int argc, const char **argv) } } - if (opt_session_name == NULL) { + if (opt_session_name == nullptr) { session_name = get_session_name(); - if (session_name == NULL) { + if (session_name == nullptr) { goto error; } free_session_name = true; @@ -259,14 +254,13 @@ int cmd_disable_rotation(int argc, const char **argv) /* Open command element */ ret = mi_lttng_writer_command_open(writer, - mi_lttng_element_command_disable_rotation); + mi_lttng_element_command_disable_rotation); if (ret) { goto error; } /* 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; } @@ -280,14 +274,13 @@ int cmd_disable_rotation(int argc, const char **argv) if (lttng_opt_mi) { ret = mi_lttng_writer_open_element(writer, - mi_lttng_element_rotation_schedule_results); + mi_lttng_element_rotation_schedule_results); if (ret) { goto error; } - ret = mi_lttng_writer_write_element_string(writer, - mi_lttng_element_session_name, - session_name); + ret = mi_lttng_writer_write_element_string( + writer, mi_lttng_element_session_name, session_name); if (ret) { goto error; } @@ -298,16 +291,15 @@ int cmd_disable_rotation(int argc, const char **argv) * Continue processing even on error as multiple schedules can * be specified at once. */ - cmd_ret = remove_schedule(session_name, - LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC); + cmd_ret = remove_schedule(session_name, LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC); } if (size_rotation) { enum cmd_error_code tmp_ret; /* Don't overwrite cmd_ret if it already indicates an error. */ - tmp_ret = remove_schedule(session_name, - LTTNG_ROTATION_SCHEDULE_TYPE_SIZE_THRESHOLD); + tmp_ret = + remove_schedule(session_name, LTTNG_ROTATION_SCHEDULE_TYPE_SIZE_THRESHOLD); cmd_ret = cmd_ret ? cmd_ret : tmp_ret; } @@ -329,9 +321,8 @@ close_command: } /* 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; }