*
* 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
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 int opt_enable_all;
static pid_t opt_pid;
-static char *opt_kprobe_addr;
+static char *opt_kprobe;
static char *opt_function_symbol;
static char *opt_channel_name;
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
{"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
+ {"session", 's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
{"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},
fprintf(ofp, "usage: lttng enable-event NAME[,NAME2,...] [options] [event_options]\n");
fprintf(ofp, "\n");
fprintf(ofp, " -h, --help Show this help\n");
+ fprintf(ofp, " -s, --session Apply on session name\n");
fprintf(ofp, " -c, --channel Apply on this channel\n");
fprintf(ofp, " -a, --all-events Enable all tracepoints\n");
fprintf(ofp, " -k, --kernel Apply for the kernel tracer\n");
fprintf(ofp, "\n");
fprintf(ofp, "Event options:\n");
fprintf(ofp, " --tracepoint Tracepoint event (default)\n");
- fprintf(ofp, " --kprobe ADDR Kernel Kprobe\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, " --marker User-space marker (deprecated)\n");
fprintf(ofp, "\n");
}
+/*
+ * parse_kprobe_addr
+ *
+ * Parse kprobe options.
+ */
+static int parse_kprobe_opts(struct lttng_event *ev, char *opt)
+{
+ int ret;
+ uint64_t hex;
+ char name[LTTNG_SYMBOL_NAME_LEN];
+
+ if (opt == NULL) {
+ ret = -1;
+ goto error;
+ }
+
+ /* Check for symbol+offset */
+ ret = sscanf(opt, "%[^'+']+%li", name, &hex);
+ if (ret == 2) {
+ strncpy(ev->attr.probe.symbol_name, name, LTTNG_SYMBOL_NAME_LEN);
+ DBG("kprobe symbol %s", ev->attr.probe.symbol_name);
+ if (hex == 0) {
+ ERR("Invalid kprobe offset %lu", hex);
+ ret = -1;
+ goto error;
+ }
+ ev->attr.probe.offset = hex;
+ DBG("kprobe offset %lu", ev->attr.probe.offset);
+ goto error;
+ }
+
+ /* Check for address */
+ ret = sscanf(opt, "%li", &hex);
+ if (ret > 0) {
+ if (hex == 0) {
+ ERR("Invalid kprobe address %lu", hex);
+ ret = -1;
+ goto error;
+ }
+ ev->attr.probe.addr = hex;
+ DBG("kprobe addr %lu", ev->attr.probe.addr);
+ goto error;
+ }
+
+ /* No match */
+ ret = -1;
+
+error:
+ return ret;
+}
+
/*
* enable_events
*
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;
+ struct lttng_domain dom;
- if (set_session_name() < 0) {
+ if (set_session_name(opt_session_name) < 0) {
ret = CMD_ERROR;
goto error;
}
channel_name = opt_channel_name;
}
+ /* Create lttng domain */
+ if (opt_kernel) {
+ dom.type = LTTNG_DOMAIN_KERNEL;
+ }
+
if (opt_enable_all) {
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;
}
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_kprobe_opts(&ev, opt_kprobe);
+ if (ret < 0) {
+ ERR("Unable to parse kprobe 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);
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 (ret < 0) {
+ ERR("Unable to find event %s", ev.name);
}
} else if (opt_userspace) { /* User-space tracer action */
/*
}
error:
+ if (opt_channel_name == NULL) {
+ free(channel_name);
+ }
return ret;
}
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) {
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);
+ opt_event_type = LTTNG_EVENT_PROBE;
+ opt_kprobe = poptGetOptArg(pc);
break;
case OPT_FUNCTION:
opt_event_type = LTTNG_EVENT_FUNCTION;
projects / lttng-tools.git / blobdiff