X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_events.c;h=5b844e493d13c7d4f44b358a02205dd325df9ef6;hp=b39a9f4616da1b0b3aa91c6602c4a8adfccc66da;hb=8b270bdb4dccf5571180a9906084126e90eec949;hpb=5440dc4282b3186641a8886dc05f6cf5641b5191 diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c index b39a9f461..5b844e493 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,10 +24,12 @@ #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; @@ -38,8 +40,9 @@ static int opt_pid_all; static int opt_userspace; static int opt_enable_all; static pid_t opt_pid; -static char *opt_kprobe_addr; -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 { @@ -47,8 +50,9 @@ enum { OPT_USERSPACE, OPT_TRACEPOINT, OPT_MARKER, - OPT_KPROBE, + OPT_PROBE, OPT_FUNCTION, + OPT_FUNCTION_ENTRY, }; static struct poptOption long_options[] = { @@ -63,8 +67,9 @@ static struct poptOption long_options[] = { {"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}, + {"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} }; @@ -86,12 +91,89 @@ static void usage(FILE *ofp) fprintf(ofp, "\n"); fprintf(ofp, "Event options:\n"); fprintf(ofp, " --tracepoint Tracepoint event (default)\n"); - fprintf(ofp, " --kprobe ADDR Kernel Kprobe\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, " --marker User-space marker (deprecated)\n"); fprintf(ofp, "\n"); } +/* + * parse_probe_addr + * + * Parse probe options. + */ +static int parse_probe_opts(struct lttng_event *ev, char *opt) +{ + int ret; + char s_hex[19]; + char name[LTTNG_SYMBOL_NAME_LEN]; + + if (opt == NULL) { + ret = -1; + 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 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; + } + } + + /* Check for address */ + ret = sscanf(opt, "%s", s_hex); + if (ret > 0) { + if (strlen(s_hex) == 0) { + ERR("Invalid probe address %s", s_hex); + ret = -1; + 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 end; + } + + /* No match */ + ret = -1; + +end: + return ret; +} + /* * enable_events * @@ -100,13 +182,9 @@ static void usage(FILE *ofp) static int enable_events(void) { int err, ret = CMD_SUCCESS; - char *event_name, *channel_name; + 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); @@ -118,9 +196,22 @@ static int enable_events(void) channel_name = opt_channel_name; } + /* Create lttng domain */ + if (opt_kernel) { + dom.type = LTTNG_DOMAIN_KERNEL; + } + if (opt_enable_all) { + if (set_session_name(opt_session_name) < 0) { + ret = CMD_ERROR; + goto error; + } + if (opt_kernel) { - ret = lttng_kernel_enable_event(NULL, channel_name); + ret = lttng_enable_event(&dom, NULL, channel_name); + if (ret == 0) { + MSG("All kernel events are enabled in channel %s", channel_name); + } goto error; } @@ -130,33 +221,52 @@ 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) { - case LTTNG_EVENT_TRACEPOINTS: - ret = lttng_kernel_enable_event(&ev, channel_name); + case LTTNG_EVENT_TRACEPOINT: break; - case LTTNG_EVENT_KPROBES: - /* FIXME: check addr format */ - ev.attr.kprobe.addr = atoll(opt_kprobe_addr); - ret = lttng_kernel_enable_event(&ev, channel_name); + case LTTNG_EVENT_PROBE: + ret = parse_probe_opts(&ev, opt_probe); + if (ret < 0) { + ERR("Unable to parse probe options"); + ret = 0; + goto error; + } 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); + 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; goto error; } - if (ret > 0) { + ret = lttng_enable_event(&dom, &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 */ @@ -169,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; } @@ -178,6 +288,9 @@ static int enable_events(void) } error: + if (opt_channel_name == NULL) { + free(channel_name); + } return ret; } @@ -195,7 +308,7 @@ int cmd_enable_events(int argc, const char **argv) poptReadDefaultConfig(pc, 0); /* Default event type */ - opt_event_type = LTTNG_KERNEL_TRACEPOINTS; + opt_event_type = LTTNG_EVENT_TRACEPOINT; while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { @@ -208,18 +321,22 @@ int cmd_enable_events(int argc, const char **argv) 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_addr = poptGetOptArg(pc); + 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_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);