#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
+#include <inttypes.h>
+#include <ctype.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_function_symbol;
+static char *opt_probe;
+static char *opt_function;
+static char *opt_function_entry_symbol;
static char *opt_channel_name;
enum {
OPT_USERSPACE,
OPT_TRACEPOINT,
OPT_MARKER,
- OPT_KPROBE,
+ OPT_PROBE,
OPT_FUNCTION,
+ OPT_FUNCTION_ENTRY,
};
+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},
{"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}
};
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, " --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.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);
+ 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.probe.offset = hex;
- DBG("kprobe offset %lu", 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;
+ goto end;
}
- ev->attr.probe.addr = hex;
- DBG("kprobe addr %lu", ev->attr.probe.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;
}
*
* 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;
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) {
dom.type = LTTNG_DOMAIN_KERNEL;
}
+ handle = lttng_create_handle(session_name, &dom);
+ if (handle == NULL) {
+ ret = -1;
+ goto error;
+ }
+
if (opt_enable_all) {
if (opt_kernel) {
- ret = lttng_enable_event(&dom, NULL, channel_name);
- if (ret == 0) {
- MSG("All kernel events are enabled in channel %s", channel_name);
- }
+ ret = lttng_enable_event(handle, NULL, channel_name);
+ if (ret == 0) {
+ MSG("All kernel events are enabled in channel %s", channel_name);
+ }
goto error;
}
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_TRACEPOINT:
break;
case LTTNG_EVENT_PROBE:
- ret = parse_kprobe_opts(&ev, opt_kprobe);
+ 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;
}
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;
goto error;
}
- ret = lttng_enable_event(&dom, &ev, channel_name);
+ 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 (ret < 0) {
- ERR("Unable to find event %s", ev.name);
}
} else if (opt_userspace) { /* User-space tracer action */
/*
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;
}
if (opt_channel_name == NULL) {
free(channel_name);
}
+ lttng_destroy_handle(handle);
+
return ret;
}
{
int opt, ret;
static poptContext pc;
+ char *session_name = NULL;
pc = poptGetContext(NULL, argc, argv, long_options, 0);
poptReadDefaultConfig(pc, 0);
case OPT_MARKER:
ret = CMD_NOT_IMPLEMENTED;
goto end;
- case OPT_KPROBE:
+ case OPT_PROBE:
opt_event_type = LTTNG_EVENT_PROBE;
- opt_kprobe = poptGetOptArg(pc);
+ 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);
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;
}
projects / lttng-tools.git / blobdiff