X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_channels.c;h=02a31800a8766cd04a57ed55765cb5636dae857e;hb=60e835ca1712647f501c14bb6b3d20a1c13a110c;hp=9b5f8d64d302b276f3faee598c30e43dfcde28a2;hpb=0cd3b1d4a59305a7efb608605d2e74c0ea347383;p=lttng-tools.git diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c index 9b5f8d64d..02a31800a 100644 --- a/src/bin/lttng/commands/enable_channels.c +++ b/src/bin/lttng/commands/enable_channels.c @@ -34,11 +34,10 @@ static int opt_kernel; static char *opt_session_name; static int opt_userspace; static struct lttng_channel chan; -#if 0 -/* Not implemented yet */ -static char *opt_cmd_name; -static pid_t opt_pid; -#endif +static char *opt_output; +static int opt_buffer_uid; +static int opt_buffer_pid; +static int opt_buffer_global; enum { OPT_HELP = 1, @@ -54,18 +53,15 @@ enum { static struct lttng_handle *handle; +const char *output_mmap = "mmap"; +const char *output_splice = "splice"; + 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 {"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}, @@ -73,6 +69,10 @@ static struct poptOption long_options[] = { {"switch-timer", 0, POPT_ARG_INT, 0, OPT_SWITCH_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}, + {"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}, {0, 0, 0, 0, 0, 0, 0} }; @@ -81,20 +81,14 @@ static struct poptOption long_options[] = { */ static void usage(FILE *ofp) { - fprintf(ofp, "usage: lttng enable-channel NAME[,NAME2,...] [options] [channel_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"); fprintf(ofp, " --list-options Simple listing of options\n"); - fprintf(ofp, " -s, --session Apply to session name\n"); + fprintf(ofp, " -s, --session NAME Apply to session name\n"); fprintf(ofp, " -k, --kernel Apply to the kernel tracer\n"); -#if 0 - fprintf(ofp, " -u, --userspace [CMD] Apply to the user-space tracer\n"); - fprintf(ofp, " If no CMD, the domain used is UST global\n"); - fprintf(ofp, " or else the domain is UST EXEC_NAME\n"); - fprintf(ofp, " -p, --pid PID If -u, apply to specific PID (domain: UST PID)\n"); -#else fprintf(ofp, " -u, --userspace Apply to the user-space tracer\n"); -#endif fprintf(ofp, "\n"); fprintf(ofp, "Channel options:\n"); fprintf(ofp, " --discard Discard event when buffers are full%s\n", @@ -102,9 +96,9 @@ 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\n"); - fprintf(ofp, " (default: %u, kernel default: %u)\n", - DEFAULT_CHANNEL_SUBBUF_SIZE, - DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE); + 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, " --num-subbuf NUM Number of subbufers\n"); @@ -116,6 +110,11 @@ static void usage(FILE *ofp) DEFAULT_CHANNEL_SWITCH_TIMER); fprintf(ofp, " --read-timer USEC Read timer interval in usec (default: %u)\n", DEFAULT_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, "\n"); } @@ -164,8 +163,14 @@ static int enable_channel(char *session_name) /* Create lttng domain */ if (opt_kernel) { dom.type = LTTNG_DOMAIN_KERNEL; + dom.buf_type = LTTNG_BUFFER_GLOBAL; } else if (opt_userspace) { dom.type = LTTNG_DOMAIN_UST; + if (opt_buffer_uid) { + dom.buf_type = LTTNG_BUFFER_PER_UID; + } else { + dom.buf_type = LTTNG_BUFFER_PER_PID; + } } else { ERR("Please specify a tracer (-k/--kernel or -u/--userspace)"); ret = CMD_ERROR; @@ -174,6 +179,21 @@ static int enable_channel(char *session_name) set_default_attr(&dom); + /* Setting channel output */ + if (opt_output) { + if (!strncmp(output_mmap, opt_output, strlen(output_mmap))) { + chan.attr.output = LTTNG_EVENT_MMAP; + } else if (!strncmp(output_splice, opt_output, strlen(output_splice))) { + chan.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; + } + } + handle = lttng_create_handle(session_name, &dom); if (handle == NULL) { ret = -1; @@ -192,8 +212,8 @@ static int enable_channel(char *session_name) ret = lttng_enable_channel(handle, &chan); if (ret < 0) { switch (-ret) { - case LTTCOMM_KERN_CHAN_EXIST: - case LTTCOMM_UST_CHAN_EXIST: + case LTTNG_ERR_KERN_CHAN_EXIST: + case LTTNG_ERR_UST_CHAN_EXIST: WARN("Channel %s: %s (session %s", channel_name, lttng_strerror(ret), session_name); goto error;