Clean-up: lttng-destroy: move static symbols to anonymous namespace
[lttng-tools.git] / src / bin / lttng / commands / destroy.cpp
index 3ab9b224849180052f9755036abd279ab794fe6b..876fad6461e5518c7a73b3779685f496ac5ce46e 100644 (file)
@@ -6,47 +6,51 @@
  */
 
 #define _LGPL_SOURCE
+#include "../command.hpp"
+
+#include <common/exception.hpp>
+#include <common/mi-lttng.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/utils.hpp>
+
+#include <lttng/lttng.h>
+
 #include <popt.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <stdbool.h>
-#include <lttng/lttng.h>
-
-#include "../command.hpp"
-
-#include <common/mi-lttng.hpp>
-#include <common/sessiond-comm/sessiond-comm.hpp>
-#include <common/utils.hpp>
 
-static char *opt_session_name;
-static int opt_destroy_all;
-static int opt_no_wait;
+enum {
+       OPT_HELP = 1,
+       OPT_LIST_OPTIONS,
+       OPT_ALL,
+       OPT_ENABLE_GLOB,
+};
 
+namespace {
 #ifdef LTTNG_EMBED_HELP
-static const char help_msg[] =
+const char help_msg[] =
 #include <lttng-destroy.1.h>
-;
+       ;
 #endif
 
-/* Mi writer */
-static struct mi_writer *writer;
+int opt_no_wait;
 
-enum {
-       OPT_HELP = 1,
-       OPT_LIST_OPTIONS,
-};
+/* Mi writer */
+struct mi_writer *writer;
 
-static struct poptOption long_options[] = {
+struct poptOption long_options[] = {
        /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-       {"help",      'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
-       {"all",       'a', POPT_ARG_VAL, &opt_destroy_all, 1, 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 },
+       { "all", 'a', POPT_ARG_NONE, nullptr, OPT_ALL, nullptr, nullptr },
+       { "glob", 'g', POPT_ARG_NONE, nullptr, OPT_ENABLE_GLOB, 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 }
 };
 
 /*
@@ -55,19 +59,19 @@ static struct poptOption long_options[] = {
  * Unregister the provided session to the session daemon. On success, removes
  * the default configuration.
  */
-static int destroy_session(struct lttng_session *session)
+int destroy_session(const struct lttng_session& session)
 {
        int ret;
-       char *session_name = NULL;
+       char *session_name = nullptr;
        bool session_was_already_stopped;
        enum lttng_error_code ret_code;
-       struct lttng_destruction_handle *handle = NULL;
+       struct lttng_destruction_handle *handle = nullptr;
        enum lttng_destruction_handle_status status;
        bool newline_needed = false, printed_destroy_msg = false;
        enum lttng_rotation_state rotation_state;
-       char *stats_str = NULL;
+       char *stats_str = nullptr;
 
-       ret = lttng_stop_tracing_no_wait(session->name);
+       ret = lttng_stop_tracing_no_wait(session.name);
        if (ret < 0 && ret != -LTTNG_ERR_TRACE_ALREADY_STOPPED) {
                ERR("%s", lttng_strerror(ret));
        }
@@ -75,7 +79,7 @@ static int destroy_session(struct lttng_session *session)
        session_was_already_stopped = ret == -LTTNG_ERR_TRACE_ALREADY_STOPPED;
        if (!opt_no_wait) {
                do {
-                       ret = lttng_data_pending(session->name);
+                       ret = lttng_data_pending(session.name);
                        if (ret < 0) {
                                /* Return the data available call error. */
                                goto error;
@@ -88,8 +92,7 @@ static int destroy_session(struct lttng_session *session)
                         */
                        if (ret) {
                                if (!printed_destroy_msg) {
-                                       _MSG("Destroying session %s",
-                                                       session->name);
+                                       _MSG("Destroying session %s", session.name);
                                        newline_needed = true;
                                        printed_destroy_msg = true;
                                        fflush(stdout);
@@ -107,13 +110,13 @@ static int destroy_session(struct lttng_session *session)
                 * Don't print the event and packet loss warnings since the user
                 * already saw them when stopping the trace.
                 */
-               ret = get_session_stats_str(session->name, &stats_str);
+               ret = get_session_stats_str(session.name, &stats_str);
                if (ret < 0) {
                        goto error;
                }
        }
 
-       ret_code = lttng_destroy_session_ext(session->name, &handle);
+       ret_code = lttng_destroy_session_ext(session.name, &handle);
        if (ret_code != LTTNG_OK) {
                ret = -ret_code;
                goto error;
@@ -125,12 +128,11 @@ static int destroy_session(struct lttng_session *session)
 
        do {
                status = lttng_destruction_handle_wait_for_completion(
-                               handle, DEFAULT_DATA_AVAILABILITY_WAIT_TIME_US /
-                                                       USEC_PER_MSEC);
+                       handle, DEFAULT_DATA_AVAILABILITY_WAIT_TIME_US / USEC_PER_MSEC);
                switch (status) {
                case LTTNG_DESTRUCTION_HANDLE_STATUS_TIMEOUT:
                        if (!printed_destroy_msg) {
-                               _MSG("Destroying session %s", session->name);
+                               _MSG("Destroying session %s", session.name);
                                newline_needed = true;
                                printed_destroy_msg = true;
                        }
@@ -141,8 +143,8 @@ static int destroy_session(struct lttng_session *session)
                        break;
                default:
                        ERR("%sFailed to wait for the completion of the destruction of session \"%s\"",
-                                       newline_needed ? "\n" : "",
-                                       session->name);
+                           newline_needed ? "\n" : "",
+                           session.name);
                        newline_needed = false;
                        ret = -1;
                        goto error;
@@ -152,7 +154,7 @@ static int destroy_session(struct lttng_session *session)
        status = lttng_destruction_handle_get_result(handle, &ret_code);
        if (status != LTTNG_DESTRUCTION_HANDLE_STATUS_OK) {
                ERR("%sFailed to get the result of session destruction",
-                               newline_needed ? "\n" : "");
+                   newline_needed ? "\n" : "");
                ret = -1;
                newline_needed = false;
                goto error;
@@ -162,11 +164,10 @@ static int destroy_session(struct lttng_session *session)
                goto error;
        }
 
-       status = lttng_destruction_handle_get_rotation_state(
-                       handle, &rotation_state);
+       status = lttng_destruction_handle_get_rotation_state(handle, &rotation_state);
        if (status != LTTNG_DESTRUCTION_HANDLE_STATUS_OK) {
                ERR("%sFailed to get rotation state from destruction handle",
-                               newline_needed ? "\n" : "");
+                   newline_needed ? "\n" : "");
                newline_needed = false;
                goto skip_wait_rotation;
        }
@@ -178,14 +179,12 @@ static int destroy_session(struct lttng_session *session)
        {
                const struct lttng_trace_archive_location *location;
 
-               status = lttng_destruction_handle_get_archive_location(
-                               handle, &location);
+               status = lttng_destruction_handle_get_archive_location(handle, &location);
                if (status == LTTNG_DESTRUCTION_HANDLE_STATUS_OK) {
-                       ret = print_trace_archive_location(
-                                       location, session->name);
+                       ret = print_trace_archive_location(location, session.name);
                        if (ret) {
                                ERR("%sFailed to print the location of trace archive",
-                                               newline_needed ? "\n" : "");
+                                   newline_needed ? "\n" : "");
                                newline_needed = false;
                                goto skip_wait_rotation;
                        }
@@ -195,25 +194,24 @@ static int destroy_session(struct lttng_session *session)
        /* fall-through. */
        default:
                ERR("%sFailed to get the location of the rotation performed during the session's destruction",
-                               newline_needed ? "\n" : "");
+                   newline_needed ? "\n" : "");
                newline_needed = false;
                goto skip_wait_rotation;
        }
 skip_wait_rotation:
-       MSG("%sSession %s destroyed", newline_needed ? "\n" : "",
-                       session->name);
+       MSG("%sSession %s destroyed", newline_needed ? "\n" : "", session.name);
        newline_needed = false;
        if (stats_str) {
                MSG("%s", stats_str);
        }
 
        session_name = get_session_name_quiet();
-       if (session_name && !strncmp(session->name, session_name, NAME_MAX)) {
+       if (session_name && !strncmp(session.name, session_name, NAME_MAX)) {
                config_destroy_default();
        }
 
        if (lttng_opt_mi) {
-               ret = mi_lttng_session(writer, session, 0);
+               ret = mi_lttng_session(writer, &session, 0);
                if (ret) {
                        ret = CMD_ERROR;
                        goto error;
@@ -231,35 +229,50 @@ error:
        return ret;
 }
 
-/*
- * destroy_all_sessions
- *
- * Call destroy_sessions for each registered sessions
- */
-static int destroy_all_sessions(struct lttng_session *sessions, int count)
+cmd_error_code destroy_sessions(const struct session_spec& spec)
 {
-       int i;
-       bool error_occurred = false;
-
-       LTTNG_ASSERT(count >= 0);
-       if (count == 0) {
-               MSG("No session found, nothing to do.");
+       //bool had_warning = false;
+       //bool had_error = false;
+       bool listing_failed = false;
+
+       const auto sessions = [&listing_failed, &spec]() -> session_list {
+               try {
+                       return list_sessions(spec);
+               } catch (const lttng::ctl::error& ctl_exception) {
+                       ERR_FMT("Failed to list sessions ({})",
+                               lttng_strerror(-ctl_exception.code()));
+                       listing_failed = true;
+                       return {};
+               }
+       }();
+
+       if (sessions.size() == 0) {
+               switch (spec.type) {
+               case session_spec::ALL:
+                       /* fall-through. */
+               case session_spec::GLOB_PATTERN:
+                       MSG("No session found, nothing to do.");
+                       break;
+               case session_spec::NAME:
+                       ERR("Session name %s not found", spec.value);
+                       return CMD_ERROR;
+               }
        }
 
-       for (i = 0; i < count; i++) {
-               int ret = destroy_session(&sessions[i]);
+       for (const auto& session : sessions) {
+               int const sub_ret = destroy_session(session);
 
-               if (ret < 0) {
+               if (sub_ret != CMD_SUCCESS) {
                        ERR("%s during the destruction of session \"%s\"",
-                                       lttng_strerror(ret),
-                                       sessions[i].name);
-                       /* Continue to next session. */
-                       error_occurred = true;
+                               lttng_strerror(sub_ret),
+                               session.name);
+                       return CMD_ERROR;
                }
        }
 
-       return error_occurred ? CMD_ERROR : CMD_SUCCESS;
+       return CMD_SUCCESS;
 }
+} /* namespace */
 
 /*
  * The 'destroy <options>' first level command
@@ -267,167 +280,111 @@ static int destroy_all_sessions(struct lttng_session *sessions, int count)
 int cmd_destroy(int argc, const char **argv)
 {
        int opt;
-       int ret = CMD_SUCCESS , i, command_ret = CMD_SUCCESS, success = 1;
+       cmd_error_code command_ret = CMD_SUCCESS;
+       bool success;
        static poptContext pc;
-       char *session_name = NULL;
-       const char *leftover = NULL;
-
-       struct lttng_session *sessions = NULL;
-       int count;
-       int found;
-
-       pc = poptGetContext(NULL, argc, argv, long_options, 0);
+       const char *leftover = nullptr;
+       struct session_spec spec = {
+               .type = session_spec::NAME,
+               .value = nullptr,
+       };
+       session_list const sessions;
+
+       pc = poptGetContext(nullptr, argc, argv, long_options, 0);
        poptReadDefaultConfig(pc, 0);
 
        while ((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case OPT_HELP:
+               {
+                       int ret;
+
                        SHOW_HELP();
-                       break;
+                       command_ret = static_cast<cmd_error_code>(ret);
+                       goto end;
+               }
                case OPT_LIST_OPTIONS:
                        list_cmd_options(stdout, long_options);
+                       goto end;
+               case OPT_ALL:
+                       spec.type = session_spec::ALL;
                        break;
-               default:
-                       ret = CMD_UNDEFINED;
+               case OPT_ENABLE_GLOB:
+                       spec.type = session_spec::GLOB_PATTERN;
                        break;
+               default:
+                       command_ret = CMD_UNDEFINED;
+                       goto end;
                }
-               goto end;
        }
 
        /* Mi preparation */
        if (lttng_opt_mi) {
                writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi);
                if (!writer) {
-                       ret = -LTTNG_ERR_NOMEM;
+                       command_ret = CMD_ERROR;
                        goto end;
                }
 
                /* Open command element */
-               ret = mi_lttng_writer_command_open(writer,
-                               mi_lttng_element_command_destroy);
-               if (ret) {
-                       ret = CMD_ERROR;
+               if (mi_lttng_writer_command_open(writer, mi_lttng_element_command_destroy)) {
+                       command_ret = CMD_ERROR;
                        goto end;
                }
 
                /* Open output element */
-               ret = mi_lttng_writer_open_element(writer,
-                               mi_lttng_element_command_output);
-               if (ret) {
-                       ret = CMD_ERROR;
+               if (mi_lttng_writer_open_element(writer, mi_lttng_element_command_output)) {
+                       command_ret = CMD_ERROR;
                        goto end;
                }
 
                /* For validation and semantic purpose we open a sessions element */
-               ret = mi_lttng_sessions_open(writer);
-               if (ret) {
-                       ret = CMD_ERROR;
+               if (mi_lttng_sessions_open(writer)) {
+                       command_ret = CMD_ERROR;
                        goto end;
                }
        }
 
-       /* Recuperate all sessions for further operation */
-       count = lttng_list_sessions(&sessions);
-       if (count < 0) {
-               ERR("%s", lttng_strerror(count));
-               command_ret = CMD_ERROR;
-               success = 0;
-               goto mi_closing;
-       }
+       spec.value = poptGetArg(pc);
 
-       /* Ignore session name in case all sessions are to be destroyed */
-       if (opt_destroy_all) {
-               command_ret = destroy_all_sessions(sessions, count);
-               if (command_ret) {
-                       success = 0;
-               }
-       } else {
-               opt_session_name = (char *) poptGetArg(pc);
-
-               if (!opt_session_name) {
-                       /* No session name specified, lookup default */
-                       session_name = get_session_name();
-                       if (session_name == NULL) {
-                               command_ret = CMD_ERROR;
-                               success = 0;
-                               goto mi_closing;
-                       }
-               } else {
-                       session_name = opt_session_name;
-               }
+       command_ret = destroy_sessions(spec);
 
-               /* Find the corresponding lttng_session struct */
-               found = 0;
-               for (i = 0; i < count; i++) {
-                       if (strncmp(sessions[i].name, session_name, NAME_MAX) == 0) {
-                               found = 1;
-                               command_ret = destroy_session(&sessions[i]);
-                               if (command_ret) {
-                                       success = 0;
-                                       ERR("%s during the destruction of session \"%s\"",
-                                                       lttng_strerror(command_ret),
-                                                       sessions[i].name);
-                               }
-                       }
-               }
-
-               if (!found) {
-                       ERR("Session name %s not found", session_name);
-                       command_ret = LTTNG_ERR_SESS_NOT_FOUND;
-                       success = 0;
-                       goto mi_closing;
-               }
-       }
+       success = command_ret == CMD_SUCCESS;
 
        leftover = poptGetArg(pc);
        if (leftover) {
                ERR("Unknown argument: %s", leftover);
-               ret = CMD_ERROR;
-               success = 0;
-               goto mi_closing;
+               command_ret = CMD_ERROR;
+               success = false;
        }
 
-mi_closing:
        /* Mi closing */
        if (lttng_opt_mi) {
                /* Close sessions and output element element */
-               ret = mi_lttng_close_multi_element(writer, 2);
-               if (ret) {
-                       ret = CMD_ERROR;
+               if (mi_lttng_close_multi_element(writer, 2)) {
+               command_ret = CMD_ERROR;
                        goto end;
                }
 
                /* Success ? */
-               ret = mi_lttng_writer_write_element_bool(writer,
-                               mi_lttng_element_command_success, success);
-               if (ret) {
-                       ret = CMD_ERROR;
+               if (mi_lttng_writer_write_element_bool(
+                       writer, mi_lttng_element_command_success, success)) {
+               command_ret = CMD_ERROR;
                        goto end;
                }
 
                /* Command element close */
-               ret = mi_lttng_writer_command_close(writer);
-               if (ret) {
-                       ret = CMD_ERROR;
+               if (mi_lttng_writer_command_close(writer)) {
+               command_ret = CMD_ERROR;
                        goto end;
                }
        }
 end:
        /* Mi clean-up */
        if (writer && mi_lttng_writer_destroy(writer)) {
-               /* Preserve original error code */
-               ret = ret ? ret : -LTTNG_ERR_MI_IO_FAIL;
-       }
-
-       if (opt_session_name == NULL) {
-               free(session_name);
+               command_ret = CMD_ERROR;
        }
 
-       free(sessions);
-
-       /* Overwrite ret if an error occurred during destroy_session/all */
-       ret = command_ret ? command_ret : ret;
-
        poptFreeContext(pc);
-       return ret;
+       return command_ret;
 }
This page took 0.030303 seconds and 4 git commands to generate.