X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdestroy.c;h=f74bf515c79ae44c7668e8cd674156ce24159da0;hp=39b4e9a2f6dbe00d0b6a63d6c372455dc07fbfb8;hb=890d8fe47755c3bad936389cf48ffa141cff41c9;hpb=679b4943c3b0f451e7f4fbcd804dd8a7a679e253 diff --git a/src/bin/lttng/commands/destroy.c b/src/bin/lttng/commands/destroy.c index 39b4e9a2f..f74bf515c 100644 --- a/src/bin/lttng/commands/destroy.c +++ b/src/bin/lttng/commands/destroy.c @@ -1,22 +1,21 @@ /* * 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 - * as published by the Free Software Foundation; only version 2 - * of the License. + * 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. * * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 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 _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -27,7 +26,15 @@ #include "../command.h" +#include +#include +#include + static char *opt_session_name; +static int opt_destroy_all; + +/* Mi writer */ +static struct mi_writer *writer; enum { OPT_HELP = 1, @@ -37,6 +44,7 @@ enum { static 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}, {0, 0, 0, 0, 0, 0, 0} }; @@ -46,58 +54,84 @@ static struct poptOption long_options[] = { */ static void usage(FILE *ofp) { - fprintf(ofp, "usage: lttng destroy [options] [NAME]\n"); + fprintf(ofp, "usage: lttng destroy [NAME] [OPTIONS]\n"); fprintf(ofp, "\n"); fprintf(ofp, "Where NAME is an optional session name. If not specified, lttng will\n"); fprintf(ofp, "get it from the configuration directory (.lttng).\n"); fprintf(ofp, "\n"); + fprintf(ofp, "Options:\n"); fprintf(ofp, " -h, --help Show this help\n"); - fprintf(ofp, " --list-options Simple listing of options\n"); + fprintf(ofp, " -a, --all Destroy all sessions\n"); + fprintf(ofp, " --list-options Simple listing of options\n"); fprintf(ofp, "\n"); } /* - * Destroy a session removing the config directory and unregistering to the - * session daemon. + * destroy_session + * + * Unregister the provided session to the session daemon. On success, removes + * the default configuration. */ -static int destroy_session() +static int destroy_session(struct lttng_session *session) { int ret; - char *session_name, *path; + char *session_name = NULL; - if (opt_session_name == NULL) { - session_name = get_session_name(); - if (session_name == NULL) { - ret = CMD_ERROR; - goto error; + ret = lttng_destroy_session(session->name); + if (ret < 0) { + switch (-ret) { + case LTTNG_ERR_SESS_NOT_FOUND: + WARN("Session name %s not found", session->name); + break; + default: + ERR("%s", lttng_strerror(ret)); + break; } - } else { - session_name = opt_session_name; + goto error; } - ret = lttng_destroy_session(session_name); - if (ret < 0) { - goto free_name; - } + MSG("Session %s destroyed", session->name); - path = config_get_default_path(); - if (path == NULL) { - ret = CMD_FATAL; - goto free_name; + session_name = get_session_name_quiet(); + if (session_name && !strncmp(session->name, session_name, NAME_MAX)) { + config_destroy_default(); } - if (opt_session_name == NULL) { - config_destroy(path); - MSG("Session %s destroyed at %s", session_name, path); - } else { - MSG("Session %s destroyed", session_name); + if (lttng_opt_mi) { + ret = mi_lttng_session(writer, session, 0); + if (ret) { + ret = CMD_ERROR; + goto error; + } } ret = CMD_SUCCESS; +error: + free(session_name); + return ret; +} -free_name: - if (opt_session_name == NULL) { - free(session_name); +/* + * destroy_all_sessions + * + * Call destroy_sessions for each registered sessions + */ +static int destroy_all_sessions(struct lttng_session *sessions, int count) +{ + int i, ret = CMD_SUCCESS; + + 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]); + if (ret < 0) { + goto error; + } } error: return ret; @@ -108,8 +142,14 @@ error: */ int cmd_destroy(int argc, const char **argv) { - int opt, ret = CMD_SUCCESS; + int opt; + int ret = CMD_SUCCESS , i, command_ret = CMD_SUCCESS, success = 1; static poptContext pc; + char *session_name = NULL; + + struct lttng_session *sessions; + int count; + int found; pc = poptGetContext(NULL, argc, argv, long_options, 0); poptReadDefaultConfig(pc, 0); @@ -117,23 +157,140 @@ int cmd_destroy(int argc, const char **argv) while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { case OPT_HELP: - usage(stderr); - goto end; + usage(stdout); + break; case OPT_LIST_OPTIONS: list_cmd_options(stdout, long_options); - ret = CMD_SUCCESS; - goto end; + break; default: usage(stderr); ret = CMD_UNDEFINED; + break; + } + goto end; + } + + /* Mi preparation */ + if (lttng_opt_mi) { + writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi); + if (!writer) { + ret = -LTTNG_ERR_NOMEM; goto end; } + + /* Open command element */ + ret = mi_lttng_writer_command_open(writer, + mi_lttng_element_command_destroy); + if (ret) { + 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; + goto end; + } + + /* For validation and semantic purpose we open a sessions element */ + ret = mi_lttng_sessions_open(writer); + if (ret) { + ret = CMD_ERROR; + goto end; + } + } + + /* Recuperate all sessions for further operation */ + count = lttng_list_sessions(&sessions); + if (count < 0) { + command_ret = count; + success = 0; + goto mi_closing; } - opt_session_name = (char*) 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; + } + + /* 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; + } + + } + } - ret = destroy_session(); + if (!found) { + ERR("Session name %s not found", session_name); + command_ret = LTTNG_ERR_SESS_NOT_FOUND; + success = 0; + goto mi_closing; + } + } +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; + goto end; + } + + /* Success ? */ + ret = mi_lttng_writer_write_element_bool(writer, + mi_lttng_element_command_success, success); + if (ret) { + ret = CMD_ERROR; + goto end; + } + + /* Command element close */ + ret = mi_lttng_writer_command_close(writer); + if (ret) { + 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); + } + + /* Overwrite ret if an error occurred during destroy_session/all */ + ret = command_ret ? command_ret : ret; + + poptFreeContext(pc); return ret; }