X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdestroy.c;h=0a5489304e1bcae9cc7c792a9b91887fc3f486ed;hb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;hp=02c7139c3547e4e9a4dff2516e223597081faa76;hpb=56c3ec9ea83605c2e145d3d268fc9ffd005d8f94;p=lttng-tools.git diff --git a/src/bin/lttng/commands/destroy.c b/src/bin/lttng/commands/destroy.c index 02c7139c3..0a5489304 100644 --- a/src/bin/lttng/commands/destroy.c +++ b/src/bin/lttng/commands/destroy.c @@ -1,18 +1,8 @@ /* - * Copyright (C) 2011 - David Goulet + * Copyright (C) 2011 David Goulet * - * 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 @@ -24,6 +14,7 @@ #include #include #include +#include #include "../command.h" @@ -69,6 +60,11 @@ static int destroy_session(struct lttng_session *session) int ret; char *session_name = NULL; bool session_was_stopped; + enum lttng_error_code ret_code; + struct lttng_destruction_handle *handle = NULL; + enum lttng_destruction_handle_status status; + bool printed_wait_msg = false; + enum lttng_rotation_state rotation_state; ret = lttng_stop_tracing_no_wait(session->name); if (ret < 0 && ret != -LTTNG_ERR_TRACE_ALREADY_STOPPED) { @@ -76,8 +72,6 @@ static int destroy_session(struct lttng_session *session) } session_was_stopped = ret == -LTTNG_ERR_TRACE_ALREADY_STOPPED; if (!opt_no_wait) { - bool printed_wait_msg = false; - do { ret = lttng_data_pending(session->name); if (ret < 0) { @@ -91,19 +85,17 @@ static int destroy_session(struct lttng_session *session) */ if (ret) { if (!printed_wait_msg) { - _MSG("Waiting for data availability"); + _MSG("Waiting for destruction of session \"%s\"", + session->name); + printed_wait_msg = true; fflush(stdout); } - printed_wait_msg = true; - usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME); + usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME_US); _MSG("."); fflush(stdout); } } while (ret != 0); - if (printed_wait_msg) { - MSG(""); - } } if (!session_was_stopped) { /* @@ -113,12 +105,88 @@ static int destroy_session(struct lttng_session *session) print_session_stats(session->name); } - ret = lttng_destroy_session_no_wait(session->name); - if (ret < 0) { + ret_code = lttng_destroy_session_ext(session->name, &handle); + if (ret_code != LTTNG_OK) { + ret = -ret_code; goto error; } - MSG("Session %s destroyed", session->name); + if (opt_no_wait) { + goto skip_wait_rotation; + } + + do { + status = lttng_destruction_handle_wait_for_completion(handle, + DEFAULT_DATA_AVAILABILITY_WAIT_TIME_US / USEC_PER_MSEC); + switch (status) { + case LTTNG_DESTRUCTION_HANDLE_STATUS_TIMEOUT: + if (!printed_wait_msg) { + _MSG("Waiting for destruction of session \"%s\"", + session->name); + printed_wait_msg = true; + } + _MSG("."); + fflush(stdout); + break; + case LTTNG_DESTRUCTION_HANDLE_STATUS_COMPLETED: + break; + default: + ERR("Failed to wait for the completion of the destruction of session \"%s\"", + session->name); + ret = -1; + goto error; + } + } while (status == LTTNG_DESTRUCTION_HANDLE_STATUS_TIMEOUT); + + status = lttng_destruction_handle_get_result(handle, &ret_code); + if (status != LTTNG_DESTRUCTION_HANDLE_STATUS_OK) { + ERR("Failed to get the result of session destruction"); + ret = -1; + goto error; + } + if (ret_code != LTTNG_OK) { + ret = -ret_code; + goto error; + } + + status = lttng_destruction_handle_get_rotation_state(handle, + &rotation_state); + if (status != LTTNG_DESTRUCTION_HANDLE_STATUS_OK) { + ERR("Failed to get rotation state from destruction handle"); + goto skip_wait_rotation; + } + switch (rotation_state) { + case LTTNG_ROTATION_STATE_NO_ROTATION: + break; + case LTTNG_ROTATION_STATE_COMPLETED: + { + const struct lttng_trace_archive_location *location; + + status = lttng_destruction_handle_get_archive_location(handle, + &location); + if (status == LTTNG_DESTRUCTION_HANDLE_STATUS_OK) { + if (printed_wait_msg) { + MSG(""); + printed_wait_msg = false; + } + ret = print_trace_archive_location(location, + session->name); + if (ret) { + ERR("Failed to print the location of trace archive"); + goto skip_wait_rotation; + } + break; + } + /* fall-through. */ + } + default: + ERR("Failed to get the location of the rotation performed during the session's destruction"); + goto skip_wait_rotation; + } +skip_wait_rotation: + MSG("%sSession \"%s\" destroyed", printed_wait_msg ? "\n" : "", + session->name); + printed_wait_msg = false; session_name = get_session_name_quiet(); if (session_name && !strncmp(session->name, session_name, NAME_MAX)) { @@ -135,6 +203,10 @@ static int destroy_session(struct lttng_session *session) ret = CMD_SUCCESS; error: + if (printed_wait_msg) { + MSG(""); + } + lttng_destruction_handle_destroy(handle); free(session_name); return ret; } @@ -146,23 +218,27 @@ error: */ static int destroy_all_sessions(struct lttng_session *sessions, int count) { - int i, ret = CMD_SUCCESS; + int i; + bool error_occurred = false; + assert(count >= 0); if (count == 0) { MSG("No session found, nothing to do."); - } else if (count < 0) { - ERR("%s", lttng_strerror(ret)); - goto error; } for (i = 0; i < count; i++) { - ret = destroy_session(&sessions[i]); + int ret = destroy_session(&sessions[i]); + if (ret < 0) { - goto error; + ERR("%s during the destruction of session \"%s\"", + lttng_strerror(ret), + sessions[i].name); + /* Continue to next session. */ + error_occurred = true; } } -error: - return ret; + + return error_occurred ? CMD_ERROR : CMD_SUCCESS; } /* @@ -174,6 +250,7 @@ int cmd_destroy(int argc, const char **argv) int ret = CMD_SUCCESS , i, command_ret = CMD_SUCCESS, success = 1; static poptContext pc; char *session_name = NULL; + const char *leftover = NULL; struct lttng_session *sessions; int count; @@ -267,8 +344,10 @@ int cmd_destroy(int argc, const char **argv) 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); } - } } @@ -280,6 +359,14 @@ int cmd_destroy(int argc, const char **argv) } } + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + success = 0; + goto mi_closing; + } + mi_closing: /* Mi closing */ if (lttng_opt_mi) {