X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_channels.c;fp=lttng%2Fcommands%2Fenable_channels.c;h=1a9611be24e086756ce64659d034259d38838bd2;hp=7dbec903a1664f8b9894fd8eae2351d5517bd035;hb=7d29a2477524f7ee2ee46a94e538e6141f5ecc0e;hpb=65beb5ffdbe6e17dbd0268aad3c32b02322cd9ad diff --git a/lttng/commands/enable_channels.c b/lttng/commands/enable_channels.c index 7dbec903a..1a9611be2 100644 --- a/lttng/commands/enable_channels.c +++ b/lttng/commands/enable_channels.c @@ -31,13 +31,21 @@ static char *opt_channels; static char *opt_kernel; +static char *opt_cmd_name; static char *opt_session_name; static int opt_pid_all; static int opt_userspace; static pid_t opt_pid; +static struct lttng_channel chan; enum { OPT_HELP = 1, + OPT_DISCARD, + OPT_OVERWRITE, + OPT_SUBBUF_SIZE, + OPT_NUM_SUBBUF, + OPT_SWITCH_TIMER, + OPT_READ_TIMER, OPT_USERSPACE, }; @@ -46,9 +54,15 @@ static struct poptOption long_options[] = { {"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}, - {"userspace", 'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0}, + {"userspace", 'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, 0, OPT_USERSPACE, 0, 0}, {"all", 0, POPT_ARG_VAL, &opt_pid_all, 1, 0, 0}, {"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}, {0, 0, 0, 0, 0, 0, 0} }; @@ -57,39 +71,57 @@ static struct poptOption long_options[] = { */ static void usage(FILE *ofp) { - fprintf(ofp, "usage: lttng enable-channel NAME[,NAME2,...] [options]\n"); + fprintf(ofp, "usage: lttng enable-channel NAME[,NAME2,...] [options] [channel_options]\n"); fprintf(ofp, "\n"); - fprintf(ofp, " -h, --help Show this help\n"); + fprintf(ofp, " -h, --help Show this help\n"); fprintf(ofp, " -s, --session Apply on session name\n"); - fprintf(ofp, " -k, --kernel Apply for the kernel tracer\n"); - fprintf(ofp, " -u, --userspace Apply for the user-space tracer\n"); - fprintf(ofp, " --all If -u, apply on all traceable apps\n"); - fprintf(ofp, " -p, --pid PID If -u, apply on a specific PID\n"); + fprintf(ofp, " -k, --kernel Apply on the kernel tracer\n"); + fprintf(ofp, " -u, --userspace [CMD] Apply on the user-space tracer\n"); + fprintf(ofp, " --all If -u, apply on all traceable apps\n"); + 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, "\n"); } /* - * enable_channels + * enable_channel * - * Enabling channel using the lttng API. + * Adding channel using the lttng API. */ -static int enable_channels(void) +static int enable_channel(void) { int ret = CMD_SUCCESS; char *channel_name; + struct lttng_domain dom; if (set_session_name(opt_session_name) < 0) { ret = CMD_ERROR; goto error; } + if (opt_kernel) { + dom.type = LTTNG_DOMAIN_KERNEL; + } + /* Strip event list */ channel_name = strtok(opt_channels, ","); while (channel_name != NULL) { /* Kernel tracer action */ if (opt_kernel) { DBG("Enabling kernel channel %s", channel_name); - ret = lttng_kernel_enable_channel(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 { @@ -118,15 +150,30 @@ error: } /* - * cmd_enable_channels + * init_channel_config * - * Enable channel to trace session + * 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; +} + +/* + * Add channel to trace session */ int cmd_enable_channels(int argc, const char **argv) { int opt, ret; static poptContext pc; + init_channel_config(); + pc = poptGetContext(NULL, argc, argv, long_options, 0); poptReadDefaultConfig(pc, 0); @@ -138,6 +185,31 @@ int cmd_enable_channels(int argc, const char **argv) goto end; case OPT_USERSPACE: opt_userspace = 1; + opt_cmd_name = poptGetOptArg(pc); + break; + case OPT_DISCARD: + chan.attr.overwrite = 0; + DBG("Channel set to discard"); + break; + case OPT_OVERWRITE: + chan.attr.overwrite = 1; + DBG("Channel set to overwrite"); + break; + case OPT_SUBBUF_SIZE: + chan.attr.subbuf_size = atol(poptGetOptArg(pc)); + DBG("Channel subbuf size set to %lu", 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); + break; + case OPT_SWITCH_TIMER: + chan.attr.switch_timer_interval = atoi(poptGetOptArg(pc)); + DBG("Channel switch timer interval set to %d", chan.attr.switch_timer_interval); + break; + case OPT_READ_TIMER: + chan.attr.read_timer_interval = atoi(poptGetOptArg(pc)); + DBG("Channel read timer interval set to %d", chan.attr.read_timer_interval); break; default: usage(stderr); @@ -148,13 +220,13 @@ int cmd_enable_channels(int argc, const char **argv) opt_channels = (char*) poptGetArg(pc); if (opt_channels == NULL) { - ERR("Missing channel name(s).\n"); + ERR("Missing channel name.\n"); usage(stderr); ret = CMD_SUCCESS; goto end; } - ret = enable_channels(); + ret = enable_channel(); end: return ret;