X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_events.c;h=d548d6e90ba4096f180adc09bda365e9e68523c1;hp=dd1a049288c55807ce682fa0faf406d67797a07b;hb=6181537cb60c3680d2d425b5c21d968cfef1fc83;hpb=c70c0ca0e8e46b29376d77b5b4483891cb33679d diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c index dd1a04928..d548d6e90 100644 --- a/lttng/commands/enable_events.c +++ b/lttng/commands/enable_events.c @@ -33,7 +33,7 @@ static char *opt_event_list; static int opt_event_type; -static char *opt_kernel; +static int opt_kernel; static char *opt_session_name; static int opt_pid_all; static int opt_userspace; @@ -48,12 +48,12 @@ static char *opt_channel_name; enum { OPT_HELP = 1, OPT_TRACEPOINT, - OPT_MARKER, OPT_PROBE, OPT_FUNCTION, OPT_FUNCTION_ENTRY, OPT_SYSCALL, OPT_USERSPACE, + OPT_TRACEPOINT_LOGLEVEL, }; static struct lttng_handle *handle; @@ -69,11 +69,17 @@ static struct poptOption long_options[] = { {"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}, - {"marker", 0, POPT_ARG_NONE, 0, OPT_MARKER, 0, 0}, {"probe", 0, POPT_ARG_STRING, &opt_probe, OPT_PROBE, 0, 0}, {"function", 0, POPT_ARG_STRING, &opt_function, OPT_FUNCTION, 0, 0}, +#if 0 + /* + * Currently removed from lttng kernel tracer. Removed from + * lttng UI to discourage its use. + */ {"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}, {0, 0, 0, 0, 0, 0, 0} }; @@ -95,6 +101,7 @@ static void usage(FILE *ofp) fprintf(ofp, "\n"); fprintf(ofp, "Event options:\n"); fprintf(ofp, " --tracepoint Tracepoint event (default)\n"); + fprintf(ofp, " --loglevel Tracepoint 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"); @@ -103,17 +110,16 @@ static void usage(FILE *ofp) fprintf(ofp, " Dynamic function entry/return probe.\n"); fprintf(ofp, " Addr and offset can be octal (0NNN...),\n"); fprintf(ofp, " decimal (NNN...) or hexadecimal (0xNNN...)\n"); +#if 0 fprintf(ofp, " --function:entry symbol\n"); fprintf(ofp, " Function tracer event\n"); +#endif fprintf(ofp, " --syscall System call event\n"); - fprintf(ofp, " --marker User-space marker (deprecated)\n"); fprintf(ofp, "\n"); } /* - * parse_probe_addr - * - * Parse probe options. + * Parse probe options. */ static int parse_probe_opts(struct lttng_event *ev, char *opt) { @@ -180,9 +186,7 @@ end: } /* - * enable_events - * - * Enabling event using the lttng API. + * Enabling event using the lttng API. */ static int enable_events(char *session_name) { @@ -206,17 +210,23 @@ static int enable_events(char *session_name) ret = CMD_FATAL; goto error; } + /* Create lttng domain */ if (opt_kernel) { dom.type = LTTNG_DOMAIN_KERNEL; - } - if (opt_userspace) { - /* TODO - * LTTNG_DOMAIN_UST_EXEC_NAME, - * LTTNG_DOMAIN_UST_PID, - * LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN - */ + } 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) { 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 (--kernel or --userspace)"); + ret = CMD_NOT_IMPLEMENTED; + goto error; } handle = lttng_create_handle(session_name, &dom); @@ -252,9 +262,8 @@ static int enable_events(char *session_name) break; default: /* - * We should not be here since - * lttng_enable_event should have failed on the - * event type. + * We should not be here since lttng_enable_event should have + * failed on the event type. */ goto error; } @@ -264,14 +273,15 @@ static int enable_events(char *session_name) /* Strip event list */ event_name = strtok(opt_event_list, ","); while (event_name != NULL) { + /* Copy name and type of the event */ + strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN); + ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; + ev.type = opt_event_type; + /* Kernel tracer action */ if (opt_kernel) { DBG("Enabling kernel event %s for channel %s", event_name, channel_name); - /* Copy name and type of the event */ - strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN); - ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; - ev.type = opt_event_type; switch (opt_event_type) { case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */ @@ -296,41 +306,27 @@ static int enable_events(char *session_name) } break; case LTTNG_EVENT_FUNCTION_ENTRY: - strncpy(ev.attr.ftrace.symbol_name, - opt_function_entry_symbol, - LTTNG_SYMBOL_NAME_LEN); + strncpy(ev.attr.ftrace.symbol_name, opt_function_entry_symbol, + LTTNG_SYMBOL_NAME_LEN); ev.attr.ftrace.symbol_name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; break; case LTTNG_EVENT_SYSCALL: - MSG("per-syscall selection not supported yet. Use \"-a\" for all syscalls."); - ret = CMD_NOT_IMPLEMENTED; - goto error; + MSG("per-syscall selection not supported yet. Use \"-a\" " + "for all syscalls."); default: ret = CMD_NOT_IMPLEMENTED; goto error; } - - ret = lttng_enable_event(handle, &ev, channel_name); - if (ret == 0) { - MSG("Kernel event %s created in channel %s", event_name, channel_name); - } } else if (opt_userspace) { /* User-space tracer action */ - /* - * TODO: only supporting pid_all tracing for - * now. Should have different domain based on - * opt_pid. - */ if (!opt_pid_all) { - MSG("Only supporting tracing all UST processes (-u --all) for now."); + MSG("Only supporting tracing all UST processes " + "(-u --all) for now."); ret = CMD_NOT_IMPLEMENTED; goto error; } - DBG("Enabling UST event %s for channel %s", - event_name, channel_name); - /* Copy name and type of the event */ - strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN); - ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; - ev.type = opt_event_type; + + DBG("Enabling UST event %s for channel %s", event_name, + channel_name); switch (opt_event_type) { case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */ @@ -338,6 +334,9 @@ static int enable_events(char *session_name) /* Fall-through */ case LTTNG_EVENT_TRACEPOINT: break; + case LTTNG_EVENT_TRACEPOINT_LOGLEVEL: + ev.type = LTTNG_EVENT_TRACEPOINT_LOGLEVEL; + break; case LTTNG_EVENT_PROBE: case LTTNG_EVENT_FUNCTION: case LTTNG_EVENT_FUNCTION_ENTRY: @@ -346,16 +345,17 @@ static int enable_events(char *session_name) ret = CMD_NOT_IMPLEMENTED; goto error; } - - ret = lttng_enable_event(handle, &ev, channel_name); - if (ret == 0) { - MSG("UST event %s created in channel %s", event_name, channel_name); - } } else { ERR("Please specify a tracer (--kernel or --userspace)"); goto error; } + ret = lttng_enable_event(handle, &ev, channel_name); + if (ret == 0) { + MSG("%s event %s created in channel %s", + opt_kernel ? "kernel": "UST", event_name, channel_name); + } + /* Next event */ event_name = strtok(NULL, ","); } @@ -371,9 +371,7 @@ error: } /* - * cmd_enable_events - * - * Add event to trace session + * Add event to trace session */ int cmd_enable_events(int argc, const char **argv) { @@ -396,9 +394,6 @@ int cmd_enable_events(int argc, const char **argv) case OPT_TRACEPOINT: opt_event_type = LTTNG_EVENT_TRACEPOINT; break; - case OPT_MARKER: - ret = CMD_NOT_IMPLEMENTED; - goto end; case OPT_PROBE: opt_event_type = LTTNG_EVENT_PROBE; break; @@ -414,6 +409,9 @@ int cmd_enable_events(int argc, const char **argv) case OPT_USERSPACE: opt_userspace = 1; break; + case OPT_TRACEPOINT_LOGLEVEL: + opt_event_type = LTTNG_EVENT_TRACEPOINT_LOGLEVEL; + break; default: usage(stderr); ret = CMD_UNDEFINED;