X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_channels.c;h=039750bcb99dc8c7e95d902e5d26656eb3b8c3ea;hp=02a31800a8766cd04a57ed55765cb5636dae857e;hb=70d0b120691e90d81de7b38af8b845e261b5b40c;hpb=7972aab22f74b18faa168c0482216a3dd711a075 diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c index 02a31800a..039750bcb 100644 --- a/src/bin/lttng/commands/enable_channels.c +++ b/src/bin/lttng/commands/enable_channels.c @@ -28,6 +28,7 @@ #include "../command.h" #include +#include static char *opt_channels; static int opt_kernel; @@ -49,6 +50,8 @@ enum { OPT_READ_TIMER, OPT_USERSPACE, OPT_LIST_OPTIONS, + OPT_TRACEFILE_SIZE, + OPT_TRACEFILE_COUNT, }; static struct lttng_handle *handle; @@ -64,7 +67,7 @@ static struct poptOption long_options[] = { {"userspace", 'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0}, {"discard", 0, POPT_ARG_NONE, 0, OPT_DISCARD, 0, 0}, {"overwrite", 0, POPT_ARG_NONE, 0, OPT_OVERWRITE, 0, 0}, - {"subbuf-size", 0, POPT_ARG_DOUBLE, 0, OPT_SUBBUF_SIZE, 0, 0}, + {"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}, {"read-timer", 0, POPT_ARG_INT, 0, OPT_READ_TIMER, 0, 0}, @@ -73,6 +76,8 @@ static struct poptOption long_options[] = { {"buffers-uid", 0, POPT_ARG_VAL, &opt_buffer_uid, 1, 0, 0}, {"buffers-pid", 0, POPT_ARG_VAL, &opt_buffer_pid, 1, 0, 0}, {"buffers-global", 0, POPT_ARG_VAL, &opt_buffer_global, 1, 0, 0}, + {"tracefile-size", 'C', POPT_ARG_INT, 0, OPT_TRACEFILE_SIZE, 0, 0}, + {"tracefile-count", 'W', POPT_ARG_INT, 0, OPT_TRACEFILE_COUNT, 0, 0}, {0, 0, 0, 0, 0, 0, 0} }; @@ -95,7 +100,7 @@ static void usage(FILE *ofp) 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\n"); + 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()); @@ -108,13 +113,18 @@ static void usage(FILE *ofp) 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 (default: %u)\n", - DEFAULT_CHANNEL_READ_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, " --output TYPE Channel output type (Values: %s, %s)\n", 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, " -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, "\n"); } @@ -147,6 +157,12 @@ static void set_default_attr(struct lttng_domain *dom) if (chan.attr.output == -1) { chan.attr.output = default_attr.output; } + if (chan.attr.tracefile_count == -1) { + chan.attr.tracefile_count = default_attr.tracefile_count; + } + if (chan.attr.tracefile_size == -1) { + chan.attr.tracefile_size = default_attr.tracefile_size; + } } /* @@ -164,11 +180,21 @@ static int enable_channel(char *session_name) if (opt_kernel) { dom.type = LTTNG_DOMAIN_KERNEL; dom.buf_type = LTTNG_BUFFER_GLOBAL; + if (opt_buffer_uid || opt_buffer_pid) { + ERR("Buffer type not supported for domain -k"); + ret = CMD_ERROR; + goto error; + } } else if (opt_userspace) { dom.type = LTTNG_DOMAIN_UST; if (opt_buffer_uid) { dom.buf_type = LTTNG_BUFFER_PER_UID; } 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; } } else { @@ -179,6 +205,15 @@ static int enable_channel(char *session_name) set_default_attr(&dom); + 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 ")", + chan.attr.tracefile_size, chan.attr.subbuf_size); + ret = CMD_ERROR; + goto error; + } + /* Setting channel output */ if (opt_output) { if (!strncmp(output_mmap, opt_output, strlen(output_mmap))) { @@ -214,7 +249,7 @@ static int enable_channel(char *session_name) switch (-ret) { case LTTNG_ERR_KERN_CHAN_EXIST: case LTTNG_ERR_UST_CHAN_EXIST: - WARN("Channel %s: %s (session %s", channel_name, + WARN("Channel %s: %s (session %s)", channel_name, lttng_strerror(ret), session_name); goto error; default: @@ -265,6 +300,7 @@ int cmd_enable_channels(int argc, const char **argv) int opt, ret = CMD_SUCCESS; static poptContext pc; char *session_name = NULL; + char *opt_arg = NULL; init_channel_config(); @@ -285,8 +321,22 @@ int cmd_enable_channels(int argc, const char **argv) DBG("Channel set to overwrite"); break; case OPT_SUBBUF_SIZE: - /* TODO Replace atol with strtol and check for errors */ - chan.attr.subbuf_size = atol(poptGetOptArg(pc)); + /* 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); + 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); + ret = CMD_ERROR; + goto end; + } + DBG("Channel subbuf size set to %" PRIu64, chan.attr.subbuf_size); break; case OPT_NUM_SUBBUF: @@ -307,6 +357,16 @@ int cmd_enable_channels(int argc, const char **argv) case OPT_USERSPACE: opt_userspace = 1; break; + case OPT_TRACEFILE_SIZE: + chan.attr.tracefile_size = atoll(poptGetOptArg(pc)); + DBG("Maximum tracefile size set to %" PRIu64, + chan.attr.tracefile_size); + break; + case OPT_TRACEFILE_COUNT: + chan.attr.tracefile_count = atoll(poptGetOptArg(pc)); + DBG("Maximum tracefile count set to %" PRIu64, + chan.attr.tracefile_count); + break; case OPT_LIST_OPTIONS: list_cmd_options(stdout, long_options); goto end;