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, "%[^'+']+%" SCNu64, name, &hex);
+ ret = sscanf(opt, "%[^'+']+%s", name, s_hex);
if (ret == 2) {
strncpy(ev->attr.probe.symbol_name, name, LTTNG_SYMBOL_NAME_LEN);
DBG("probe symbol %s", ev->attr.probe.symbol_name);
- if (hex == 0) {
- ERR("Invalid probe offset %" PRIu64, hex);
+ if (strlen(s_hex) == 0) {
+ ERR("Invalid probe offset %s", s_hex);
ret = -1;
goto error;
}
- ev->attr.probe.offset = hex;
+ ev->attr.probe.offset = strtoul(s_hex, NULL, 0);
DBG("probe offset %" PRIu64, ev->attr.probe.offset);
+ ev->attr.probe.addr = 0;
goto error;
}
/* Check for address */
- ret = sscanf(opt, "%" SCNu64, &hex);
+ ret = sscanf(opt, "%s", s_hex);
if (ret > 0) {
- if (hex == 0) {
- ERR("Invalid probe address %" PRIu64, hex);
+ if (strlen(s_hex) == 0) {
+ ERR("Invalid probe address %s", s_hex);
ret = -1;
goto error;
}
- ev->attr.probe.addr = hex;
+ 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;
}
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) {
}
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) {
/* 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",
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 */
/*