static int opt_event_type;
static int opt_kernel;
static char *opt_session_name;
-static int opt_pid_all;
static int opt_userspace;
static char *opt_cmd_name;
static int opt_enable_all;
/* 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},
- {"all-events", 'a', POPT_ARG_VAL, &opt_enable_all, 1, 0, 0},
+ {"all", 'a', POPT_ARG_VAL, &opt_enable_all, 1, 0, 0},
{"channel", 'c', POPT_ARG_STRING, &opt_channel_name, 0, 0, 0},
{"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
{"userspace", 'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, 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},
{"tracepoint", 0, POPT_ARG_NONE, 0, OPT_TRACEPOINT, 0, 0},
{"probe", 0, POPT_ARG_STRING, &opt_probe, OPT_PROBE, 0, 0},
fprintf(ofp, " -h, --help Show this help\n");
fprintf(ofp, " -s, --session Apply on session name\n");
fprintf(ofp, " -c, --channel Apply on this channel\n");
- fprintf(ofp, " -a, --all-events Enable all tracepoints\n");
+ fprintf(ofp, " -a, --all Enable all tracepoints\n");
fprintf(ofp, " -k, --kernel Apply for the kernel tracer\n");
fprintf(ofp, " -u, --userspace [CMD] 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, " 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");
fprintf(ofp, "\n");
fprintf(ofp, "Event options:\n");
fprintf(ofp, " --tracepoint Tracepoint event (default)\n");
+ fprintf(ofp, " - userspace tracer supports wildcards at end of string.\n");
+ fprintf(ofp, " Don't forget to quote to deal with bash expansion.\n");
+ fprintf(ofp, " e.g.:\n");
+ fprintf(ofp, " \"*\"\n");
+ fprintf(ofp, " \"app_component:na*\"\n");
fprintf(ofp, " --loglevel Tracepoint loglevel\n");
fprintf(ofp, " --probe [addr | symbol | symbol+offset]\n");
fprintf(ofp, " Dynamic probe.\n");
}
if (opt_kernel && opt_userspace) {
- MSG("Choose only one of --kernel or --userspace");
+ ERR("Can't use -k/--kernel and -u/--userspace together");
ret = CMD_FATAL;
goto error;
}
dom.type = LTTNG_DOMAIN_UST_EXEC_NAME;
strncpy(dom.attr.exec_name, opt_cmd_name, NAME_MAX);
} else {
- ERR("Please specify a tracer (--kernel or --userspace)");
+ ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
ret = CMD_NOT_IMPLEMENTED;
goto error;
}
if (opt_enable_all) {
/* Default setup for enable all */
- ev.name[0] = '\0';
- ev.type = opt_event_type;
+
+ if (opt_kernel) {
+ ev.type = opt_event_type;
+ ev.name[0] = '\0';
+ } else {
+ ev.type = LTTNG_EVENT_TRACEPOINT;
+ strcpy(ev.name, "*");
+ }
ret = lttng_enable_event(handle, &ev, channel_name);
if (ret < 0) {
goto error;
}
} else if (opt_userspace) { /* User-space tracer action */
- if (!opt_pid_all) {
- MSG("Only supporting tracing all UST processes "
- "(-u --all) for now.");
+ if (opt_cmd_name != NULL || opt_pid) {
+ MSG("Only supporting tracing all UST processes (-u) for now.");
ret = CMD_NOT_IMPLEMENTED;
goto error;
}
switch (opt_event_type) {
case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */
- ev.type = LTTNG_EVENT_TRACEPOINT;
/* Fall-through */
case LTTNG_EVENT_TRACEPOINT:
+ /* Copy name and type of the event */
+ ev.type = LTTNG_EVENT_TRACEPOINT;
+ strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN);
+ ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
break;
case LTTNG_EVENT_TRACEPOINT_LOGLEVEL:
+ /* Copy name and type of the event */
ev.type = LTTNG_EVENT_TRACEPOINT_LOGLEVEL;
+ strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN);
+ ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
break;
case LTTNG_EVENT_PROBE:
case LTTNG_EVENT_FUNCTION:
goto error;
}
} else {
- ERR("Please specify a tracer (--kernel or --userspace)");
+ ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
goto error;
}