*
* 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
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
+#include <inttypes.h>
-#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 int opt_userspace;
static int opt_enable_all;
static pid_t opt_pid;
-static char *opt_kprobe;
+static char *opt_probe;
static char *opt_function_symbol;
static char *opt_channel_name;
OPT_USERSPACE,
OPT_TRACEPOINT,
OPT_MARKER,
- OPT_KPROBE,
+ OPT_PROBE,
OPT_FUNCTION,
};
{"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},
{0, 0, 0, 0, 0, 0, 0}
};
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, " --probe [addr | 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, " --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) {
}
/* 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);
+ 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;
}
- ev->attr.kprobe.offset = hex;
- DBG("kprobe offset %lu", ev->attr.kprobe.offset);
+ ev->attr.probe.offset = strtoul(s_hex, NULL, 0);
+ DBG("probe offset %" PRIu64, ev->attr.probe.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;
}
- ev->attr.kprobe.addr = hex;
- DBG("kprobe addr %lu", ev->attr.kprobe.addr);
+ ev->attr.probe.addr = strtoul(s_hex, NULL, 0);
+ DBG("probe addr %" PRIu64, ev->attr.probe.addr);
goto error;
}
int err, ret = CMD_SUCCESS;
char *event_name, *channel_name = NULL;
struct lttng_event ev;
+ struct lttng_domain dom;
if (set_session_name(opt_session_name) < 0) {
ret = CMD_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);
- if (ret < 0) {
- ERR("Unable to find event %s", ev.name);
- }
+ case LTTNG_EVENT_TRACEPOINT:
break;
- case LTTNG_EVENT_KPROBES:
- ret = parse_kprobe_opts(&ev, opt_kprobe);
+ case LTTNG_EVENT_PROBE:
+ ret = parse_probe_opts(&ev, opt_probe);
if (ret < 0) {
- ERR("Unable to parse kprobe options");
+ ERR("Unable to parse 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);
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 */
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 = 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;
projects / lttng-tools.git / blobdiff