X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_events.c;h=5740d3cbcf95547c72f8d20080da7d8f4318140d;hp=5b844e493d13c7d4f44b358a02205dd325df9ef6;hb=13dce3b738049495c54e14b7401c6f2aa421f5ed;hpb=99497cd03fb27fd2416a88d80292a0cc5647bff2 diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c index 5b844e493..5740d3cbc 100644 --- a/lttng/commands/enable_events.c +++ b/lttng/commands/enable_events.c @@ -34,10 +34,10 @@ static char *opt_event_list; static int opt_event_type; static char *opt_kernel; -static char *opt_cmd_name; static char *opt_session_name; static int opt_pid_all; static int opt_userspace; +static char *opt_cmd_name; static int opt_enable_all; static pid_t opt_pid; static char *opt_probe; @@ -47,14 +47,17 @@ static char *opt_channel_name; enum { OPT_HELP = 1, - OPT_USERSPACE, OPT_TRACEPOINT, - OPT_MARKER, OPT_PROBE, OPT_FUNCTION, OPT_FUNCTION_ENTRY, + OPT_SYSCALL, + OPT_USERSPACE, + OPT_TRACEPOINT_LOGLEVEL, }; +static struct lttng_handle *handle; + static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ {"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0}, @@ -62,14 +65,21 @@ static struct poptOption long_options[] = { {"all-events", '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, 0, OPT_USERSPACE, 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}, - {"marker", 0, POPT_ARG_NONE, 0, OPT_MARKER, 0, 0}, - {"probe", 0, POPT_ARG_STRING, 0, OPT_PROBE, 0, 0}, - {"function", 0, POPT_ARG_STRING, 0, OPT_FUNCTION, 0, 0}, - {"function:entry", 0, POPT_ARG_STRING, 0, OPT_FUNCTION_ENTRY, 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} }; @@ -91,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"); @@ -99,9 +110,11 @@ 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"); - fprintf(ofp, " --marker User-space marker (deprecated)\n"); +#endif + fprintf(ofp, " --syscall System call event\n"); fprintf(ofp, "\n"); } @@ -179,7 +192,7 @@ end: * * Enabling event using the lttng API. */ -static int enable_events(void) +static int enable_events(char *session_name) { int err, ret = CMD_SUCCESS; char *event_name, *channel_name = NULL; @@ -196,36 +209,69 @@ static int enable_events(void) channel_name = opt_channel_name; } + if (opt_kernel && opt_userspace) { + MSG("Choose only one of --kernel or --userspace"); + 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 + */ + dom.type = LTTNG_DOMAIN_UST; + } + + handle = lttng_create_handle(session_name, &dom); + if (handle == NULL) { + ret = -1; + goto error; + } if (opt_enable_all) { - if (set_session_name(opt_session_name) < 0) { - ret = CMD_ERROR; + /* Default setup for enable all */ + ev.name[0] = '\0'; + ev.type = opt_event_type; + + ret = lttng_enable_event(handle, &ev, channel_name); + if (ret < 0) { goto error; } - if (opt_kernel) { - ret = lttng_enable_event(&dom, NULL, channel_name); - if (ret == 0) { - MSG("All kernel events are enabled in channel %s", 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); + break; + case LTTNG_EVENT_SYSCALL: + if (opt_kernel) { + MSG("All kernel system calls are enabled in channel %s", + channel_name); } + break; + case LTTNG_EVENT_ALL: + MSG("All %s events are enabled in channel %s", + opt_kernel ? "kernel" : "UST", channel_name); + break; + default: + /* + * We should not be here since + * lttng_enable_event should have failed on the + * event type. + */ goto error; } - - /* TODO: User-space tracer */ + goto end; } /* Strip event list */ event_name = strtok(opt_event_list, ","); while (event_name != NULL) { - if (set_session_name(opt_session_name) < 0) { - ret = CMD_ERROR; - goto error; - } - /* Kernel tracer action */ if (opt_kernel) { DBG("Enabling kernel event %s for channel %s", @@ -236,6 +282,9 @@ static int enable_events(void) ev.type = opt_event_type; switch (opt_event_type) { + case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */ + ev.type = LTTNG_EVENT_TRACEPOINT; + /* Fall-through */ case LTTNG_EVENT_TRACEPOINT: break; case LTTNG_EVENT_PROBE: @@ -260,24 +309,59 @@ static int enable_events(void) 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; default: ret = CMD_NOT_IMPLEMENTED; goto error; } - ret = lttng_enable_event(&dom, &ev, channel_name); + 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: Waiting on lttng UST 2.0 + * TODO: only supporting pid_all tracing for + * now. Should have different domain based on + * opt_pid. */ - if (opt_pid_all) { - } else if (opt_pid != 0) { + if (!opt_pid_all) { + 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; + + switch (opt_event_type) { + case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */ + ev.type = LTTNG_EVENT_TRACEPOINT; + /* 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: + case LTTNG_EVENT_SYSCALL: + default: + 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); } - ret = CMD_NOT_IMPLEMENTED; - goto error; } else { ERR("Please specify a tracer (--kernel or --userspace)"); goto error; @@ -287,10 +371,13 @@ static int enable_events(void) event_name = strtok(NULL, ","); } +end: error: if (opt_channel_name == NULL) { free(channel_name); } + lttng_destroy_handle(handle); + return ret; } @@ -303,12 +390,13 @@ int cmd_enable_events(int argc, const char **argv) { int opt, ret; static poptContext pc; + char *session_name = NULL; pc = poptGetContext(NULL, argc, argv, long_options, 0); poptReadDefaultConfig(pc, 0); /* Default event type */ - opt_event_type = LTTNG_EVENT_TRACEPOINT; + opt_event_type = LTTNG_EVENT_ALL; while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { @@ -316,27 +404,26 @@ int cmd_enable_events(int argc, const char **argv) usage(stderr); ret = CMD_SUCCESS; goto end; - case OPT_USERSPACE: - opt_userspace = 1; - opt_cmd_name = poptGetOptArg(pc); - break; 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; - opt_probe = poptGetOptArg(pc); break; case OPT_FUNCTION: opt_event_type = LTTNG_EVENT_FUNCTION; - opt_function = poptGetOptArg(pc); break; case OPT_FUNCTION_ENTRY: opt_event_type = LTTNG_EVENT_FUNCTION_ENTRY; - opt_function_entry_symbol = poptGetOptArg(pc); + break; + case OPT_SYSCALL: + opt_event_type = LTTNG_EVENT_SYSCALL; + break; + case OPT_USERSPACE: + opt_userspace = 1; + break; + case OPT_TRACEPOINT_LOGLEVEL: + opt_event_type = LTTNG_EVENT_TRACEPOINT_LOGLEVEL; break; default: usage(stderr); @@ -353,8 +440,22 @@ int cmd_enable_events(int argc, const char **argv) goto end; } - ret = enable_events(); + if (!opt_session_name) { + session_name = get_session_name(); + if (session_name == NULL) { + ret = -1; + goto end; + } + } else { + session_name = opt_session_name; + } + + ret = enable_events(session_name); end: + if (opt_session_name == NULL) { + free(session_name); + } + return ret; }