static char *opt_channels;
static int opt_kernel;
-static char *opt_cmd_name;
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;
-static struct lttng_channel chan;
+#endif
enum {
OPT_HELP = 1,
OPT_SWITCH_TIMER,
OPT_READ_TIMER,
OPT_USERSPACE,
+ OPT_LIST_OPTIONS,
};
static struct lttng_handle *handle;
{"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},
{"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},
+ {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
{0, 0, 0, 0, 0, 0, 0}
};
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, " -s, --session Apply on session name\n");
- fprintf(ofp, " -k, --kernel Apply on the kernel tracer\n");
- fprintf(ofp, " -u, --userspace [CMD] Apply for the user-space tracer\n");
+ fprintf(ofp, " --list-options Simple listing of options\n");
+ fprintf(ofp, " -s, --session 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",
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, " --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, " --num-subbuf Number of subbufers\n");
+ fprintf(ofp, " --num-subbuf NUM 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",
+ fprintf(ofp, " --switch-timer USEC Switch timer interval in usec (default: %u)\n",
DEFAULT_CHANNEL_SWITCH_TIMER);
- fprintf(ofp, " --read-timer Read timer interval in usec (default: %u)\n",
+ fprintf(ofp, " --read-timer USEC Read timer interval in usec (default: %u)\n",
DEFAULT_CHANNEL_READ_TIMER);
fprintf(ofp, "\n");
}
*/
static int enable_channel(char *session_name)
{
- int ret = CMD_SUCCESS;
+ int ret = CMD_SUCCESS, warn = 0;
char *channel_name;
struct lttng_domain dom;
+ /* Create lttng domain */
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 if (opt_userspace && opt_cmd_name == NULL) {
+ } else if (opt_userspace) {
dom.type = LTTNG_DOMAIN_UST;
- } else if (opt_userspace && opt_cmd_name != NULL) {
- dom.type = LTTNG_DOMAIN_UST_EXEC_NAME;
- strncpy(dom.attr.exec_name, opt_cmd_name, NAME_MAX);
} else {
ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
- ret = CMD_NOT_IMPLEMENTED;
+ ret = CMD_ERROR;
goto error;
}
ret = lttng_enable_channel(handle, &chan);
if (ret < 0) {
- goto error;
+ ERR("Channel %s: %s (session %s)", channel_name,
+ lttng_strerror(ret), session_name);
+ warn = 1;
} else {
MSG("%s channel %s enabled for session %s",
opt_kernel ? "Kernel" : "UST", channel_name,
channel_name = strtok(NULL, ",");
}
+ ret = CMD_SUCCESS;
+
error:
+ if (warn) {
+ ret = CMD_WARNING;
+ }
+
lttng_destroy_handle(handle);
return ret;
*/
int cmd_enable_channels(int argc, const char **argv)
{
- int opt, ret;
+ int opt, ret = CMD_SUCCESS;
static poptContext pc;
char *session_name = NULL;
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
case OPT_HELP:
- usage(stderr);
- ret = CMD_SUCCESS;
+ usage(stdout);
goto end;
case OPT_DISCARD:
chan.attr.overwrite = 0;
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));
DBG("Channel subbuf size set to %" PRIu64, chan.attr.subbuf_size);
break;
case OPT_NUM_SUBBUF:
+ /* TODO Replace atoi with strtol and check for errors */
chan.attr.num_subbuf = atoi(poptGetOptArg(pc));
DBG("Channel subbuf num set to %" PRIu64, chan.attr.num_subbuf);
break;
case OPT_SWITCH_TIMER:
+ /* TODO Replace atoi with strtol and check for errors */
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:
+ /* TODO Replace atoi with strtol and check for errors */
chan.attr.read_timer_interval = atoi(poptGetOptArg(pc));
DBG("Channel read timer interval set to %d", chan.attr.read_timer_interval);
break;
case OPT_USERSPACE:
opt_userspace = 1;
break;
+ case OPT_LIST_OPTIONS:
+ list_cmd_options(stdout, long_options);
+ goto end;
default:
usage(stderr);
ret = CMD_UNDEFINED;
if (opt_channels == NULL) {
ERR("Missing channel name.\n");
usage(stderr);
- ret = CMD_SUCCESS;
+ ret = CMD_ERROR;
goto end;
}
if (!opt_session_name) {
session_name = get_session_name();
if (session_name == NULL) {
- ret = -1;
+ ret = CMD_ERROR;
goto end;
}
} else {
ret = enable_channel(session_name);
end:
+ if (!opt_session_name && session_name) {
+ free(session_name);
+ }
+ poptFreeContext(pc);
return ret;
}
projects / lttng-tools.git / blobdiff