X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fset_session.c;h=3196f12bdd3863373938267a4106241eaac9100c;hp=f91935e045072d5d71bf551c0fbb8108b90ee6fe;hb=6c1c0768320135c6936c371b09731851b508c023;hpb=679b4943c3b0f451e7f4fbcd804dd8a7a679e253 diff --git a/src/bin/lttng/commands/set_session.c b/src/bin/lttng/commands/set_session.c index f91935e04..3196f12bd 100644 --- a/src/bin/lttng/commands/set_session.c +++ b/src/bin/lttng/commands/set_session.c @@ -1,22 +1,22 @@ /* * 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 @@ -24,6 +24,9 @@ #include #include #include +#include + +#include #include "../command.h" @@ -34,6 +37,8 @@ enum { OPT_LIST_OPTIONS, }; +static struct mi_writer *writer; + static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ {"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0}, @@ -46,7 +51,7 @@ static struct poptOption long_options[] = { */ static void usage(FILE *ofp) { - fprintf(ofp, "usage: lttng set-session NAME\n"); + fprintf(ofp, "usage: lttng set-session NAME [OPTIONS]\n"); fprintf(ofp, "\n"); fprintf(ofp, "Options:\n"); fprintf(ofp, " -h, --help Show this help\n"); @@ -54,6 +59,47 @@ static void usage(FILE *ofp) fprintf(ofp, "\n"); } +/* + * Print the necessary mi for a session and name. + */ +static int mi_print(char *session_name) +{ + int ret; + + assert(writer); + assert(session_name); + + /* + * Open a sessions element + * This is purely for validation purpose + */ + ret = mi_lttng_sessions_open(writer); + if (ret) { + goto end; + } + + /* Open a session element */ + ret = mi_lttng_writer_open_element(writer, config_element_session); + if (ret) { + goto end; + } + + /* Session name */ + ret = mi_lttng_writer_write_element_string(writer , config_element_name, + session_name); + if (ret) { + goto end; + } + + /* Close session and sessions element */ + ret = mi_lttng_close_multi_element(writer, 2); + if (ret) { + goto end; + } +end: + return ret; +} + /* * set_session */ @@ -61,6 +107,13 @@ static int set_session(void) { int ret = CMD_SUCCESS; + if (opt_session_name && strlen(opt_session_name) > NAME_MAX) { + ERR("Session name too long. Length must be lower or equal to %d", + NAME_MAX); + ret = CMD_ERROR; + goto error; + } + ret = config_init(opt_session_name); if (ret < 0) { ERR("Unable to set session name"); @@ -69,6 +122,14 @@ static int set_session(void) } MSG("Session set to %s", opt_session_name); + if (lttng_opt_mi) { + ret = mi_print(opt_session_name); + if (ret) { + ret = CMD_ERROR; + goto error; + } + } + ret = CMD_SUCCESS; error: @@ -80,7 +141,7 @@ error: */ int cmd_set_session(int argc, const char **argv) { - int opt, ret = CMD_SUCCESS; + int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1; static poptContext pc; pc = poptGetContext(NULL, argc, argv, long_options, 0); @@ -89,12 +150,10 @@ int cmd_set_session(int argc, const char **argv) while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { case OPT_HELP: - usage(stderr); - ret = CMD_SUCCESS; + usage(stdout); goto end; case OPT_LIST_OPTIONS: list_cmd_options(stdout, long_options); - ret = CMD_SUCCESS; goto end; default: usage(stderr); @@ -107,11 +166,75 @@ int cmd_set_session(int argc, const char **argv) if (opt_session_name == NULL) { ERR("Missing session name"); usage(stderr); + ret = CMD_ERROR; goto end; } - ret = set_session(); + /* Mi check */ + 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_set_session); + 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; + } + } + + command_ret = set_session(); + if (command_ret) { + success = 0; + } + + /* Mi closing */ + if (lttng_opt_mi) { + /* Close output element */ + ret = mi_lttng_writer_close_element(writer); + 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; + } + + /* Overwrite ret if an error occured during set_session() */ + ret = command_ret ? command_ret : ret; + + poptFreeContext(pc); return ret; }