X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_channels.c;h=1fdaada99f625a9418683b3e24ecd763a5437da1;hp=52917cdad56e6289e0b99608dacd549b3441386b;hb=c7e35b037773dbbfe10178c946ba44feefb226e1;hpb=16068db5dda7041571a5520dc69c96af43b799a2 diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c index 52917cdad..1fdaada99 100644 --- a/src/bin/lttng/commands/enable_channels.c +++ b/src/bin/lttng/commands/enable_channels.c @@ -24,8 +24,11 @@ #include #include #include +#include +#include #include "../command.h" +#include "../utils.h" #include #include @@ -86,7 +89,7 @@ static struct poptOption long_options[] = { */ static void usage(FILE *ofp) { - fprintf(ofp, "usage: lttng enable-channel NAME[,NAME2,...] [-u|-k] [OPTIONS]\n"); + 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"); @@ -101,30 +104,44 @@ static void usage(FILE *ofp) 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: %zu, kernel default: %zu)\n", - default_get_channel_subbuf_size(), - default_get_kernel_channel_subbuf_size()); - fprintf(ofp, " Needs to be a power of 2 for\n"); - fprintf(ofp, " kernel and ust tracers\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: %u)\n", - DEFAULT_CHANNEL_SUBBUF_NUM); - fprintf(ofp, " Needs to be a power of 2 for\n"); - fprintf(ofp, " kernel and ust tracers\n"); - fprintf(ofp, " --switch-timer USEC Switch timer interval in usec (default: %u)\n", - DEFAULT_CHANNEL_SWITCH_TIMER); - fprintf(ofp, " --read-timer USEC Read timer interval in usec (UST default: %u, kernel default: %u)\n", - DEFAULT_UST_CHANNEL_READ_TIMER, DEFAULT_KERNEL_CHANNEL_READ_TIMER); + 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).\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.\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"); } @@ -154,7 +171,7 @@ static void set_default_attr(struct lttng_domain *dom) if (chan.attr.read_timer_interval == -1) { chan.attr.read_timer_interval = default_attr.read_timer_interval; } - if (chan.attr.output == -1) { + if ((int) chan.attr.output == -1) { chan.attr.output = default_attr.output; } if (chan.attr.tracefile_count == -1) { @@ -187,31 +204,36 @@ static int enable_channel(char *session_name) } } else if (opt_userspace) { dom.type = LTTNG_DOMAIN_UST; - if (opt_buffer_uid) { - dom.buf_type = LTTNG_BUFFER_PER_UID; + if (opt_buffer_pid) { + dom.buf_type = LTTNG_BUFFER_PER_PID; } else { if (opt_buffer_global) { ERR("Buffer type not supported for domain -u"); ret = CMD_ERROR; goto error; } - dom.buf_type = LTTNG_BUFFER_PER_PID; + dom.buf_type = LTTNG_BUFFER_PER_UID; } } else { - ERR("Please specify a tracer (-k/--kernel or -u/--userspace)"); + print_missing_domain(); ret = CMD_ERROR; goto error; } set_default_attr(&dom); + if (chan.attr.tracefile_size == 0 && chan.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)) { - ERR("Tracefile_size must be greater than or equal to subbuf_size " - "(%" PRIu64 " < %" PRIu64 ")", + WARN("Tracefile size rounded up from (%" PRIu64 ") to subbuffer size (%" PRIu64 ")", chan.attr.tracefile_size, chan.attr.subbuf_size); - ret = CMD_ERROR; - goto error; + chan.attr.tracefile_size = chan.attr.subbuf_size; } /* Setting channel output */ @@ -249,6 +271,7 @@ static int enable_channel(char *session_name) 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; @@ -260,8 +283,7 @@ static int enable_channel(char *session_name) warn = 1; } else { MSG("%s channel %s enabled for session %s", - opt_kernel ? "Kernel" : "UST", channel_name, - session_name); + get_domain_str(dom.type), channel_name, session_name); } /* Next event */ @@ -307,6 +329,13 @@ 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: @@ -321,43 +350,85 @@ int cmd_enable_channels(int argc, const char **argv) DBG("Channel set to overwrite"); break; case OPT_SUBBUF_SIZE: + { + uint64_t rounded_size; + int order; + /* Parse the size */ opt_arg = poptGetOptArg(pc); - if (utils_parse_size_suffix(opt_arg, &chan.attr.subbuf_size) < 0) { - ERR("Wrong value the --subbuf-size parameter: %s", opt_arg); + if (utils_parse_size_suffix(opt_arg, &chan.attr.subbuf_size) < 0 || !chan.attr.subbuf_size) { + ERR("Wrong value in --subbuf-size parameter: %s", opt_arg); ret = CMD_ERROR; goto end; } - /* Check if power of 2 */ - if ((chan.attr.subbuf_size - 1) & chan.attr.subbuf_size) { - ERR("The subbuf size is not a power of 2: %" PRIu64 " (%s)", - chan.attr.subbuf_size, opt_arg); + order = get_count_order_u64(chan.attr.subbuf_size); + assert(order >= 0); + rounded_size = 1ULL << order; + if (rounded_size < chan.attr.subbuf_size) { + ERR("The subbuf size (%" PRIu64 ") is rounded and overflows!", + chan.attr.subbuf_size); ret = CMD_ERROR; goto end; } + if (rounded_size != chan.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; + } + + /* Should now be power of 2 */ + assert(!((chan.attr.subbuf_size - 1) & chan.attr.subbuf_size)); + DBG("Channel subbuf size set to %" PRIu64, chan.attr.subbuf_size); break; + } case OPT_NUM_SUBBUF: + { + uint64_t rounded_size; + int order; + errno = 0; - chan.attr.num_subbuf = strtoull(poptGetOptArg(pc), NULL, 0); - if (errno != 0) { - ERR("Wrong value the --num-subbuf parameter: %s", opt_arg); + opt_arg = poptGetOptArg(pc); + chan.attr.num_subbuf = strtoull(opt_arg, NULL, 0); + if (errno != 0 || !chan.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); + assert(order >= 0); + rounded_size = 1ULL << order; + if (rounded_size < chan.attr.num_subbuf) { + ERR("The number of subbuffers (%" PRIu64 ") is rounded and overflows!", + chan.attr.num_subbuf); ret = CMD_ERROR; goto end; } + if (rounded_size != chan.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; + } + + /* Should now be power of 2 */ + assert(!((chan.attr.num_subbuf - 1) & chan.attr.num_subbuf)); + DBG("Channel subbuf num set to %" PRIu64, chan.attr.num_subbuf); break; + } case OPT_SWITCH_TIMER: { unsigned long v; errno = 0; - v = strtoul(poptGetOptArg(pc), NULL, 0); - if (errno != 0) { - ERR("Wrong value the --switch-timer parameter: %s", opt_arg); + opt_arg = poptGetOptArg(pc); + v = strtoul(opt_arg, NULL, 0); + if (errno != 0 || !isdigit(opt_arg[0])) { + ERR("Wrong value in --switch-timer parameter: %s", opt_arg); ret = CMD_ERROR; goto end; } @@ -375,9 +446,10 @@ int cmd_enable_channels(int argc, const char **argv) unsigned long v; errno = 0; - v = strtoul(poptGetOptArg(pc), NULL, 0); - if (errno != 0) { - ERR("Wrong value the --read-timer parameter: %s", opt_arg); + opt_arg = poptGetOptArg(pc); + v = strtoul(opt_arg, NULL, 0); + if (errno != 0 || !isdigit(opt_arg[0])) { + ERR("Wrong value in --read-timer parameter: %s", opt_arg); ret = CMD_ERROR; goto end; } @@ -394,8 +466,9 @@ int cmd_enable_channels(int argc, const char **argv) opt_userspace = 1; break; case OPT_TRACEFILE_SIZE: + opt_arg = poptGetOptArg(pc); if (utils_parse_size_suffix(opt_arg, &chan.attr.tracefile_size) < 0) { - ERR("Wrong value the --tracefile-size parameter: %s", opt_arg); + ERR("Wrong value in --tracefile-size parameter: %s", opt_arg); ret = CMD_ERROR; goto end; } @@ -407,9 +480,10 @@ int cmd_enable_channels(int argc, const char **argv) unsigned long v; errno = 0; - v = strtoul(poptGetOptArg(pc), NULL, 0); - if (errno != 0) { - ERR("Wrong value the --tracefile-count parameter: %s", opt_arg); + opt_arg = poptGetOptArg(pc); + v = strtoul(opt_arg, NULL, 0); + if (errno != 0 || !isdigit(opt_arg[0])) { + ERR("Wrong value in --tracefile-count parameter: %s", opt_arg); ret = CMD_ERROR; goto end; }