X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_channels.c;h=22331cec2b2ead8d032ede422df7f581df4f7c38;hp=1fdaada99f625a9418683b3e24ecd763a5437da1;hb=c1e4642cd27bd5b70c0eca1011d9e452bd24f018;hpb=c7e35b037773dbbfe10178c946ba44feefb226e1 diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c index 1fdaada99..22331cec2 100644 --- a/src/bin/lttng/commands/enable_channels.c +++ b/src/bin/lttng/commands/enable_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 @@ -27,21 +27,35 @@ #include #include +#include +#include +#include + #include "../command.h" #include "../utils.h" -#include -#include +static struct lttng_channel chan_opts; static char *opt_channels; static int opt_kernel; static char *opt_session_name; static int opt_userspace; -static struct lttng_channel chan; static char *opt_output; static int opt_buffer_uid; static int opt_buffer_pid; static int opt_buffer_global; +static struct { + bool set; + uint32_t interval; +} opt_monitor_timer; + +static struct mi_writer *writer; + +#ifdef LTTNG_EMBED_HELP +static const char help_msg[] = +#include +; +#endif enum { OPT_HELP = 1, @@ -50,6 +64,7 @@ enum { OPT_SUBBUF_SIZE, OPT_NUM_SUBBUF, OPT_SWITCH_TIMER, + OPT_MONITOR_TIMER, OPT_READ_TIMER, OPT_USERSPACE, OPT_LIST_OPTIONS, @@ -73,6 +88,7 @@ static struct poptOption long_options[] = { {"subbuf-size", 0, POPT_ARG_STRING, 0, OPT_SUBBUF_SIZE, 0, 0}, {"num-subbuf", 0, POPT_ARG_INT, 0, OPT_NUM_SUBBUF, 0, 0}, {"switch-timer", 0, POPT_ARG_INT, 0, OPT_SWITCH_TIMER, 0, 0}, + {"monitor-timer", 0, POPT_ARG_INT, 0, OPT_MONITOR_TIMER, 0, 0}, {"read-timer", 0, POPT_ARG_INT, 0, OPT_READ_TIMER, 0, 0}, {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL}, {"output", 0, POPT_ARG_STRING, &opt_output, 0, 0, 0}, @@ -84,67 +100,6 @@ static struct poptOption long_options[] = { {0, 0, 0, 0, 0, 0, 0} }; -/* - * usage - */ -static void usage(FILE *ofp) -{ - fprintf(ofp, "usage: lttng enable-channel NAME[,NAME2,...] (-u | -k) [OPTIONS]\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, " -s, --session NAME Apply to session name\n"); - fprintf(ofp, " -k, --kernel Apply to the kernel tracer\n"); - fprintf(ofp, " -u, --userspace Apply to the user-space tracer\n"); - fprintf(ofp, "\n"); - fprintf(ofp, "Channel options:\n"); - fprintf(ofp, " --discard Discard event when buffers are full%s\n", - DEFAULT_CHANNEL_OVERWRITE ? "" : " (default)"); - fprintf(ofp, " --overwrite Flight recorder mode%s\n", - DEFAULT_CHANNEL_OVERWRITE ? " (default)" : ""); - fprintf(ofp, " --subbuf-size SIZE Subbuffer size in bytes {+k,+M,+G}\n"); - fprintf(ofp, " (default UST uid: %zu, UST pid: %zu, kernel: %zu, metadata: %zu)\n", - default_get_ust_uid_channel_subbuf_size(), - default_get_ust_pid_channel_subbuf_size(), - default_get_kernel_channel_subbuf_size(), - default_get_metadata_subbuf_size()); - fprintf(ofp, " Rounded up to the next power of 2.\n"); - fprintf(ofp, " --num-subbuf NUM Number of subbufers\n"); - fprintf(ofp, " (default UST uid: %u, UST pid: %u, kernel: %u, metadata: %u)\n", - DEFAULT_UST_UID_CHANNEL_SUBBUF_NUM, DEFAULT_UST_PID_CHANNEL_SUBBUF_NUM, - DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM, DEFAULT_METADATA_SUBBUF_NUM); - fprintf(ofp, " Rounded up to the next power of 2.\n"); - fprintf(ofp, " --switch-timer USEC Switch timer interval in usec\n"); - fprintf(ofp, " (default UST uid: %u, UST pid: %u, kernel: %u, metadata: %u)\n", - DEFAULT_UST_UID_CHANNEL_SWITCH_TIMER, DEFAULT_UST_PID_CHANNEL_SWITCH_TIMER, - DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER, DEFAULT_METADATA_SWITCH_TIMER); - fprintf(ofp, " --read-timer USEC Read timer interval in usec.\n"); - fprintf(ofp, " (default UST uid: %u, UST pid: %u, kernel: %u, metadata: %u)\n", - DEFAULT_UST_UID_CHANNEL_READ_TIMER, DEFAULT_UST_UID_CHANNEL_READ_TIMER, - DEFAULT_KERNEL_CHANNEL_READ_TIMER, DEFAULT_METADATA_READ_TIMER); - fprintf(ofp, " --output TYPE Channel output type (Values: %s, %s)\n", - output_mmap, output_splice); - fprintf(ofp, " (default UST uid: %s, UST pid: %s, kernel: %s, metadata: %s)\n", - DEFAULT_UST_UID_CHANNEL_OUTPUT == LTTNG_EVENT_MMAP ? output_mmap : output_splice, - DEFAULT_UST_PID_CHANNEL_OUTPUT == LTTNG_EVENT_MMAP ? output_mmap : output_splice, - DEFAULT_KERNEL_CHANNEL_OUTPUT == LTTNG_EVENT_MMAP ? output_mmap : output_splice, - DEFAULT_METADATA_OUTPUT == LTTNG_EVENT_MMAP ? output_mmap : output_splice); - fprintf(ofp, " --buffers-uid Use per UID buffer (-u only)\n"); - fprintf(ofp, " --buffers-pid Use per PID buffer (-u only)\n"); - fprintf(ofp, " --buffers-global Use shared buffer for the whole system (-k only)\n"); - fprintf(ofp, " -C, --tracefile-size SIZE\n"); - fprintf(ofp, " Maximum size of each tracefile within a stream (in bytes). 0 means unlimited.\n"); - fprintf(ofp, " (default: %u)\n", DEFAULT_CHANNEL_TRACEFILE_SIZE); - fprintf(ofp, " Note: traces generated with this option may inaccurately report\n"); - fprintf(ofp, " discarded events as per CTF 1.8.\n"); - fprintf(ofp, " -W, --tracefile-count COUNT\n"); - fprintf(ofp, " Used in conjunction with -C option, this will limit the number\n"); - fprintf(ofp, " of files created to the specified count. 0 means unlimited.\n"); - fprintf(ofp, " (default: %u)\n", DEFAULT_CHANNEL_TRACEFILE_COUNT); - fprintf(ofp, "\n"); -} - /* * Set default attributes depending on those already defined from the command * line. @@ -153,32 +108,34 @@ static void set_default_attr(struct lttng_domain *dom) { struct lttng_channel_attr default_attr; + memset(&default_attr, 0, sizeof(default_attr)); + /* Set attributes */ lttng_channel_set_default_attr(dom, &default_attr); - if (chan.attr.overwrite == -1) { - chan.attr.overwrite = default_attr.overwrite; + if (chan_opts.attr.overwrite == -1) { + chan_opts.attr.overwrite = default_attr.overwrite; } - if (chan.attr.subbuf_size == -1) { - chan.attr.subbuf_size = default_attr.subbuf_size; + if (chan_opts.attr.subbuf_size == -1) { + chan_opts.attr.subbuf_size = default_attr.subbuf_size; } - if (chan.attr.num_subbuf == -1) { - chan.attr.num_subbuf = default_attr.num_subbuf; + if (chan_opts.attr.num_subbuf == -1) { + chan_opts.attr.num_subbuf = default_attr.num_subbuf; } - if (chan.attr.switch_timer_interval == -1) { - chan.attr.switch_timer_interval = default_attr.switch_timer_interval; + if (chan_opts.attr.switch_timer_interval == -1) { + chan_opts.attr.switch_timer_interval = default_attr.switch_timer_interval; } - if (chan.attr.read_timer_interval == -1) { - chan.attr.read_timer_interval = default_attr.read_timer_interval; + if (chan_opts.attr.read_timer_interval == -1) { + chan_opts.attr.read_timer_interval = default_attr.read_timer_interval; } - if ((int) chan.attr.output == -1) { - chan.attr.output = default_attr.output; + if ((int) chan_opts.attr.output == -1) { + chan_opts.attr.output = default_attr.output; } - if (chan.attr.tracefile_count == -1) { - chan.attr.tracefile_count = default_attr.tracefile_count; + if (chan_opts.attr.tracefile_count == -1) { + chan_opts.attr.tracefile_count = default_attr.tracefile_count; } - if (chan.attr.tracefile_size == -1) { - chan.attr.tracefile_size = default_attr.tracefile_size; + if (chan_opts.attr.tracefile_size == -1) { + chan_opts.attr.tracefile_size = default_attr.tracefile_size; } } @@ -187,7 +144,8 @@ static void set_default_attr(struct lttng_domain *dom) */ static int enable_channel(char *session_name) { - int ret = CMD_SUCCESS, warn = 0; + struct lttng_channel *channel = NULL; + int ret = CMD_SUCCESS, warn = 0, error = 0, success = 0; char *channel_name; struct lttng_domain dom; @@ -215,37 +173,35 @@ static int enable_channel(char *session_name) dom.buf_type = LTTNG_BUFFER_PER_UID; } } else { - print_missing_domain(); - ret = CMD_ERROR; - goto error; + /* Checked by the caller. */ + assert(0); } set_default_attr(&dom); - if (chan.attr.tracefile_size == 0 && chan.attr.tracefile_count) { + if (chan_opts.attr.tracefile_size == 0 && chan_opts.attr.tracefile_count) { ERR("Missing option --tracefile-size. " "A file count without a size won't do anything."); ret = CMD_ERROR; goto error; } - if ((chan.attr.tracefile_size > 0) && - (chan.attr.tracefile_size < chan.attr.subbuf_size)) { + if ((chan_opts.attr.tracefile_size > 0) && + (chan_opts.attr.tracefile_size < chan_opts.attr.subbuf_size)) { WARN("Tracefile size rounded up from (%" PRIu64 ") to subbuffer size (%" PRIu64 ")", - chan.attr.tracefile_size, chan.attr.subbuf_size); - chan.attr.tracefile_size = chan.attr.subbuf_size; + chan_opts.attr.tracefile_size, chan_opts.attr.subbuf_size); + chan_opts.attr.tracefile_size = chan_opts.attr.subbuf_size; } /* Setting channel output */ if (opt_output) { if (!strncmp(output_mmap, opt_output, strlen(output_mmap))) { - chan.attr.output = LTTNG_EVENT_MMAP; + chan_opts.attr.output = LTTNG_EVENT_MMAP; } else if (!strncmp(output_splice, opt_output, strlen(output_splice))) { - chan.attr.output = LTTNG_EVENT_SPLICE; + chan_opts.attr.output = LTTNG_EVENT_SPLICE; } else { ERR("Unknown output type %s. Possible values are: %s, %s\n", opt_output, output_mmap, output_splice); - usage(stderr); ret = CMD_ERROR; goto error; } @@ -257,45 +213,141 @@ static int enable_channel(char *session_name) goto error; } + /* Mi open channels element */ + if (lttng_opt_mi) { + assert(writer); + ret = mi_lttng_channels_open(writer); + if (ret) { + ret = CMD_ERROR; + goto error; + } + } + /* Strip channel list (format: chan1,chan2,...) */ channel_name = strtok(opt_channels, ","); while (channel_name != NULL) { - /* Copy channel name and normalize it */ - strncpy(chan.name, channel_name, NAME_MAX); - chan.name[NAME_MAX - 1] = '\0'; + void *extended_ptr; + + /* Validate channel name's length */ + if (strlen(channel_name) >= NAME_MAX) { + ERR("Channel name is too long (max. %zu characters)", + sizeof(chan_opts.name) - 1); + error = 1; + goto skip_enable; + } + + /* + * A dynamically-allocated channel is used in order to allow + * the configuration of extended attributes (post-2.9). + */ + channel = lttng_channel_create(&dom); + if (!channel) { + ERR("Unable to create channel object"); + error = 1; + goto error; + } + + /* Copy channel name */ + strcpy(channel->name, channel_name); + channel->enabled = 1; + extended_ptr = channel->attr.extended.ptr; + memcpy(&channel->attr, &chan_opts.attr, sizeof(chan_opts.attr)); + channel->attr.extended.ptr = extended_ptr; + if (opt_monitor_timer.set) { + ret = lttng_channel_set_monitor_timer_interval(channel, + opt_monitor_timer.interval); + if (ret) { + ERR("Failed to set the channel's monitor timer interval"); + error = 1; + goto error; + } + } DBG("Enabling channel %s", channel_name); - ret = lttng_enable_channel(handle, &chan); + ret = lttng_enable_channel(handle, channel); if (ret < 0) { + success = 0; switch (-ret) { case LTTNG_ERR_KERN_CHAN_EXIST: case LTTNG_ERR_UST_CHAN_EXIST: case LTTNG_ERR_CHAN_EXIST: WARN("Channel %s: %s (session %s)", channel_name, lttng_strerror(ret), session_name); - goto error; + warn = 1; + break; + case LTTNG_ERR_INVALID_CHANNEL_NAME: + ERR("Invalid channel name: \"%s\". " + "Channel names may not start with '.', and " + "may not contain '/'.", channel_name); + error = 1; + break; default: ERR("Channel %s: %s (session %s)", channel_name, lttng_strerror(ret), session_name); + error = 1; break; } - warn = 1; } else { MSG("%s channel %s enabled for session %s", get_domain_str(dom.type), channel_name, session_name); + success = 1; + } + +skip_enable: + if (lttng_opt_mi) { + /* Mi print the channel element and leave it open */ + ret = mi_lttng_channel(writer, channel, 1); + if (ret) { + ret = CMD_ERROR; + goto error; + } + + /* Individual Success ? */ + ret = mi_lttng_writer_write_element_bool(writer, + mi_lttng_element_command_success, success); + if (ret) { + ret = CMD_ERROR; + goto error; + } + + /* Close channel element */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + ret = CMD_ERROR; + goto error; + } } - /* Next event */ + /* Next channel */ channel_name = strtok(NULL, ","); + lttng_channel_destroy(channel); + channel = NULL; + } + + if (lttng_opt_mi) { + /* Close channels element */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + ret = CMD_ERROR; + goto error; + } } ret = CMD_SUCCESS; error: - if (warn) { + if (channel) { + lttng_channel_destroy(channel); + } + /* If more important error happen bypass the warning */ + if (!ret && warn) { ret = CMD_WARNING; } + /* If more important error happen bypass the warning */ + if (!ret && error) { + ret = CMD_ERROR; + } lttng_destroy_handle(handle); @@ -311,7 +363,8 @@ static void init_channel_config(void) * Put -1 everywhere so we can identify those set by the command line and * those needed to be set by the default values. */ - memset(&chan.attr, -1, sizeof(chan.attr)); + memset(&chan_opts.attr, -1, sizeof(chan_opts.attr)); + chan_opts.attr.extended.ptr = NULL; } /* @@ -319,7 +372,7 @@ static void init_channel_config(void) */ int cmd_enable_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; char *opt_arg = NULL; @@ -329,24 +382,17 @@ int cmd_enable_channels(int argc, const char **argv) pc = poptGetContext(NULL, argc, argv, long_options, 0); poptReadDefaultConfig(pc, 0); - /* TODO: mi support */ - if (lttng_opt_mi) { - ret = -LTTNG_ERR_MI_NOT_IMPLEMENTED; - ERR("mi option not supported"); - goto end; - } - while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { case OPT_HELP: - usage(stdout); + SHOW_HELP(); goto end; case OPT_DISCARD: - chan.attr.overwrite = 0; + chan_opts.attr.overwrite = 0; DBG("Channel set to discard"); break; case OPT_OVERWRITE: - chan.attr.overwrite = 1; + chan_opts.attr.overwrite = 1; DBG("Channel set to overwrite"); break; case OPT_SUBBUF_SIZE: @@ -356,32 +402,32 @@ int cmd_enable_channels(int argc, const char **argv) /* Parse the size */ opt_arg = poptGetOptArg(pc); - if (utils_parse_size_suffix(opt_arg, &chan.attr.subbuf_size) < 0 || !chan.attr.subbuf_size) { + if (utils_parse_size_suffix(opt_arg, &chan_opts.attr.subbuf_size) < 0 || !chan_opts.attr.subbuf_size) { ERR("Wrong value in --subbuf-size parameter: %s", opt_arg); ret = CMD_ERROR; goto end; } - order = get_count_order_u64(chan.attr.subbuf_size); + order = get_count_order_u64(chan_opts.attr.subbuf_size); assert(order >= 0); rounded_size = 1ULL << order; - if (rounded_size < chan.attr.subbuf_size) { + if (rounded_size < chan_opts.attr.subbuf_size) { ERR("The subbuf size (%" PRIu64 ") is rounded and overflows!", - chan.attr.subbuf_size); + chan_opts.attr.subbuf_size); ret = CMD_ERROR; goto end; } - if (rounded_size != chan.attr.subbuf_size) { + if (rounded_size != chan_opts.attr.subbuf_size) { WARN("The subbuf size (%" PRIu64 ") is rounded to the next power of 2 (%" PRIu64 ")", - chan.attr.subbuf_size, rounded_size); - chan.attr.subbuf_size = rounded_size; + chan_opts.attr.subbuf_size, rounded_size); + chan_opts.attr.subbuf_size = rounded_size; } /* Should now be power of 2 */ - assert(!((chan.attr.subbuf_size - 1) & chan.attr.subbuf_size)); + assert(!((chan_opts.attr.subbuf_size - 1) & chan_opts.attr.subbuf_size)); - DBG("Channel subbuf size set to %" PRIu64, chan.attr.subbuf_size); + DBG("Channel subbuf size set to %" PRIu64, chan_opts.attr.subbuf_size); break; } case OPT_NUM_SUBBUF: @@ -391,33 +437,33 @@ int cmd_enable_channels(int argc, const char **argv) errno = 0; opt_arg = poptGetOptArg(pc); - chan.attr.num_subbuf = strtoull(opt_arg, NULL, 0); - if (errno != 0 || !chan.attr.num_subbuf || !isdigit(opt_arg[0])) { + chan_opts.attr.num_subbuf = strtoull(opt_arg, NULL, 0); + if (errno != 0 || !chan_opts.attr.num_subbuf || !isdigit(opt_arg[0])) { ERR("Wrong value in --num-subbuf parameter: %s", opt_arg); ret = CMD_ERROR; goto end; } - order = get_count_order_u64(chan.attr.num_subbuf); + order = get_count_order_u64(chan_opts.attr.num_subbuf); assert(order >= 0); rounded_size = 1ULL << order; - if (rounded_size < chan.attr.num_subbuf) { + if (rounded_size < chan_opts.attr.num_subbuf) { ERR("The number of subbuffers (%" PRIu64 ") is rounded and overflows!", - chan.attr.num_subbuf); + chan_opts.attr.num_subbuf); ret = CMD_ERROR; goto end; } - if (rounded_size != chan.attr.num_subbuf) { + if (rounded_size != chan_opts.attr.num_subbuf) { WARN("The number of subbuffers (%" PRIu64 ") is rounded to the next power of 2 (%" PRIu64 ")", - chan.attr.num_subbuf, rounded_size); - chan.attr.num_subbuf = rounded_size; + chan_opts.attr.num_subbuf, rounded_size); + chan_opts.attr.num_subbuf = rounded_size; } /* Should now be power of 2 */ - assert(!((chan.attr.num_subbuf - 1) & chan.attr.num_subbuf)); + assert(!((chan_opts.attr.num_subbuf - 1) & chan_opts.attr.num_subbuf)); - DBG("Channel subbuf num set to %" PRIu64, chan.attr.num_subbuf); + DBG("Channel subbuf num set to %" PRIu64, chan_opts.attr.num_subbuf); break; } case OPT_SWITCH_TIMER: @@ -437,8 +483,8 @@ int cmd_enable_channels(int argc, const char **argv) ret = CMD_ERROR; goto end; } - chan.attr.switch_timer_interval = (uint32_t) v; - DBG("Channel switch timer interval set to %d", chan.attr.switch_timer_interval); + chan_opts.attr.switch_timer_interval = (uint32_t) v; + DBG("Channel switch timer interval set to %d", chan_opts.attr.switch_timer_interval); break; } case OPT_READ_TIMER: @@ -458,8 +504,30 @@ int cmd_enable_channels(int argc, const char **argv) ret = CMD_ERROR; goto end; } - chan.attr.read_timer_interval = (uint32_t) v; - DBG("Channel read timer interval set to %d", chan.attr.read_timer_interval); + chan_opts.attr.read_timer_interval = (uint32_t) v; + DBG("Channel read timer interval set to %d", chan_opts.attr.read_timer_interval); + break; + } + case OPT_MONITOR_TIMER: + { + unsigned long v; + + errno = 0; + opt_arg = poptGetOptArg(pc); + v = strtoul(opt_arg, NULL, 0); + if (errno != 0 || !isdigit(opt_arg[0])) { + ERR("Wrong value in --monitor-timer parameter: %s", opt_arg); + ret = CMD_ERROR; + goto end; + } + if (v != (uint32_t) v) { + ERR("32-bit overflow in --monitor-timer parameter: %s", opt_arg); + ret = CMD_ERROR; + goto end; + } + opt_monitor_timer.interval = (uint32_t) v; + opt_monitor_timer.set = true; + DBG("Channel monitor timer interval set to %d", opt_monitor_timer.interval); break; } case OPT_USERSPACE: @@ -467,13 +535,13 @@ int cmd_enable_channels(int argc, const char **argv) break; case OPT_TRACEFILE_SIZE: opt_arg = poptGetOptArg(pc); - if (utils_parse_size_suffix(opt_arg, &chan.attr.tracefile_size) < 0) { + if (utils_parse_size_suffix(opt_arg, &chan_opts.attr.tracefile_size) < 0) { ERR("Wrong value in --tracefile-size parameter: %s", opt_arg); ret = CMD_ERROR; goto end; } DBG("Maximum tracefile size set to %" PRIu64, - chan.attr.tracefile_size); + chan_opts.attr.tracefile_size); break; case OPT_TRACEFILE_COUNT: { @@ -492,45 +560,111 @@ int cmd_enable_channels(int argc, const char **argv) ret = CMD_ERROR; goto end; } - chan.attr.tracefile_count = (uint32_t) v; + chan_opts.attr.tracefile_count = (uint32_t) v; DBG("Maximum tracefile count set to %" PRIu64, - chan.attr.tracefile_count); + chan_opts.attr.tracefile_count); break; } case OPT_LIST_OPTIONS: list_cmd_options(stdout, long_options); goto end; default: - usage(stderr); ret = CMD_UNDEFINED; goto end; } } + ret = print_missing_or_multiple_domains(opt_kernel + opt_userspace); + if (ret) { + ret = CMD_ERROR; + goto end; + } + + /* 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_enable_channels); + 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; + } + } + opt_channels = (char*) poptGetArg(pc); if (opt_channels == NULL) { ERR("Missing channel name.\n"); - usage(stderr); ret = CMD_ERROR; - goto end; + success = 0; + goto mi_closing; } if (!opt_session_name) { session_name = get_session_name(); if (session_name == NULL) { - ret = CMD_ERROR; - goto end; + command_ret = CMD_ERROR; + success = 0; + goto mi_closing; } } else { session_name = opt_session_name; } - ret = enable_channel(session_name); + command_ret = enable_channel(session_name); + if (command_ret) { + success = 0; + } + +mi_closing: + /* Mi closing */ + if (lttng_opt_mi) { + /* Close output element */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + goto end; + } + + /* Success ? */ + ret = mi_lttng_writer_write_element_bool(writer, + mi_lttng_element_command_success, success); + if (ret) { + goto end; + } + + /* Command element close */ + ret = mi_lttng_writer_command_close(writer); + if (ret) { + 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 when enable_channel */ + ret = command_ret ? command_ret : ret; poptFreeContext(pc); return ret; }