X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_events.c;h=dd1a049288c55807ce682fa0faf406d67797a07b;hp=ce8d6024155e6dea7c7a2b696ac60cf521e48fe0;hb=5edd7e09e892604b00ca937c0f1bc887bb5a842c;hpb=ec188088b77f0ac753ca592f9c1cf46f219ec7dd diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c index ce8d60241..dd1a04928 100644 --- a/lttng/commands/enable_events.c +++ b/lttng/commands/enable_events.c @@ -3,8 +3,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * as published by the Free Software Foundation; only version 2 + * of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -24,33 +24,40 @@ #include #include #include +#include +#include -#include "cmd.h" -#include "conf.h" -#include "utils.h" +#include "../cmd.h" +#include "../conf.h" +#include "../utils.h" 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_kprobe; -static char *opt_function_symbol; +static char *opt_probe; +static char *opt_function; +static char *opt_function_entry_symbol; static char *opt_channel_name; enum { OPT_HELP = 1, - OPT_USERSPACE, OPT_TRACEPOINT, OPT_MARKER, - OPT_KPROBE, + OPT_PROBE, OPT_FUNCTION, + OPT_FUNCTION_ENTRY, + OPT_SYSCALL, + OPT_USERSPACE, }; +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}, @@ -58,13 +65,15 @@ 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}, - {"kprobe", 0, POPT_ARG_STRING, 0, OPT_KPROBE, 0, 0}, - {"function", 0, POPT_ARG_STRING, 0, OPT_FUNCTION, 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}, + {"syscall", 0, POPT_ARG_NONE, 0, OPT_SYSCALL, 0, 0}, {0, 0, 0, 0, 0, 0, 0} }; @@ -86,61 +95,87 @@ static void usage(FILE *ofp) fprintf(ofp, "\n"); fprintf(ofp, "Event options:\n"); fprintf(ofp, " --tracepoint Tracepoint event (default)\n"); - fprintf(ofp, " --kprobe [addr | symbol+offset]\n"); - fprintf(ofp, " Kernel Kprobe. (addr or offset can be base 8,10 and 16)\n"); - fprintf(ofp, " --function SYMBOL Function tracer event\n"); + fprintf(ofp, " --probe [addr | symbol | symbol+offset]\n"); + fprintf(ofp, " Dynamic probe.\n"); + fprintf(ofp, " Addr and offset can be octal (0NNN...),\n"); + fprintf(ofp, " decimal (NNN...) or hexadecimal (0xNNN...)\n"); + fprintf(ofp, " --function [addr | symbol | symbol+offset]\n"); + 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"); + fprintf(ofp, " --function:entry symbol\n"); + fprintf(ofp, " Function tracer event\n"); + fprintf(ofp, " --syscall System call event\n"); fprintf(ofp, " --marker User-space marker (deprecated)\n"); fprintf(ofp, "\n"); } /* - * parse_kprobe_addr + * parse_probe_addr * - * Parse kprobe options. + * Parse probe options. */ -static int parse_kprobe_opts(struct lttng_event *ev, char *opt) +static int parse_probe_opts(struct lttng_event *ev, char *opt) { int ret; - uint64_t hex; + char s_hex[19]; char name[LTTNG_SYMBOL_NAME_LEN]; if (opt == NULL) { ret = -1; - goto error; + goto end; } /* Check for symbol+offset */ - ret = sscanf(opt, "%[^'+']+%li", name, &hex); + ret = sscanf(opt, "%[^'+']+%s", name, s_hex); if (ret == 2) { - strncpy(ev->attr.kprobe.symbol_name, name, LTTNG_SYMBOL_NAME_LEN); - DBG("kprobe symbol %s", ev->attr.kprobe.symbol_name); - if (hex == 0) { - ERR("Invalid kprobe offset %lu", hex); + strncpy(ev->attr.probe.symbol_name, name, LTTNG_SYMBOL_NAME_LEN); + ev->attr.probe.symbol_name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; + DBG("probe symbol %s", ev->attr.probe.symbol_name); + if (strlen(s_hex) == 0) { + ERR("Invalid probe offset %s", s_hex); ret = -1; - goto error; + goto end; + } + ev->attr.probe.offset = strtoul(s_hex, NULL, 0); + DBG("probe offset %" PRIu64, ev->attr.probe.offset); + ev->attr.probe.addr = 0; + goto end; + } + + /* Check for symbol */ + if (isalpha(name[0])) { + ret = sscanf(opt, "%s", name); + if (ret == 1) { + strncpy(ev->attr.probe.symbol_name, name, LTTNG_SYMBOL_NAME_LEN); + ev->attr.probe.symbol_name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; + DBG("probe symbol %s", ev->attr.probe.symbol_name); + ev->attr.probe.offset = 0; + DBG("probe offset %" PRIu64, ev->attr.probe.offset); + ev->attr.probe.addr = 0; + goto end; } - ev->attr.kprobe.offset = hex; - DBG("kprobe offset %lu", ev->attr.kprobe.offset); - goto error; } /* Check for address */ - ret = sscanf(opt, "%li", &hex); + ret = sscanf(opt, "%s", s_hex); if (ret > 0) { - if (hex == 0) { - ERR("Invalid kprobe address %lu", hex); + if (strlen(s_hex) == 0) { + ERR("Invalid probe address %s", s_hex); ret = -1; - goto error; + goto end; } - ev->attr.kprobe.addr = hex; - DBG("kprobe addr %lu", ev->attr.kprobe.addr); - goto error; + ev->attr.probe.addr = strtoul(s_hex, NULL, 0); + DBG("probe addr %" PRIu64, ev->attr.probe.addr); + ev->attr.probe.offset = 0; + memset(ev->attr.probe.symbol_name, 0, LTTNG_SYMBOL_NAME_LEN); + goto end; } /* No match */ ret = -1; -error: +end: return ret; } @@ -149,16 +184,12 @@ error: * * 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; struct lttng_event ev; - - if (set_session_name(opt_session_name) < 0) { - ret = CMD_ERROR; - goto error; - } + struct lttng_domain dom; if (opt_channel_name == NULL) { err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME); @@ -170,13 +201,64 @@ 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 (opt_kernel) { - ret = lttng_kernel_enable_event(NULL, channel_name); + /* 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; } - /* TODO: User-space tracer */ + 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; + } + goto end; } /* Strip event list */ @@ -188,48 +270,89 @@ static int enable_events(void) 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_TRACEPOINTS: - ret = lttng_kernel_enable_event(&ev, channel_name); + case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */ + ev.type = LTTNG_EVENT_TRACEPOINT; + /* Fall-through */ + case LTTNG_EVENT_TRACEPOINT: + break; + case LTTNG_EVENT_PROBE: + ret = parse_probe_opts(&ev, opt_probe); if (ret < 0) { - ERR("Unable to find event %s", ev.name); + ERR("Unable to parse probe options"); + ret = 0; + goto error; } break; - case LTTNG_EVENT_KPROBES: - ret = parse_kprobe_opts(&ev, opt_kprobe); + case LTTNG_EVENT_FUNCTION: + ret = parse_probe_opts(&ev, opt_function); if (ret < 0) { - ERR("Unable to parse kprobe options"); + ERR("Unable to parse function probe options"); ret = 0; goto error; } - - ret = lttng_kernel_enable_event(&ev, channel_name); break; - case LTTNG_EVENT_FUNCTION: - strncpy(ev.attr.ftrace.symbol_name, opt_function_symbol, LTTNG_SYMBOL_NAME_LEN); - ret = lttng_kernel_enable_event(&ev, channel_name); + case LTTNG_EVENT_FUNCTION_ENTRY: + 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; default: ret = CMD_NOT_IMPLEMENTED; goto error; } - if (ret > 0) { + 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_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 user-space)"); + ERR("Please specify a tracer (--kernel or --userspace)"); goto error; } @@ -237,10 +360,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; } @@ -253,12 +379,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_KERNEL_TRACEPOINTS; + opt_event_type = LTTNG_EVENT_ALL; while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { @@ -266,23 +393,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_TRACEPOINTS; + opt_event_type = LTTNG_EVENT_TRACEPOINT; break; case OPT_MARKER: ret = CMD_NOT_IMPLEMENTED; goto end; - case OPT_KPROBE: - opt_event_type = LTTNG_EVENT_KPROBES; - opt_kprobe = poptGetOptArg(pc); + case OPT_PROBE: + opt_event_type = LTTNG_EVENT_PROBE; break; case OPT_FUNCTION: opt_event_type = LTTNG_EVENT_FUNCTION; - opt_function_symbol = poptGetOptArg(pc); + break; + case OPT_FUNCTION_ENTRY: + opt_event_type = LTTNG_EVENT_FUNCTION_ENTRY; + break; + case OPT_SYSCALL: + opt_event_type = LTTNG_EVENT_SYSCALL; + break; + case OPT_USERSPACE: + opt_userspace = 1; break; default: usage(stderr); @@ -299,8 +429,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; }