static char *opt_event_list;
static int opt_event_type;
+static const char *opt_loglevel;
+static int opt_loglevel_type;
static int opt_kernel;
static char *opt_session_name;
static int opt_userspace;
-static char *opt_cmd_name;
static int opt_enable_all;
-static pid_t opt_pid;
static char *opt_probe;
static char *opt_function;
static char *opt_function_entry_symbol;
static char *opt_channel_name;
+#if 0
+/* Not implemented yet */
+static char *opt_cmd_name;
+static pid_t opt_pid;
+#endif
enum {
OPT_HELP = 1,
OPT_FUNCTION_ENTRY,
OPT_SYSCALL,
OPT_USERSPACE,
- OPT_TRACEPOINT_LOGLEVEL,
+ OPT_LOGLEVEL,
+ OPT_LOGLEVEL_ONLY,
+ OPT_LIST_OPTIONS,
};
static struct lttng_handle *handle;
{"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},
+#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
{"tracepoint", 0, POPT_ARG_NONE, 0, OPT_TRACEPOINT, 0, 0},
{"probe", 0, POPT_ARG_STRING, &opt_probe, OPT_PROBE, 0, 0},
{"function", 0, POPT_ARG_STRING, &opt_function, OPT_FUNCTION, 0, 0},
{"function:entry", 0, POPT_ARG_STRING, &opt_function_entry_symbol, OPT_FUNCTION_ENTRY, 0, 0},
#endif
{"syscall", 0, POPT_ARG_NONE, 0, OPT_SYSCALL, 0, 0},
- {"loglevel", 0, POPT_ARG_NONE, 0, OPT_TRACEPOINT_LOGLEVEL, 0, 0},
+ {"loglevel", 0, POPT_ARG_STRING, 0, OPT_LOGLEVEL, 0, 0},
+ {"loglevel-only", 0, POPT_ARG_STRING, 0, OPT_LOGLEVEL_ONLY, 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-event NAME[,NAME2,...] [options] [event_options]\n");
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, " -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, " 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");
+#endif
fprintf(ofp, "\n");
fprintf(ofp, "Event options:\n");
fprintf(ofp, " --tracepoint Tracepoint event (default)\n");
fprintf(ofp, " e.g.:\n");
fprintf(ofp, " \"*\"\n");
fprintf(ofp, " \"app_component:na*\"\n");
- fprintf(ofp, " --loglevel Tracepoint loglevel\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");
/* 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;
}
MSG("per-syscall selection not supported yet. Use \"-a\" "
"for all syscalls.");
default:
- ret = CMD_NOT_IMPLEMENTED;
+ ret = CMD_UNDEFINED;
+ goto error;
+ }
+
+ if (opt_loglevel[0] != '\0') {
+ 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';
} else if (opt_userspace) { /* User-space tracer action */
+#if 0
if (opt_cmd_name != NULL || opt_pid) {
MSG("Only supporting tracing all UST processes (-u) for now.");
- ret = CMD_NOT_IMPLEMENTED;
+ ret = CMD_UNDEFINED;
goto error;
}
+#endif
DBG("Enabling UST event %s for channel %s", event_name,
channel_name);
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:
case LTTNG_EVENT_FUNCTION_ENTRY:
case LTTNG_EVENT_SYSCALL:
default:
- ret = CMD_NOT_IMPLEMENTED;
+ 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';
} else {
ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
goto error;
case OPT_USERSPACE:
opt_userspace = 1;
break;
- case OPT_TRACEPOINT_LOGLEVEL:
- opt_event_type = LTTNG_EVENT_TRACEPOINT_LOGLEVEL;
+ case OPT_LOGLEVEL:
+ opt_loglevel_type = LTTNG_EVENT_LOGLEVEL;
+ opt_loglevel = poptGetOptArg(pc);
break;
+ case OPT_LOGLEVEL_ONLY:
+ opt_loglevel_type = LTTNG_EVENT_LOGLEVEL_ONLY;
+ opt_loglevel = poptGetOptArg(pc);
+ break;
+ case OPT_LIST_OPTIONS:
+ list_cmd_options(stdout, long_options);
+ ret = CMD_SUCCESS;
+ goto end;
default:
usage(stderr);
ret = CMD_UNDEFINED;
projects / lttng-tools.git / blobdiff