X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_events.c;h=5b844e493d13c7d4f44b358a02205dd325df9ef6;hb=99497cd03fb27fd2416a88d80292a0cc5647bff2;hp=f5e24315629e3b02b918eb4000291a4b7f4f54de;hpb=3000dc785dc25a265485f7b3f7bc3c023d2e67dd;p=lttng-tools.git diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c index f5e243156..5b844e493 100644 --- a/lttng/commands/enable_events.c +++ b/lttng/commands/enable_events.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "../cmd.h" #include "../conf.h" @@ -40,7 +41,8 @@ static int opt_userspace; static int opt_enable_all; static pid_t opt_pid; static char *opt_probe; -static char *opt_function_symbol; +static char *opt_function; +static char *opt_function_entry_symbol; static char *opt_channel_name; enum { @@ -50,6 +52,7 @@ enum { OPT_MARKER, OPT_PROBE, OPT_FUNCTION, + OPT_FUNCTION_ENTRY, }; static struct poptOption long_options[] = { @@ -66,6 +69,7 @@ static struct poptOption long_options[] = { {"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}, {0, 0, 0, 0, 0, 0, 0} }; @@ -87,11 +91,16 @@ static void usage(FILE *ofp) fprintf(ofp, "\n"); fprintf(ofp, "Event options:\n"); fprintf(ofp, " --tracepoint Tracepoint event (default)\n"); - fprintf(ofp, " --probe [addr | symbol+offset]\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 SYMBOL Function tracer event\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, " --marker User-space marker (deprecated)\n"); fprintf(ofp, "\n"); } @@ -109,23 +118,38 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt) if (opt == NULL) { ret = -1; - goto error; + goto end; } /* Check for symbol+offset */ ret = sscanf(opt, "%[^'+']+%s", name, s_hex); if (ret == 2) { 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 error; + 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; + } } /* Check for address */ @@ -134,19 +158,19 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt) if (strlen(s_hex) == 0) { ERR("Invalid probe address %s", s_hex); ret = -1; - goto error; + goto end; } 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 error; + goto end; } /* No match */ ret = -1; -error: +end: return ret; } @@ -162,11 +186,6 @@ static int enable_events(void) struct lttng_event ev; struct lttng_domain dom; - if (set_session_name(opt_session_name) < 0) { - ret = CMD_ERROR; - goto error; - } - if (opt_channel_name == NULL) { err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME); if (err < 0) { @@ -183,6 +202,11 @@ static int enable_events(void) } if (opt_enable_all) { + if (set_session_name(opt_session_name) < 0) { + ret = CMD_ERROR; + goto error; + } + if (opt_kernel) { ret = lttng_enable_event(&dom, NULL, channel_name); if (ret == 0) { @@ -197,12 +221,18 @@ static int enable_events(void) /* 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", 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) { @@ -217,7 +247,18 @@ static int enable_events(void) } break; case LTTNG_EVENT_FUNCTION: - strncpy(ev.attr.ftrace.symbol_name, opt_function_symbol, LTTNG_SYMBOL_NAME_LEN); + ret = parse_probe_opts(&ev, opt_function); + if (ret < 0) { + ERR("Unable to parse function probe options"); + ret = 0; + goto error; + } + break; + 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; default: ret = CMD_NOT_IMPLEMENTED; @@ -238,7 +279,7 @@ static int enable_events(void) 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; } @@ -291,7 +332,11 @@ int cmd_enable_events(int argc, const char **argv) break; case OPT_FUNCTION: opt_event_type = LTTNG_EVENT_FUNCTION; - opt_function_symbol = poptGetOptArg(pc); + opt_function = poptGetOptArg(pc); + break; + case OPT_FUNCTION_ENTRY: + opt_event_type = LTTNG_EVENT_FUNCTION_ENTRY; + opt_function_entry_symbol = poptGetOptArg(pc); break; default: usage(stderr);