const char * const config_element_target_pid = "pid_target";
LTTNG_HIDDEN const char * const config_element_rotation_timer_interval = "rotation_schedule_timer_period";
+LTTNG_HIDDEN const char * const config_element_rotation_size = "rotation_schedule_size";
LTTNG_HIDDEN const char * const config_element_rotation_schedule = "rotation_schedule";
const char * const config_domain_type_kernel = "KERNEL";
goto end;
}
- strncpy(xsd_path, base_path, max_path_len);
+ strcpy(xsd_path, base_path);
if (xsd_path[base_path_len - 1] != '/') {
xsd_path[base_path_len++] = '/';
}
- strncpy(xsd_path + base_path_len, DEFAULT_SESSION_CONFIG_XSD_FILENAME,
- max_path_len - base_path_len);
+ strcpy(xsd_path + base_path_len, DEFAULT_SESSION_CONFIG_XSD_FILENAME);
end:
return xsd_path;
}
static
int create_session(const char *name,
- struct lttng_domain *kernel_domain,
- struct lttng_domain *ust_domain,
- struct lttng_domain *jul_domain,
- struct lttng_domain *log4j_domain,
xmlNodePtr output_node,
uint64_t live_timer_interval,
const struct config_load_session_override_attr *overrides)
} else if (!strcmp((const char *) probe_attribute_node->name,
config_element_symbol_name)) {
xmlChar *content;
- size_t name_len;
/* symbol_name */
content = xmlNodeGetContent(probe_attribute_node);
goto end;
}
- name_len = strlen((char *) content);
- if (name_len >= LTTNG_SYMBOL_NAME_LEN) {
- WARN("symbol_name too long.");
+ ret = lttng_strncpy(attr->symbol_name,
+ (const char *) content,
+ LTTNG_SYMBOL_NAME_LEN);
+ if (ret == -1) {
+ ERR("symbol name \"%s\"'s length (%zu) exceeds the maximal permitted length (%d) in session configuration",
+ (const char *) content,
+ strlen((const char *) content),
+ LTTNG_SYMBOL_NAME_LEN);
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
free(content);
goto end;
}
-
- strncpy(attr->symbol_name, (const char *) content, name_len);
free(content);
}
ret = 0;
node = xmlNextElementSibling(node)) {
if (!strcmp((const char *) node->name, config_element_name)) {
xmlChar *content;
- size_t name_len;
/* name */
content = xmlNodeGetContent(node);
goto end;
}
- name_len = strlen((char *) content);
- if (name_len >= LTTNG_SYMBOL_NAME_LEN) {
- WARN("Channel name too long.");
+ ret = lttng_strncpy(event.name,
+ (const char *) content,
+ LTTNG_SYMBOL_NAME_LEN);
+ if (ret == -1) {
+ WARN("Event \"%s\"'s name length (%zu) exceeds the maximal permitted length (%d) in session configuration",
+ (const char *) content,
+ strlen((const char *) content),
+ LTTNG_SYMBOL_NAME_LEN);
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
free(content);
goto end;
}
-
- strncpy(event.name, (const char *) content, name_len);
free(content);
} else if (!strcmp((const char *) node->name,
config_element_enabled)) {
goto end;
}
- strncpy(event.attr.ftrace.symbol_name, (char *) content,
- sym_len);
+ ret = lttng_strncpy(
+ event.attr.ftrace.symbol_name,
+ (char *) content, sym_len);
+ if (ret == -1) {
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ free(content);
+ goto end;
+ }
free(content);
}
}
goto end;
}
}
+ ret = 0;
end:
for (i = 0; i < exclusion_count; i++) {
free(exclusions[i]);
if (!strcmp((const char *) attr_node->name, config_element_name)) {
xmlChar *content;
- size_t name_len;
/* name */
content = xmlNodeGetContent(attr_node);
goto end;
}
- name_len = strlen((char *) content);
- if (name_len >= LTTNG_SYMBOL_NAME_LEN) {
- WARN("Channel name too long.");
+ ret = lttng_strncpy(channel->name,
+ (const char *) content,
+ LTTNG_SYMBOL_NAME_LEN);
+ if (ret == -1) {
+ WARN("Channel \"%s\"'s name length (%zu) exceeds the maximal permitted length (%d) in session configuration",
+ (const char *) content,
+ strlen((const char *) content),
+ LTTNG_SYMBOL_NAME_LEN);
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
free(content);
goto end;
}
-
- strncpy(channel->name, (const char *) content, name_len);
free(content);
} else if (!strcmp((const char *) attr_node->name,
config_element_enabled)) {
} else if (!strcmp((const char *) perf_attr_node->name,
config_element_name)) {
xmlChar *content;
- size_t name_len;
/* name */
content = xmlNodeGetContent(perf_attr_node);
goto end;
}
- name_len = strlen((char *) content);
- if (name_len >= LTTNG_SYMBOL_NAME_LEN) {
- WARN("perf context name too long.");
+ ret = lttng_strncpy(context.u.perf_counter.name,
+ (const char *) content,
+ LTTNG_SYMBOL_NAME_LEN);
+ if (ret == -1) {
+ WARN("Perf counter \"%s\"'s name length (%zu) exceeds the maximal permitted length (%d) in session configuration",
+ (const char *) content,
+ strlen((const char *) content),
+ LTTNG_SYMBOL_NAME_LEN);
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
free(content);
goto end;
}
-
- strncpy(context.u.perf_counter.name, (const char *) content,
- name_len);
free(content);
}
}
/* create all channels */
for (node = xmlFirstElementChild(channels_node); node;
node = xmlNextElementSibling(node)) {
+ const enum lttng_domain_type original_domain = domain.type;
xmlNodePtr contexts_node = NULL;
xmlNodePtr events_node = NULL;
xmlNodePtr channel_attr_node;
+ /*
+ * Channels of the "agent" types cannot be created directly.
+ * They are meant to be created implicitly through the
+ * activation of events in their domain. However, a user
+ * can override the default channel configuration attributes
+ * by creating the underlying UST channel _before_ enabling
+ * an agent domain event.
+ *
+ * Hence, the channel's type is substituted before the creation
+ * and restored by the time the events are created.
+ */
+ switch (domain.type) {
+ case LTTNG_DOMAIN_JUL:
+ case LTTNG_DOMAIN_LOG4J:
+ case LTTNG_DOMAIN_PYTHON:
+ domain.type = LTTNG_DOMAIN_UST;
+ default:
+ break;
+ }
+
channel = lttng_channel_create(&domain);
if (!channel) {
ret = -1;
goto end;
}
+ /* Restore the original channel domain. */
+ domain.type = original_domain;
+
ret = process_events_node(events_node, handle, channel->name);
if (ret) {
goto end;
{
int ret, started = -1, snapshot_mode = -1;
uint64_t live_timer_interval = UINT64_MAX,
- rotation_timer_interval = 0;
+ rotation_timer_interval = 0,
+ rotation_size = 0;
xmlChar *name = NULL;
xmlChar *shm_path = NULL;
xmlNodePtr domains_node = NULL;
xmlNodePtr output_node = NULL;
xmlNodePtr node;
+ xmlNodePtr attributes_child;
struct lttng_domain *kernel_domain = NULL;
struct lttng_domain *ust_domain = NULL;
struct lttng_domain *jul_domain = NULL;
} else {
/*
* attributes, snapshot_mode, live_timer_interval, rotation_size,
- * rotation_timer_interval. */
- xmlNodePtr attributes_child =
- xmlFirstElementChild(node);
-
- if (!strcmp((const char *) attributes_child->name,
- config_element_snapshot_mode)) {
- /* snapshot_mode */
- xmlChar *snapshot_mode_content =
- xmlNodeGetContent(attributes_child);
- if (!snapshot_mode_content) {
- ret = -LTTNG_ERR_NOMEM;
- goto error;
- }
+ * rotation_timer_interval.
+ */
+ for (attributes_child = xmlFirstElementChild(node); attributes_child;
+ attributes_child = xmlNextElementSibling(attributes_child)) {
+ if (!strcmp((const char *) attributes_child->name,
+ config_element_snapshot_mode)) {
+ /* snapshot_mode */
+ xmlChar *snapshot_mode_content =
+ xmlNodeGetContent(attributes_child);
+ if (!snapshot_mode_content) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
- ret = parse_bool(snapshot_mode_content, &snapshot_mode);
- free(snapshot_mode_content);
- if (ret) {
- ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
- goto error;
- }
- } else if (!strcmp((const char *) attributes_child->name,
- config_element_live_timer_interval)) {
- /* live_timer_interval */
- xmlChar *timer_interval_content =
- xmlNodeGetContent(attributes_child);
- if (!timer_interval_content) {
- ret = -LTTNG_ERR_NOMEM;
- goto error;
- }
+ ret = parse_bool(snapshot_mode_content, &snapshot_mode);
+ free(snapshot_mode_content);
+ if (ret) {
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto error;
+ }
+ } else if (!strcmp((const char *) attributes_child->name,
+ config_element_live_timer_interval)) {
+ /* live_timer_interval */
+ xmlChar *timer_interval_content =
+ xmlNodeGetContent(attributes_child);
+ if (!timer_interval_content) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
- ret = parse_uint(timer_interval_content, &live_timer_interval);
- free(timer_interval_content);
- if (ret) {
- ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
- goto error;
+ ret = parse_uint(timer_interval_content, &live_timer_interval);
+ free(timer_interval_content);
+ if (ret) {
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto error;
+ }
}
- }
- if (!strcmp((const char *) attributes_child->name,
- config_element_rotation_timer_interval)) {
- /* rotation_timer_interval */
- xmlChar *timer_interval_content =
- xmlNodeGetContent(attributes_child);
- if (!timer_interval_content) {
- ret = -LTTNG_ERR_NOMEM;
- goto error;
+ if (!strcmp((const char *) attributes_child->name,
+ config_element_rotation_timer_interval)) {
+ /* rotation_timer_interval */
+ xmlChar *timer_interval_content =
+ xmlNodeGetContent(attributes_child);
+ if (!timer_interval_content) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
+
+ ret = parse_uint(timer_interval_content, &rotation_timer_interval);
+ free(timer_interval_content);
+ if (ret) {
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto error;
+ }
}
+ if (!strcmp((const char *) attributes_child->name,
+ config_element_rotation_size)) {
+ /* rotation_size */
+ xmlChar *rotation_size_content =
+ xmlNodeGetContent(attributes_child);
+ if (!rotation_size_content) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
- ret = parse_uint(timer_interval_content, &rotation_timer_interval);
- free(timer_interval_content);
- if (ret) {
- ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
- goto error;
+ ret = parse_uint(rotation_size_content, &rotation_size);
+ free(rotation_size_content);
+ if (ret) {
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto error;
+ }
}
}
}
overrides);
} else if (live_timer_interval &&
live_timer_interval != UINT64_MAX) {
- ret = create_session((const char *) name, kernel_domain,
- ust_domain, jul_domain, log4j_domain,
+ ret = create_session((const char *) name,
output_node, live_timer_interval, overrides);
} else {
/* regular session */
- ret = create_session((const char *) name, kernel_domain,
- ust_domain, jul_domain, log4j_domain,
+ ret = create_session((const char *) name,
output_node, UINT64_MAX, overrides);
}
if (ret) {
}
}
- if (rotation_timer_interval) {
+ if (rotation_timer_interval || rotation_size) {
struct lttng_rotation_schedule_attr *rotation_attr = lttng_rotation_schedule_attr_create();
if (!rotation_attr) {
}
lttng_rotation_schedule_attr_set_timer_period(rotation_attr,
rotation_timer_interval);
+ lttng_rotation_schedule_attr_set_size(rotation_attr, rotation_size);
ret = lttng_rotation_set_schedule(rotation_attr);
lttng_rotation_schedule_attr_destroy(rotation_attr);
if (ret) {
projects / lttng-tools.git / blobdiff