fprintf(ofp, "\n");
fprintf(ofp, " -h, --help Show this help\n");
fprintf(ofp, " --list-options Simple listing of options\n");
- fprintf(ofp, " -s, --session Apply on session name\n");
- fprintf(ofp, " -c, --channel Apply on this channel\n");
+ fprintf(ofp, " -s, --session Apply to session name\n");
+ fprintf(ofp, " -c, --channel Apply to this channel\n");
fprintf(ofp, " -a, --all Enable all tracepoints\n");
fprintf(ofp, " -k, --kernel Apply for the kernel tracer\n");
#if 0
- fprintf(ofp, " -u, --userspace [CMD] Apply for the user-space tracer\n");
+ 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 for the user-space tracer\n");
+ fprintf(ofp, " -u, --userspace Apply to the user-space tracer\n");
#endif
fprintf(ofp, "\n");
fprintf(ofp, "Event options:\n");
fprintf(ofp, " e.g.:\n");
fprintf(ofp, " \"*\"\n");
fprintf(ofp, " \"app_component:na*\"\n");
- fprintf(ofp, " --loglevel name\n");
- fprintf(ofp, " Tracepoint loglevel (range: 0 to loglevel)\n");
- fprintf(ofp, " --loglevel-only name\n");
- fprintf(ofp, " Tracepoint loglevel (only this loglevel)\n");
fprintf(ofp, " --probe [addr | symbol | symbol+offset]\n");
fprintf(ofp, " Dynamic probe.\n");
fprintf(ofp, " Addr and offset can be octal (0NNN...),\n");
#endif
fprintf(ofp, " --syscall System call event\n");
fprintf(ofp, "\n");
+ fprintf(ofp, " --loglevel name\n");
+ fprintf(ofp, " Tracepoint loglevel range from 0 to loglevel\n");
+ fprintf(ofp, " --loglevel-only name\n");
+ fprintf(ofp, " Tracepoint loglevel (only this loglevel)\n");
+ fprintf(ofp, "\n");
+ fprintf(ofp, " The loglevel or loglevel-only options should be combined\n");
+ fprintf(ofp, " with a tracepoint name (or tracepoint wildcard).\n");
+ fprintf(ofp, " Available loglevels: (higher value means more verbose)\n");
+ fprintf(ofp, " TRACE_EMERG = 0\n");
+ fprintf(ofp, " TRACE_ALERT = 1\n");
+ fprintf(ofp, " TRACE_CRIT = 2\n");
+ fprintf(ofp, " TRACE_ERR = 3\n");
+ fprintf(ofp, " TRACE_WARNING = 4\n");
+ fprintf(ofp, " TRACE_NOTICE = 5\n");
+ fprintf(ofp, " TRACE_INFO = 6\n");
+ fprintf(ofp, " TRACE_SYSTEM = 7\n");
+ fprintf(ofp, " TRACE_PROCESS = 8\n");
+ fprintf(ofp, " TRACE_MODULE = 9\n");
+ fprintf(ofp, " TRACE_UNIT = 10\n");
+ fprintf(ofp, " TRACE_CLASS = 11\n");
+ fprintf(ofp, " TRACE_OBJECT = 12\n");
+ fprintf(ofp, " TRACE_FUNCTION = 13\n");
+ fprintf(ofp, " TRACE_PRINTF = 14\n");
+ fprintf(ofp, " TRACE_DEBUG = 15\n");
+ fprintf(ofp, "\n");
}
/*
return ret;
}
+/*
+ * Maps this from string to value
+ *
+ * TRACE_EMERG = 0,
+ * TRACE_ALERT = 1,
+ * TRACE_CRIT = 2,
+ * TRACE_ERR = 3,
+ * TRACE_WARNING = 4,
+ * TRACE_NOTICE = 5,
+ * TRACE_INFO = 6,
+ * TRACE_SYSTEM = 7,
+ * TRACE_PROCESS = 8,
+ * TRACE_MODULE = 9,
+ * TRACE_UNIT = 10,
+ * TRACE_CLASS = 11,
+ * TRACE_OBJECT = 12,
+ * TRACE_FUNCTION = 13,
+ * TRACE_PRINTF = 14,
+ * TRACE_DEBUG = 15,
+ */
+static
+int loglevel_str_to_value(const char *str)
+{
+ if (!strcmp(str, "TRACE_EMERG")) {
+ return 0;
+ } else if (!strcmp(str, "TRACE_ALERT")) {
+ return 1;
+ } else if (!strcmp(str, "TRACE_CRIT")) {
+ return 2;
+ } else if (!strcmp(str, "TRACE_ERR")) {
+ return 3;
+ } else if (!strcmp(str, "TRACE_WARNING")) {
+ return 4;
+ } else if (!strcmp(str, "TRACE_NOTICE")) {
+ return 5;
+ } else if (!strcmp(str, "TRACE_INFO")) {
+ return 6;
+ } else if (!strcmp(str, "TRACE_SYSTEM")) {
+ return 7;
+ } else if (!strcmp(str, "TRACE_PROCESS")) {
+ return 8;
+ } else if (!strcmp(str, "TRACE_MODULE")) {
+ return 9;
+ } else if (!strcmp(str, "TRACE_UNIT")) {
+ return 10;
+ } else if (!strcmp(str, "TRACE_CLASS")) {
+ return 11;
+ } else if (!strcmp(str, "TRACE_OBJECT")) {
+ return 12;
+ } else if (!strcmp(str, "TRACE_FUNCTION")) {
+ return 13;
+ } else if (!strcmp(str, "TRACE_PRINTF")) {
+ return 14;
+ } else if (!strcmp(str, "TRACE_DEBUG")) {
+ return 15;
+ } else {
+ return -1;
+ }
+}
+
/*
* Enabling event using the lttng API.
*/
static int enable_events(char *session_name)
{
- int err, ret = CMD_SUCCESS;
+ int err, ret = CMD_SUCCESS, warn = 0;
char *event_name, *channel_name = NULL;
struct lttng_event ev;
struct lttng_domain dom;
- if (opt_channel_name == NULL) {
- err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME);
- if (err < 0) {
- ret = CMD_FATAL;
- goto error;
- }
- } else {
- channel_name = opt_channel_name;
- }
-
- if (opt_kernel && opt_userspace) {
- ERR("Can't use -k/--kernel and -u/--userspace together");
- ret = CMD_FATAL;
- goto error;
- }
-
/* Create lttng domain */
if (opt_kernel) {
dom.type = LTTNG_DOMAIN_KERNEL;
goto error;
}
+ if (opt_channel_name == NULL) {
+ err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME);
+ if (err < 0) {
+ ret = CMD_FATAL;
+ goto error;
+ }
+ } else {
+ channel_name = opt_channel_name;
+ }
+
handle = lttng_create_handle(session_name, &dom);
if (handle == NULL) {
ret = -1;
if (opt_enable_all) {
/* Default setup for enable all */
-
if (opt_kernel) {
ev.type = opt_event_type;
ev.name[0] = '\0';
+ /* kernel loglevels not implemented */
+ ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
} else {
ev.type = LTTNG_EVENT_TRACEPOINT;
strcpy(ev.name, "*");
+ ev.loglevel_type = opt_loglevel_type;
+ if (opt_loglevel) {
+ ev.loglevel = loglevel_str_to_value(opt_loglevel);
+ if (ev.loglevel == -1) {
+ ERR("Unknown loglevel %s", opt_loglevel);
+ ret = -1;
+ goto error;
+ }
+ }
}
ret = lttng_enable_event(handle, &ev, channel_name);
switch (opt_event_type) {
case LTTNG_EVENT_TRACEPOINT:
- MSG("All %s tracepoints are enabled in channel %s",
- opt_kernel ? "kernel" : "UST", channel_name);
+ MSG("All %s tracepoints are enabled in channel %s for loglevel %s",
+ opt_kernel ? "kernel" : "UST", channel_name,
+ opt_loglevel ? : "<all>");
break;
case LTTNG_EVENT_SYSCALL:
if (opt_kernel) {
}
break;
case LTTNG_EVENT_ALL:
- MSG("All %s events are enabled in channel %s",
- opt_kernel ? "kernel" : "UST", channel_name);
+ MSG("All %s events are enabled in channel %s for loglevel %s",
+ opt_kernel ? "kernel" : "UST", channel_name,
+ opt_loglevel ? : "<all>");
break;
default:
/*
goto error;
}
- if (opt_loglevel[0] != '\0') {
+ if (opt_loglevel) {
MSG("Kernel loglevels are not supported.");
ret = CMD_UNDEFINED;
goto error;
}
/* kernel loglevels not implemented */
- ev.loglevel_type = opt_loglevel_type;
- ev.loglevel[0] = '\0';
+ ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
} else if (opt_userspace) { /* User-space tracer action */
#if 0
if (opt_cmd_name != NULL || opt_pid) {
}
#endif
- DBG("Enabling UST event %s for channel %s", event_name,
- channel_name);
+ DBG("Enabling UST event %s for channel %s, loglevel %s", event_name,
+ channel_name, opt_loglevel ? : "<all>");
switch (opt_event_type) {
case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */
case LTTNG_EVENT_FUNCTION_ENTRY:
case LTTNG_EVENT_SYSCALL:
default:
+ ERR("Event type not available for user-space tracing");
ret = CMD_UNDEFINED;
goto error;
}
ev.loglevel_type = opt_loglevel_type;
- strncpy(ev.loglevel, opt_loglevel, LTTNG_SYMBOL_NAME_LEN);
- ev.loglevel[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+ if (opt_loglevel) {
+ ev.loglevel = loglevel_str_to_value(opt_loglevel);
+ if (ev.loglevel == -1) {
+ ERR("Unknown loglevel %s", opt_loglevel);
+ ret = -1;
+ goto error;
+ }
+ }
} else {
ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
+ ret = CMD_ERROR;
goto error;
}
ret = lttng_enable_event(handle, &ev, channel_name);
- if (ret == 0) {
+ if (ret < 0) {
+ ERR("Event %s: %s (channel %s, session %s)", event_name,
+ lttng_strerror(ret), channel_name, session_name);
+ warn = 1;
+ } else {
MSG("%s event %s created in channel %s",
opt_kernel ? "kernel": "UST", event_name, channel_name);
}
end:
error:
+ if (warn) {
+ ret = CMD_WARNING;
+ }
if (opt_channel_name == NULL) {
free(channel_name);
}
*/
int cmd_enable_events(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_TRACEPOINT:
opt_event_type = LTTNG_EVENT_TRACEPOINT;
opt_userspace = 1;
break;
case OPT_LOGLEVEL:
- opt_loglevel_type = LTTNG_EVENT_LOGLEVEL;
+ opt_loglevel_type = LTTNG_EVENT_LOGLEVEL_RANGE;
opt_loglevel = poptGetOptArg(pc);
break;
case OPT_LOGLEVEL_ONLY:
- opt_loglevel_type = LTTNG_EVENT_LOGLEVEL_ONLY;
+ opt_loglevel_type = LTTNG_EVENT_LOGLEVEL_SINGLE;
opt_loglevel = poptGetOptArg(pc);
break;
case OPT_LIST_OPTIONS:
list_cmd_options(stdout, long_options);
- ret = CMD_SUCCESS;
goto end;
default:
usage(stderr);
if (opt_event_list == NULL && opt_enable_all == 0) {
ERR("Missing event name(s).\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 {
free(session_name);
}
+ poptFreeContext(pc);
return ret;
}
projects / lttng-tools.git / blobdiff