X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdisable_channels.c;h=f1f2e51b9a21c2296189c6813758fe7dfc3aa183;hp=d861b37704a67aa52d01473cc04032eb2b67e96e;hb=8e32b63b5ad14e5a647ee580f618762c439a0d47;hpb=32a6298d8929c91842c9a5c09f1a3f4660c32eec diff --git a/src/bin/lttng/commands/disable_channels.c b/src/bin/lttng/commands/disable_channels.c index d861b3770..f1f2e51b9 100644 --- a/src/bin/lttng/commands/disable_channels.c +++ b/src/bin/lttng/commands/disable_channels.c @@ -15,7 +15,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -23,6 +23,9 @@ #include #include #include +#include + +#include #include "../command.h" @@ -30,11 +33,6 @@ static char *opt_channels; static int opt_kernel; static char *opt_session_name; static int opt_userspace; -#if 0 -/* Not implemented yet */ -static char *opt_cmd_name; -static pid_t opt_pid; -#endif enum { OPT_HELP = 1, @@ -43,19 +41,14 @@ enum { }; static struct lttng_handle *handle; +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}, {"session", 's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0}, {"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0}, -#if 0 - /* Not implemented yet */ - {"userspace", 'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0}, - {"pid", 'p', POPT_ARG_INT, &opt_pid, 0, 0, 0}, -#else {"userspace", 'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0}, -#endif {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL}, {0, 0, 0, 0, 0, 0, 0} }; @@ -65,7 +58,7 @@ static struct poptOption long_options[] = { */ static void usage(FILE *ofp) { - fprintf(ofp, "usage: lttng disable-channel NAME[,NAME2,...] [-k|-u] [OPTIONS]\n"); + fprintf(ofp, "usage: lttng disable-channel NAME[,NAME2,...] (-k | -u) [OPTIONS]\n"); fprintf(ofp, "\n"); fprintf(ofp, "Options:\n"); fprintf(ofp, " -h, --help Show this help\n"); @@ -76,12 +69,57 @@ static void usage(FILE *ofp) fprintf(ofp, "\n"); } +static int mi_partial_channel_print(char *channel_name, unsigned int enabled, + int success) +{ + int ret; + + assert(writer); + assert(channel_name); + + /* Open channel element */ + ret = mi_lttng_writer_open_element(writer, config_element_channel); + if (ret) { + goto end; + } + + /* Name */ + ret = mi_lttng_writer_write_element_string(writer, config_element_name, + channel_name); + if (ret) { + goto end; + } + + /* Enabled ? */ + ret = mi_lttng_writer_write_element_bool(writer, config_element_enabled, + enabled); + if (ret) { + goto end; + } + + /* Success ? */ + ret = mi_lttng_writer_write_element_bool(writer, + mi_lttng_element_success, success); + if (ret) { + goto end; + } + + /* Closing channel element */ + ret = mi_lttng_writer_close_element(writer); + +end: + return ret; +} + /* * Disabling channel using the lttng API. */ static int disable_channels(char *session_name) { - int ret = CMD_SUCCESS, warn = 0; + int ret = CMD_SUCCESS, warn = 0, success; + + /* Normal case for disable channed is enabled = 0 */ + unsigned int enabled = 0; char *channel_name; struct lttng_domain dom; @@ -93,9 +131,8 @@ static int disable_channels(char *session_name) } else if (opt_userspace) { dom.type = LTTNG_DOMAIN_UST; } else { - ERR("Please specify a tracer (-k/--kernel or -u/--userspace)"); - ret = CMD_ERROR; - goto error; + /* Checked by the caller. */ + assert(0); } handle = lttng_create_handle(session_name, &dom); @@ -104,6 +141,17 @@ static int disable_channels(char *session_name) goto error; } + /* Prepare MI */ + if (lttng_opt_mi) { + /* open a channels element */ + ret = mi_lttng_writer_open_element(writer, config_element_channels); + if (ret) { + ret = CMD_ERROR; + goto error; + } + + } + /* Strip channel list */ channel_name = strtok(opt_channels, ","); while (channel_name != NULL) { @@ -114,9 +162,31 @@ static int disable_channels(char *session_name) ERR("Channel %s: %s (session %s)", channel_name, lttng_strerror(ret), session_name); warn = 1; + + /* + * Mi: + * We assume that if an error occurred the channel is still active. + * This might not be the case but is a good assumption. + * The client should look at the stderr stream + * for more informations. + */ + enabled = 1; + success = 0; + } else { MSG("%s channel %s disabled for session %s", - opt_kernel ? "Kernel" : "UST", channel_name, session_name); + get_domain_str(dom.type), channel_name, session_name); + enabled = 0; + success = 1; + } + + /* Print the channel */ + if (lttng_opt_mi) { + ret = mi_partial_channel_print(channel_name, enabled, success); + if (ret) { + ret = CMD_ERROR; + goto error; + } } /* Next channel */ @@ -125,8 +195,19 @@ static int disable_channels(char *session_name) ret = CMD_SUCCESS; + /* Close Mi */ + if (lttng_opt_mi) { + /* Close channels element */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + ret = CMD_ERROR; + goto error; + } + } + error: - if (warn) { + /* Bypass the warning if a more important error happened */ + if (!ret && warn) { ret = CMD_WARNING; } @@ -142,7 +223,7 @@ error: */ int cmd_disable_channels(int argc, const char **argv) { - int opt, ret = CMD_SUCCESS; + int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1; static poptContext pc; char *session_name = NULL; @@ -167,6 +248,12 @@ int cmd_disable_channels(int argc, const char **argv) } } + ret = print_missing_or_multiple_domains(opt_kernel + opt_userspace); + if (ret) { + ret = CMD_ERROR; + goto end; + } + opt_channels = (char*) poptGetArg(pc); if (opt_channels == NULL) { ERR("Missing channel name(s).\n"); @@ -185,12 +272,75 @@ int cmd_disable_channels(int argc, const char **argv) session_name = opt_session_name; } - ret = disable_channels(session_name); + /* 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_disable_channel); + 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 = disable_channels(session_name); + 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_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 && session_name) { free(session_name); } + + /* Overwrite ret if an error occurred in disable_channels */ + ret = command_ret ? command_ret : ret; + poptFreeContext(pc); return ret; }