X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_channels.c;h=c5887d07bf17ac10688e3dbb3b74bc6d57564ddc;hp=f149cc74584a122670673df6351f0636bc1f8e27;hb=0b0dd29a48f5855eeb7cda99efaa079d8353eb6b;hpb=82a3637f639486c07ff937ab03e1e9532379d26a diff --git a/lttng/commands/enable_channels.c b/lttng/commands/enable_channels.c index f149cc745..c5887d07b 100644 --- a/lttng/commands/enable_channels.c +++ b/lttng/commands/enable_channels.c @@ -24,10 +24,11 @@ #include #include #include +#include -#include "cmd.h" -#include "conf.h" -#include "utils.h" +#include "../cmd.h" +#include "../conf.h" +#include "../utils.h" static char *opt_channels; static char *opt_kernel; @@ -49,6 +50,8 @@ enum { OPT_USERSPACE, }; +static struct lttng_handle *handle; + static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ {"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0}, @@ -59,10 +62,10 @@ static struct poptOption long_options[] = { {"pid", 'p', POPT_ARG_INT, &opt_pid, 0, 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}, - {"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}, + {"subbuf-size", 0, POPT_ARG_DOUBLE, 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}, {0, 0, 0, 0, 0, 0, 0} }; @@ -81,64 +84,67 @@ static void usage(FILE *ofp) fprintf(ofp, " -p, --pid PID If -u, apply on a specific PID\n"); fprintf(ofp, "\n"); fprintf(ofp, "Channel options:\n"); - fprintf(ofp, " --discard Discard event when buffers are full (default)\n"); - fprintf(ofp, " --overwrite Flight recorder mode\n"); - fprintf(ofp, " --subbuf_size Subbuffer size in bytes (default: 4096)\n"); - fprintf(ofp, " --num_subbuf Number of subbufers (default: 2)\n"); - fprintf(ofp, " --switch_timer Switch timer interval in usec (default: 0)\n"); - fprintf(ofp, " --read_timer Read timer interval in usec (default: 200)\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 Subbuffer size in bytes\n"); + fprintf(ofp, " (default: %u, kernel default: %u)\n", + DEFAULT_CHANNEL_SUBBUF_SIZE, + DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE); + fprintf(ofp, " --num-subbuf Number of subbufers\n"); + fprintf(ofp, " (default: %u, kernel default: %u)\n", + DEFAULT_CHANNEL_SUBBUF_NUM, + DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM); + fprintf(ofp, " --switch-timer Switch timer interval in usec (default: %u)\n", + DEFAULT_CHANNEL_SWITCH_TIMER); + fprintf(ofp, " --read-timer Read timer interval in usec (default: %u)\n", + DEFAULT_CHANNEL_READ_TIMER); fprintf(ofp, "\n"); } /* - * enable_channel - * - * Adding channel using the lttng API. + * Adding channel using the lttng API. */ -static int enable_channel(void) +static int enable_channel(char *session_name) { int ret = CMD_SUCCESS; char *channel_name; struct lttng_domain dom; - if (set_session_name(opt_session_name) < 0) { - ret = CMD_ERROR; + if (opt_kernel) { + dom.type = LTTNG_DOMAIN_KERNEL; + } else if (opt_pid != 0) { + dom.type = LTTNG_DOMAIN_UST_PID; + dom.attr.pid = opt_pid; + DBG("PID %d set to lttng handle", opt_pid); + } else { + ERR("Please specify a tracer (--kernel or --userspace)"); + ret = CMD_NOT_IMPLEMENTED; goto error; } - if (opt_kernel) { - dom.type = LTTNG_DOMAIN_KERNEL; + handle = lttng_create_handle(session_name, &dom); + if (handle == NULL) { + ret = -1; + goto error; } - /* Strip event list */ + /* Strip channel list (format: chan1,chan2,...) */ channel_name = strtok(opt_channels, ","); while (channel_name != NULL) { - /* Kernel tracer action */ - if (opt_kernel) { - DBG("Enabling kernel channel %s", channel_name); - - /* Copy channel name and normalize it */ - strncpy(chan.name, channel_name, NAME_MAX); - chan.name[NAME_MAX - 1] = '\0'; - - ret = lttng_enable_channel(&dom, &chan); - if (ret < 0) { - goto error; - } else { - MSG("Kernel channel enabled %s", channel_name); - } - } else if (opt_userspace) { /* User-space tracer action */ - /* - * TODO: Waiting on lttng UST 2.0 - */ - if (opt_pid_all) { - } else if (opt_pid != 0) { - } - ret = CMD_NOT_IMPLEMENTED; + /* Copy channel name and normalize it */ + strncpy(chan.name, channel_name, NAME_MAX); + chan.name[NAME_MAX - 1] = '\0'; + + DBG("Enabling channel %s", channel_name); + + ret = lttng_enable_channel(handle, &chan); + if (ret < 0) { goto error; } else { - ERR("Please specify a tracer (kernel or user-space)"); - goto error; + MSG("Channel enabled %s for session %s", + channel_name, session_name); } /* Next event */ @@ -146,31 +152,45 @@ static int enable_channel(void) } error: + lttng_destroy_handle(handle); + return ret; } /* - * init_channel_config - * - * Default value for channel configuration. + * Default value for channel configuration. */ static void init_channel_config(void) { - chan.attr.overwrite = DEFAULT_CHANNEL_OVERWRITE; - chan.attr.subbuf_size = DEFAULT_CHANNEL_SUBBUF_SIZE; - chan.attr.num_subbuf = DEFAULT_CHANNEL_SUBBUF_NUM; - chan.attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER; - chan.attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER; - chan.attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT; + if (opt_kernel) { + /* kernel default */ + chan.attr.overwrite = DEFAULT_CHANNEL_OVERWRITE; + chan.attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER; + chan.attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER; + + chan.attr.subbuf_size = DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE; + chan.attr.num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM; + chan.attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT; + } else { + /* default behavior, used by UST. */ + chan.attr.overwrite = DEFAULT_CHANNEL_OVERWRITE; + chan.attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER; + chan.attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER; + + chan.attr.subbuf_size = DEFAULT_UST_CHANNEL_SUBBUF_SIZE; + chan.attr.num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM; + chan.attr.output = DEFAULT_CHANNEL_OUTPUT; + } } /* - * Add channel to trace session + * Add channel to trace session */ int cmd_enable_channels(int argc, const char **argv) { int opt, ret; static poptContext pc; + char *session_name = NULL; init_channel_config(); @@ -197,11 +217,11 @@ int cmd_enable_channels(int argc, const char **argv) break; case OPT_SUBBUF_SIZE: chan.attr.subbuf_size = atol(poptGetOptArg(pc)); - DBG("Channel subbuf size set to %lu", chan.attr.subbuf_size); + DBG("Channel subbuf size set to %" PRIu64, chan.attr.subbuf_size); break; case OPT_NUM_SUBBUF: chan.attr.num_subbuf = atoi(poptGetOptArg(pc)); - DBG("Channel subbuf num set to %lu", chan.attr.num_subbuf); + DBG("Channel subbuf num set to %" PRIu64, chan.attr.num_subbuf); break; case OPT_SWITCH_TIMER: chan.attr.switch_timer_interval = atoi(poptGetOptArg(pc)); @@ -226,7 +246,17 @@ int cmd_enable_channels(int argc, const char **argv) goto end; } - ret = enable_channel(); + if (!opt_session_name) { + session_name = get_session_name(); + if (session_name == NULL) { + ret = -1; + goto end; + } + } else { + session_name = opt_session_name; + } + + ret = enable_channel(session_name); end: return ret;