#include "../command.h"
#include <src/common/sessiond-comm/sessiond-comm.h>
+#if (LTTNG_SYMBOL_NAME_LEN == 256)
+#define LTTNG_SYMBOL_NAME_LEN_SCANF_IS_A_BROKEN_API "255"
+#endif
+
static char *opt_event_list;
static int opt_event_type;
static const char *opt_loglevel;
*/
static int parse_probe_opts(struct lttng_event *ev, char *opt)
{
- int ret;
+ int ret = CMD_SUCCESS;
+ int match;
char s_hex[19];
+#define S_HEX_LEN_SCANF_IS_A_BROKEN_API "18" /* 18 is (19 - 1) (\0 is extra) */
char name[LTTNG_SYMBOL_NAME_LEN];
if (opt == NULL) {
- ret = -1;
+ ret = CMD_ERROR;
goto end;
}
/* Check for symbol+offset */
- ret = sscanf(opt, "%[^'+']+%s", name, s_hex);
- if (ret == 2) {
+ match = sscanf(opt, "%" LTTNG_SYMBOL_NAME_LEN_SCANF_IS_A_BROKEN_API
+ "[^'+']+%" S_HEX_LEN_SCANF_IS_A_BROKEN_API "s", name, s_hex);
+ if (match == 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 (*s_hex == '\0') {
ERR("Invalid probe offset %s", s_hex);
- ret = -1;
+ ret = CMD_ERROR;
goto end;
}
ev->attr.probe.offset = strtoul(s_hex, NULL, 0);
/* Check for symbol */
if (isalpha(name[0])) {
- ret = sscanf(opt, "%s", name);
- if (ret == 1) {
+ match = sscanf(opt, "%" LTTNG_SYMBOL_NAME_LEN_SCANF_IS_A_BROKEN_API "s",
+ name);
+ if (match == 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);
}
/* Check for address */
- ret = sscanf(opt, "%s", s_hex);
- if (ret > 0) {
+ match = sscanf(opt, "%" S_HEX_LEN_SCANF_IS_A_BROKEN_API "s", s_hex);
+ if (match > 0) {
if (*s_hex == '\0') {
ERR("Invalid probe address %s", s_hex);
- ret = -1;
+ ret = CMD_ERROR;
goto end;
}
ev->attr.probe.addr = strtoul(s_hex, NULL, 0);
}
/* No match */
- ret = -1;
+ ret = CMD_ERROR;
end:
return ret;
/* add length of preamble + one for NUL - one for last (missing) comma */
length += strlen(preamble);
- ret = malloc(length);
+ ret = zmalloc(length);
+ if (!ret) {
+ return NULL;
+ }
strncpy(ret, preamble, length);
for (i = 0; i < count; i++) {
strcat(ret, names[i]);
WARN("Kernel events already enabled (channel %s, session %s)",
print_channel_name(channel_name), session_name);
break;
+ case LTTNG_ERR_TRACE_ALREADY_STARTED:
+ {
+ const char *msg = "The command tried to enable an event in a new domain for a session that has already been started once.";
+ ERR("Events: %s (channel %s, session %s)",
+ msg,
+ print_channel_name(channel_name),
+ session_name);
+ ret = CMD_ERROR;
+ break;
+ }
default:
ERR("Events: %s (channel %s, session %s)",
lttng_strerror(ret),
" (channel %s, session %s)",
print_channel_name(channel_name), session_name);
break;
+ case LTTNG_ERR_TRACE_ALREADY_STARTED:
+ {
+ const char *msg = "The command tried to enable an event in a new domain for a session that has already been started once.";
+ ERR("All events: %s (channel %s, session %s, filter \'%s\')",
+ msg,
+ print_channel_name(channel_name),
+ session_name, opt_filter);
+ ret = CMD_ERROR;
+ break;
+ }
default:
ERR("All events: %s (channel %s, session %s, filter \'%s\')",
lttng_strerror(ret),
break;
case LTTNG_EVENT_PROBE:
ret = parse_probe_opts(&ev, opt_probe);
- if (ret < 0) {
+ if (ret) {
ERR("Unable to parse probe options");
ret = 0;
goto error;
break;
case LTTNG_EVENT_FUNCTION:
ret = parse_probe_opts(&ev, opt_function);
- if (ret < 0) {
+ if (ret) {
ERR("Unable to parse function probe options");
ret = 0;
goto error;
event_name,
exclusion_string,
print_channel_name(channel_name), session_name);
+ warn = 1;
+ break;
+ case LTTNG_ERR_TRACE_ALREADY_STARTED:
+ {
+ const char *msg = "The command tried to enable an event in a new domain for a session that has already been started once.";
+ ERR("Event %s%s: %s (channel %s, session %s)", event_name,
+ exclusion_string,
+ msg,
+ print_channel_name(channel_name),
+ session_name);
+ ret = CMD_ERROR;
break;
+ }
default:
ERR("Event %s%s: %s (channel %s, session %s)", event_name,
exclusion_string,
? print_raw_channel_name(channel_name)
: print_channel_name(channel_name),
session_name);
+ warn = 1;
break;
}
- warn = 1;
} else {
MSG("%s event %s%s created in channel %s",
get_domain_str(dom.type), event_name,
exclusion_string,
print_channel_name(channel_name), session_name);
break;
+ case LTTNG_ERR_TRACE_ALREADY_STARTED:
+ {
+ const char *msg = "The command tried to enable an event in a new domain for a session that has already been started once.";
+ ERR("Event %s%s: %s (channel %s, session %s, filter \'%s\')", ev.name,
+ exclusion_string,
+ msg,
+ print_channel_name(channel_name),
+ session_name, opt_filter);
+ ret = CMD_ERROR;
+ break;
+ }
default:
ERR("Event %s%s: %s (channel %s, session %s, filter \'%s\')", ev.name,
exclusion_string,