#include <common/error.h>
#include <common/macros.h>
#include <common/utils.h>
+#include <common/dynamic-buffer.h>
#include <common/compat/getenv.h>
#include <lttng/lttng-error.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <lttng/lttng.h>
#include <lttng/snapshot.h>
+#include <lttng/rotation.h>
+#include <lttng/userspace-probe.h>
#include "session-config.h"
#include "config-internal.h"
+#define CONFIG_USERSPACE_PROBE_LOOKUP_METHOD_NAME_MAX_LEN 7
+
struct handler_filter_args {
const char* section;
config_entry_handler_cb handler;
const char * const config_element_symbol_name = "symbol_name";
const char * const config_element_address = "address";
const char * const config_element_offset = "offset";
+
+LTTNG_HIDDEN const char * const config_element_userspace_probe_lookup = "lookup_method";
+LTTNG_HIDDEN const char * const config_element_userspace_probe_lookup_function_default = "DEFAULT";
+LTTNG_HIDDEN const char * const config_element_userspace_probe_lookup_function_elf = "ELF";
+LTTNG_HIDDEN const char * const config_element_userspace_probe_lookup_tracepoint_sdt = "SDT";
+LTTNG_HIDDEN const char * const config_element_userspace_probe_location_binary_path = "binary_path";
+LTTNG_HIDDEN const char * const config_element_userspace_probe_function_attributes = "userspace_probe_function_attributes";
+LTTNG_HIDDEN const char * const config_element_userspace_probe_function_location_function_name = "function_name";
+LTTNG_HIDDEN const char * const config_element_userspace_probe_tracepoint_attributes = "userspace_probe_tracepoint_attributes";
+LTTNG_HIDDEN const char * const config_element_userspace_probe_tracepoint_location_provider_name = "provider_name";
+LTTNG_HIDDEN const char * const config_element_userspace_probe_tracepoint_location_probe_name = "probe_name";
+
const char * const config_element_name = "name";
const char * const config_element_enabled = "enabled";
const char * const config_element_overwrite_mode = "overwrite_mode";
const char * const config_element_num_subbuf = "subbuffer_count";
const char * const config_element_switch_timer_interval = "switch_timer_interval";
const char * const config_element_read_timer_interval = "read_timer_interval";
+LTTNG_HIDDEN const char * const config_element_monitor_timer_interval = "monitor_timer_interval";
+LTTNG_HIDDEN const char * const config_element_blocking_timeout = "blocking_timeout";
const char * const config_element_output = "output";
const char * const config_element_output_type = "output_type";
const char * const config_element_tracefile_size = "tracefile_size";
const char * const config_element_targets = "targets";
const char * const config_element_target_pid = "pid_target";
+LTTNG_HIDDEN const char * const config_element_rotation_schedules = "rotation_schedules";
+LTTNG_HIDDEN const char * const config_element_rotation_schedule_periodic = "periodic";
+LTTNG_HIDDEN const char * const config_element_rotation_schedule_periodic_time_us = "time_us";
+LTTNG_HIDDEN const char * const config_element_rotation_schedule_size_threshold = "size_threshold";
+LTTNG_HIDDEN const char * const config_element_rotation_schedule_size_threshold_bytes = "bytes";
+
const char * const config_domain_type_kernel = "KERNEL";
const char * const config_domain_type_ust = "UST";
const char * const config_domain_type_jul = "JUL";
const char * const config_event_type_all = "ALL";
const char * const config_event_type_tracepoint = "TRACEPOINT";
const char * const config_event_type_probe = "PROBE";
+LTTNG_HIDDEN const char * const config_event_type_userspace_probe = "USERSPACE_PROBE";
const char * const config_event_type_function = "FUNCTION";
const char * const config_event_type_function_entry = "FUNCTION_ENTRY";
const char * const config_event_type_noop = "NOOP";
LTTNG_HIDDEN const char * const config_event_context_preemptible = "PREEMPTIBLE";
LTTNG_HIDDEN const char * const config_event_context_need_reschedule = "NEED_RESCHEDULE";
LTTNG_HIDDEN const char * const config_event_context_migratable = "MIGRATABLE";
+LTTNG_HIDDEN const char * const config_event_context_callstack_user= "CALLSTACK_USER";
+LTTNG_HIDDEN const char * const config_event_context_callstack_kernel = "CALLSTACK_KERNEL";
+LTTNG_HIDDEN const char * const config_event_context_cgroup_ns = "CGROUP_NS";
+LTTNG_HIDDEN const char * const config_event_context_ipc_ns = "IPC_NS";
+LTTNG_HIDDEN const char * const config_event_context_mnt_ns = "MNT_NS";
+LTTNG_HIDDEN const char * const config_event_context_net_ns = "NET_NS";
+LTTNG_HIDDEN const char * const config_event_context_pid_ns = "PID_NS";
+LTTNG_HIDDEN const char * const config_event_context_user_ns = "USER_NS";
+LTTNG_HIDDEN const char * const config_event_context_uts_ns = "UTS_NS";
+LTTNG_HIDDEN const char * const config_event_context_uid = "UID";
+LTTNG_HIDDEN const char * const config_event_context_euid = "EUID";
+LTTNG_HIDDEN const char * const config_event_context_suid = "SUID";
+LTTNG_HIDDEN const char * const config_event_context_gid = "GID";
+LTTNG_HIDDEN const char * const config_event_context_egid = "EGID";
+LTTNG_HIDDEN const char * const config_event_context_sgid = "SGID";
+LTTNG_HIDDEN const char * const config_event_context_vuid = "VUID";
+LTTNG_HIDDEN const char * const config_event_context_veuid = "VEUID";
+LTTNG_HIDDEN const char * const config_event_context_vsuid = "VSUID";
+LTTNG_HIDDEN const char * const config_event_context_vgid = "VGID";
+LTTNG_HIDDEN const char * const config_event_context_vegid = "VEGID";
+LTTNG_HIDDEN const char * const config_event_context_vsgid = "VSGID";
/* Deprecated symbols */
const char * const config_element_perf;
config_entry_handler_cb handler, void *user_data)
{
int ret = 0;
- char *path;
+ const char *path;
FILE *config_file = NULL;
struct handler_filter_args filter = { section, handler, user_data };
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;
}
ret = LTTNG_EVENT_TRACEPOINT;
} else if (!strcmp((char *) event_type, config_event_type_probe)) {
ret = LTTNG_EVENT_PROBE;
+ } else if (!strcmp((char *) event_type,
+ config_event_type_userspace_probe)) {
+ ret = LTTNG_EVENT_USERSPACE_PROBE;
} else if (!strcmp((char *) event_type, config_event_type_function)) {
ret = LTTNG_EVENT_FUNCTION;
} else if (!strcmp((char *) event_type,
- config_event_type_function_entry)) {
+ config_event_type_function_entry)) {
ret = LTTNG_EVENT_FUNCTION_ENTRY;
} else if (!strcmp((char *) event_type, config_event_type_noop)) {
ret = LTTNG_EVENT_NOOP;
} else if (!strcmp((char *) context_type,
config_event_context_migratable)) {
ret = LTTNG_EVENT_CONTEXT_MIGRATABLE;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_callstack_user)) {
+ ret = LTTNG_EVENT_CONTEXT_CALLSTACK_USER;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_callstack_kernel)) {
+ ret = LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_cgroup_ns)) {
+ ret = LTTNG_EVENT_CONTEXT_CGROUP_NS;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_ipc_ns)) {
+ ret = LTTNG_EVENT_CONTEXT_IPC_NS;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_mnt_ns)) {
+ ret = LTTNG_EVENT_CONTEXT_MNT_NS;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_net_ns)) {
+ ret = LTTNG_EVENT_CONTEXT_NET_NS;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_pid_ns)) {
+ ret = LTTNG_EVENT_CONTEXT_PID_NS;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_user_ns)) {
+ ret = LTTNG_EVENT_CONTEXT_USER_NS;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_uts_ns)) {
+ ret = LTTNG_EVENT_CONTEXT_UTS_NS;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_uid)) {
+ ret = LTTNG_EVENT_CONTEXT_UID;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_euid)) {
+ ret = LTTNG_EVENT_CONTEXT_EUID;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_suid)) {
+ ret = LTTNG_EVENT_CONTEXT_SUID;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_gid)) {
+ ret = LTTNG_EVENT_CONTEXT_GID;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_egid)) {
+ ret = LTTNG_EVENT_CONTEXT_EGID;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_sgid)) {
+ ret = LTTNG_EVENT_CONTEXT_SGID;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_vuid)) {
+ ret = LTTNG_EVENT_CONTEXT_VUID;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_veuid)) {
+ ret = LTTNG_EVENT_CONTEXT_VEUID;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_vsuid)) {
+ ret = LTTNG_EVENT_CONTEXT_VSUID;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_vgid)) {
+ ret = LTTNG_EVENT_CONTEXT_VGID;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_vegid)) {
+ ret = LTTNG_EVENT_CONTEXT_VEGID;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_vsgid)) {
+ ret = LTTNG_EVENT_CONTEXT_VSGID;
} else {
goto error;
}
}
static
-int create_snapshot_session(const char *session_name, xmlNodePtr output_node)
+int create_snapshot_session(const char *session_name, xmlNodePtr output_node,
+ const struct config_load_session_override_attr *overrides)
{
int ret;
xmlNodePtr node = NULL;
uint64_t max_size = UINT64_MAX;
struct consumer_output output = { 0 };
struct lttng_snapshot_output *snapshot_output = NULL;
+ const char *control_uri = NULL;
+ const char *data_uri = NULL;
+ const char *path = NULL;
for (node = xmlFirstElementChild(snapshot_output_node); node;
node = xmlNextElementSibling(node)) {
}
}
+ control_uri = output.control_uri;
+ data_uri = output.data_uri;
+ path = output.path;
+
+ if (overrides) {
+ if (overrides->path_url) {
+ path = overrides->path_url;
+ /* Control/data_uri are null */
+ control_uri = NULL;
+ data_uri = NULL;
+ } else {
+ if (overrides->ctrl_url) {
+ control_uri = overrides->ctrl_url;
+ /* path is null */
+ path = NULL;
+ }
+ if (overrides->data_url) {
+ data_uri = overrides->data_url;
+ /* path is null */
+ path = NULL;
+ }
+ }
+ }
+
snapshot_output = lttng_snapshot_output_create();
if (!snapshot_output) {
ret = -LTTNG_ERR_NOMEM;
goto error_snapshot_output;
}
- if (output.path) {
- ret = lttng_snapshot_output_set_ctrl_url(output.path,
+ if (path) {
+ ret = lttng_snapshot_output_set_ctrl_url(path,
snapshot_output);
if (ret) {
goto error_snapshot_output;
}
} else {
- if (output.control_uri) {
- ret = lttng_snapshot_output_set_ctrl_url(output.control_uri,
+ if (control_uri) {
+ ret = lttng_snapshot_output_set_ctrl_url(control_uri,
snapshot_output);
if (ret) {
goto error_snapshot_output;
}
}
- if (output.data_uri) {
- ret = lttng_snapshot_output_set_data_url(output.data_uri,
+ if (data_uri) {
+ ret = lttng_snapshot_output_set_data_url(data_uri,
snapshot_output);
if (ret) {
goto error_snapshot_output;
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)
+ uint64_t live_timer_interval,
+ const struct config_load_session_override_attr *overrides)
{
int ret;
struct consumer_output output = { 0 };
xmlNodePtr consumer_output_node;
+ const char *control_uri = NULL;
+ const char *data_uri = NULL;
+ const char *path = NULL;
assert(name);
}
}
- if (live_timer_interval != UINT64_MAX &&
- !output.control_uri && !output.data_uri) {
+ control_uri = output.control_uri;
+ data_uri = output.data_uri;
+ path = output.path;
+
+ /* Check for override and apply them */
+ if (overrides) {
+ if (overrides->path_url) {
+ path = overrides->path_url;
+ /* control/data_uri are null */;
+ control_uri = NULL;
+ data_uri = NULL;
+ } else {
+ if (overrides->ctrl_url) {
+ control_uri = overrides->ctrl_url;
+ /* path is null */
+ path = NULL;
+ }
+ if (overrides->data_url) {
+ data_uri = overrides->data_url;
+ /* path is null */
+ path = NULL;
+ }
+ }
+ }
+
+
+ if (live_timer_interval != UINT64_MAX && !control_uri && !data_uri) {
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
goto end;
}
- if (output.control_uri || output.data_uri) {
+ if (control_uri || data_uri) {
/* network destination */
if (live_timer_interval && live_timer_interval != UINT64_MAX) {
/*
goto end;
}
- ret = create_session_net_output(name, output.control_uri,
- output.data_uri);
+ ret = create_session_net_output(name, control_uri, data_uri);
if (ret) {
goto end;
}
} else {
/* either local output or no output */
- ret = lttng_create_session(name, output.path);
+ ret = lttng_create_session(name, path);
if (ret) {
goto end;
}
free(output.data_uri);
return ret;
}
+
+static
+struct lttng_userspace_probe_location *
+process_userspace_probe_function_attribute_node(
+ xmlNodePtr attribute_node)
+{
+ xmlNodePtr function_attribute_node;
+ char *function_name = NULL, *binary_path = NULL;
+ struct lttng_userspace_probe_location *location = NULL;
+ struct lttng_userspace_probe_location_lookup_method *lookup_method = NULL;
+
+ /*
+ * Process userspace probe location function attributes. The order of
+ * the fields are not guaranteed so we need to iterate over all fields
+ * and check at the end if everything we need for this location type is
+ * there.
+ */
+ for (function_attribute_node =
+ xmlFirstElementChild(attribute_node);
+ function_attribute_node;
+ function_attribute_node = xmlNextElementSibling(
+ function_attribute_node)) {
+ /* Handle function name, binary path and lookup method. */
+ if (!strcmp((const char *) function_attribute_node->name,
+ config_element_userspace_probe_function_location_function_name)) {
+ function_name = (char *) xmlNodeGetContent(function_attribute_node);
+ if (!function_name) {
+ goto error;
+ }
+ } else if (!strcmp((const char *) function_attribute_node->name,
+ config_element_userspace_probe_location_binary_path)) {
+ binary_path = (char *) xmlNodeGetContent(function_attribute_node);
+ if (!binary_path) {
+ goto error;
+ }
+ } else if (!strcmp((const char *) function_attribute_node->name,
+ config_element_userspace_probe_lookup)) {
+ char *lookup_method_name;
+
+ lookup_method_name = (char *) xmlNodeGetContent(
+ function_attribute_node);
+ if (!lookup_method_name) {
+ goto error;
+ }
+
+ /*
+ * function_default lookup method defaults to
+ * function_elf lookup method at the moment.
+ */
+ if (!strcmp(lookup_method_name, config_element_userspace_probe_lookup_function_elf)
+ || !strcmp(lookup_method_name, config_element_userspace_probe_lookup_function_default)) {
+ lookup_method = lttng_userspace_probe_location_lookup_method_function_elf_create();
+ if (!lookup_method) {
+ PERROR("Error creating function default/ELF lookup method");
+ }
+ } else {
+ WARN("Unknown function lookup method");
+ }
+
+ free(lookup_method_name);
+ if (!lookup_method) {
+ goto error;
+ }
+ } else {
+ goto error;
+ }
+
+ /* Check if all the necessary fields were found. */
+ if (binary_path && function_name && lookup_method) {
+ /* Ownership of lookup_method is transferred. */
+ location =
+ lttng_userspace_probe_location_function_create(
+ binary_path, function_name,
+ lookup_method);
+ lookup_method = NULL;
+ goto error;
+ }
+ }
+error:
+ lttng_userspace_probe_location_lookup_method_destroy(lookup_method);
+ free(binary_path);
+ free(function_name);
+ return location;
+}
+
+static
+struct lttng_userspace_probe_location *
+process_userspace_probe_tracepoint_attribute_node(
+ xmlNodePtr attribute_node)
+{
+ xmlNodePtr tracepoint_attribute_node;
+ char *probe_name = NULL, *provider_name = NULL, *binary_path = NULL;
+ struct lttng_userspace_probe_location *location = NULL;
+ struct lttng_userspace_probe_location_lookup_method *lookup_method = NULL;
+
+ /*
+ * Process userspace probe location tracepoint attributes. The order of
+ * the fields are not guaranteed so we need to iterate over all fields
+ * and check at the end if everything we need for this location type is
+ * there.
+ */
+ for (tracepoint_attribute_node =
+ xmlFirstElementChild(attribute_node); tracepoint_attribute_node;
+ tracepoint_attribute_node = xmlNextElementSibling(
+ tracepoint_attribute_node)) {
+ if (!strcmp((const char *) tracepoint_attribute_node->name,
+ config_element_userspace_probe_tracepoint_location_probe_name)) {
+ probe_name = (char *) xmlNodeGetContent(tracepoint_attribute_node);
+ if (!probe_name) {
+ goto error;
+ }
+ } else if (!strcmp((const char *) tracepoint_attribute_node->name,
+ config_element_userspace_probe_tracepoint_location_provider_name)) {
+ provider_name = (char *) xmlNodeGetContent(tracepoint_attribute_node);
+ if (!provider_name) {
+ goto error;
+ }
+ } else if (!strcmp((const char *) tracepoint_attribute_node->name,
+ config_element_userspace_probe_location_binary_path)) {
+ binary_path = (char *) xmlNodeGetContent(tracepoint_attribute_node);
+ if (!binary_path) {
+ goto error;
+ }
+ } else if (!strcmp((const char *) tracepoint_attribute_node->name,
+ config_element_userspace_probe_lookup)) {
+ char *lookup_method_name;
+
+ lookup_method_name = (char *) xmlNodeGetContent(
+ tracepoint_attribute_node);
+ if (!lookup_method_name) {
+ goto error;
+ }
+
+ if (!strcmp(lookup_method_name,
+ config_element_userspace_probe_lookup_tracepoint_sdt)) {
+ lookup_method =
+ lttng_userspace_probe_location_lookup_method_tracepoint_sdt_create();
+ if (!lookup_method) {
+ PERROR("Error creating tracepoint SDT lookup method");
+ }
+ } else {
+ WARN("Unknown tracepoint lookup method");
+ }
+
+ free(lookup_method_name);
+ if (!lookup_method) {
+ goto error;
+ }
+ } else {
+ WARN("Unknown tracepoint attribute");
+ goto error;
+ }
+
+ /* Check if all the necessary fields were found. */
+ if (binary_path && provider_name && probe_name && lookup_method) {
+ /* Ownership of lookup_method is transferred. */
+ location =
+ lttng_userspace_probe_location_tracepoint_create(
+ binary_path, provider_name,
+ probe_name, lookup_method);
+ lookup_method = NULL;
+ goto error;
+ }
+ }
+error:
+ lttng_userspace_probe_location_lookup_method_destroy(lookup_method);
+ free(binary_path);
+ free(provider_name);
+ free(probe_name);
+ return location;
+}
+
static
int process_probe_attribute_node(xmlNodePtr probe_attribute_node,
struct lttng_event_probe_attr *attr)
} 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;
{
int ret = 0, i;
xmlNodePtr node;
- struct lttng_event event;
+ struct lttng_event *event;
char **exclusions = NULL;
unsigned long exclusion_count = 0;
char *filter_expression = NULL;
assert(handle);
assert(channel_name);
- memset(&event, 0, sizeof(event));
+ event = lttng_event_create();
+ if (!event) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
/* Initialize default log level which varies by domain */
switch (handle->domain.type)
{
case LTTNG_DOMAIN_JUL:
- event.loglevel = LTTNG_LOGLEVEL_JUL_ALL;
+ event->loglevel = LTTNG_LOGLEVEL_JUL_ALL;
break;
case LTTNG_DOMAIN_LOG4J:
- event.loglevel = LTTNG_LOGLEVEL_LOG4J_ALL;
+ event->loglevel = LTTNG_LOGLEVEL_LOG4J_ALL;
break;
case LTTNG_DOMAIN_PYTHON:
- event.loglevel = LTTNG_LOGLEVEL_PYTHON_DEBUG;
+ event->loglevel = LTTNG_LOGLEVEL_PYTHON_DEBUG;
break;
case LTTNG_DOMAIN_UST:
case LTTNG_DOMAIN_KERNEL:
- event.loglevel = LTTNG_LOGLEVEL_DEBUG;
+ event->loglevel = LTTNG_LOGLEVEL_DEBUG;
break;
default:
assert(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;
}
- ret = parse_bool(content, &event.enabled);
+ ret = parse_bool(content, &event->enabled);
free(content);
if (ret) {
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
goto end;
}
- event.type = ret;
+ event->type = ret;
} else if (!strcmp((const char *) node->name,
config_element_loglevel_type)) {
xmlChar *content = xmlNodeGetContent(node);
goto end;
}
- event.loglevel_type = ret;
+ event->loglevel_type = ret;
} else if (!strcmp((const char *) node->name,
config_element_loglevel)) {
xmlChar *content;
goto end;
}
- event.loglevel = loglevel;
+ event->loglevel = loglevel;
} else if (!strcmp((const char *) node->name,
config_element_filter)) {
xmlChar *content =
exclusion_index++;
}
- event.exclusion = 1;
+ event->exclusion = 1;
} else if (!strcmp((const char *) node->name,
config_element_attributes)) {
xmlNodePtr attribute_node = xmlFirstElementChild(node);
goto end;
}
- if (!strcmp((const char *) node->name,
+ if (!strcmp((const char *) attribute_node->name,
config_element_probe_attributes)) {
xmlNodePtr probe_attribute_node;
probe_attribute_node)) {
ret = process_probe_attribute_node(probe_attribute_node,
- &event.attr.probe);
+ &event->attr.probe);
if (ret) {
goto end;
}
}
- } else {
+ } else if (!strcmp((const char *) attribute_node->name,
+ config_element_function_attributes)) {
size_t sym_len;
xmlChar *content;
xmlNodePtr symbol_node = xmlFirstElementChild(attribute_node);
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);
+ } else if (!strcmp((const char *) attribute_node->name,
+ config_element_userspace_probe_tracepoint_attributes)) {
+ struct lttng_userspace_probe_location *location;
+
+ location = process_userspace_probe_tracepoint_attribute_node(attribute_node);
+ if (!location) {
+ WARN("Error processing userspace probe tracepoint attribute");
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
+ }
+ ret = lttng_event_set_userspace_probe_location(
+ event, location);
+ if (ret) {
+ WARN("Error setting userspace probe location field");
+ lttng_userspace_probe_location_destroy(
+ location);
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
+ }
+ } else if (!strcmp((const char *) attribute_node->name,
+ config_element_userspace_probe_function_attributes)) {
+ struct lttng_userspace_probe_location *location;
+
+ location =
+ process_userspace_probe_function_attribute_node(
+ attribute_node);
+ if (!location) {
+ WARN("Error processing userspace probe function attribute");
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
+ }
+
+ ret = lttng_event_set_userspace_probe_location(
+ event, location);
+ if (ret) {
+ WARN("Error setting userspace probe location field");
+ lttng_userspace_probe_location_destroy(
+ location);
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
+ }
+ } else {
+ /* Unknown event attribute. */
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
}
}
}
- if ((event.enabled && phase == ENABLE) || phase == CREATION) {
- ret = lttng_enable_event_with_exclusions(handle, &event, channel_name,
+ if ((event->enabled && phase == ENABLE) || phase == CREATION) {
+ ret = lttng_enable_event_with_exclusions(handle, event, channel_name,
filter_expression, exclusion_count, exclusions);
if (ret < 0) {
- WARN("Enabling event (name:%s) on load failed.", event.name);
+ WARN("Enabling event (name:%s) on load failed.", event->name);
ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
goto end;
}
}
+ ret = 0;
end:
for (i = 0; i < exclusion_count; i++) {
free(exclusions[i]);
}
+ lttng_event_destroy(event);
free(exclusions);
free(filter_expression);
return ret;
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)) {
channel->attr.live_timer_interval =
live_timer_interval;
+ } else if (!strcmp((const char *) attr_node->name,
+ config_element_monitor_timer_interval)) {
+ xmlChar *content;
+ uint64_t monitor_timer_interval = 0;
+
+ /* monitor_timer_interval */
+ content = xmlNodeGetContent(attr_node);
+ if (!content) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
+
+ ret = parse_uint(content, &monitor_timer_interval);
+ free(content);
+ if (ret) {
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
+ }
+
+ ret = lttng_channel_set_monitor_timer_interval(channel,
+ monitor_timer_interval);
+ if (ret) {
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
+ }
+ } else if (!strcmp((const char *) attr_node->name,
+ config_element_blocking_timeout)) {
+ xmlChar *content;
+ int64_t blocking_timeout = 0;
+
+ /* blocking_timeout */
+ content = xmlNodeGetContent(attr_node);
+ if (!content) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
+
+ ret = parse_int(content, &blocking_timeout);
+ free(content);
+ if (ret) {
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
+ }
+
+ ret = lttng_channel_set_blocking_timeout(channel,
+ blocking_timeout);
+ if (ret) {
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
+ }
} else if (!strcmp((const char *) attr_node->name,
config_element_events)) {
/* events */
} 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);
}
}
return ret;
}
-
static
int process_domain_node(xmlNodePtr domain_node, const char *session_name)
{
int ret;
struct lttng_domain domain = { 0 };
struct lttng_handle *handle = NULL;
+ struct lttng_channel *channel = NULL;
xmlNodePtr channels_node = NULL;
xmlNodePtr trackers_node = NULL;
xmlNodePtr pid_tracker_node = NULL;
/* create all channels */
for (node = xmlFirstElementChild(channels_node); node;
node = xmlNextElementSibling(node)) {
- struct lttng_channel channel;
+ const enum lttng_domain_type original_domain = domain.type;
xmlNodePtr contexts_node = NULL;
xmlNodePtr events_node = NULL;
xmlNodePtr channel_attr_node;
- memset(&channel, 0, sizeof(channel));
- lttng_channel_set_default_attr(&domain, &channel.attr);
+ /*
+ * 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;
+ }
for (channel_attr_node = xmlFirstElementChild(node);
channel_attr_node; channel_attr_node =
xmlNextElementSibling(channel_attr_node)) {
ret = process_channel_attr_node(channel_attr_node,
- &channel, &contexts_node, &events_node);
+ channel, &contexts_node, &events_node);
if (ret) {
goto end;
}
}
- ret = lttng_enable_channel(handle, &channel);
+ ret = lttng_enable_channel(handle, channel);
if (ret < 0) {
goto end;
}
- ret = process_events_node(events_node, handle, channel.name);
+ /* Restore the original channel domain. */
+ domain.type = original_domain;
+
+ ret = process_events_node(events_node, handle, channel->name);
if (ret) {
goto end;
}
ret = process_contexts_node(contexts_node, handle,
- channel.name);
+ channel->name);
if (ret) {
goto end;
}
+
+ lttng_channel_destroy(channel);
}
+ channel = NULL;
/* get the trackers node */
for (node = xmlFirstElementChild(domain_node); node;
}
end:
+ lttng_channel_destroy(channel);
lttng_destroy_handle(handle);
return ret;
}
+static
+int add_periodic_rotation(const char *name, uint64_t time_us)
+{
+ int ret;
+ enum lttng_rotation_status status;
+ struct lttng_rotation_schedule *periodic =
+ lttng_rotation_schedule_periodic_create();
+
+ if (!periodic) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
+
+ status = lttng_rotation_schedule_periodic_set_period(periodic,
+ time_us);
+ if (status != LTTNG_ROTATION_STATUS_OK) {
+ ret = -LTTNG_ERR_INVALID;
+ goto error;
+ }
+
+ status = lttng_session_add_rotation_schedule(name, periodic);
+ switch (status) {
+ case LTTNG_ROTATION_STATUS_OK:
+ ret = 0;
+ break;
+ case LTTNG_ROTATION_STATUS_SCHEDULE_ALREADY_SET:
+ case LTTNG_ROTATION_STATUS_INVALID:
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ break;
+ default:
+ ret = -LTTNG_ERR_UNK;
+ break;
+ }
+error:
+ lttng_rotation_schedule_destroy(periodic);
+ return ret;
+}
+
+static
+int add_size_rotation(const char *name, uint64_t size_bytes)
+{
+ int ret;
+ enum lttng_rotation_status status;
+ struct lttng_rotation_schedule *size =
+ lttng_rotation_schedule_size_threshold_create();
+
+ if (!size) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
+
+ status = lttng_rotation_schedule_size_threshold_set_threshold(size,
+ size_bytes);
+ if (status != LTTNG_ROTATION_STATUS_OK) {
+ ret = -LTTNG_ERR_INVALID;
+ goto error;
+ }
+
+ status = lttng_session_add_rotation_schedule(name, size);
+ switch (status) {
+ case LTTNG_ROTATION_STATUS_OK:
+ ret = 0;
+ break;
+ case LTTNG_ROTATION_STATUS_SCHEDULE_ALREADY_SET:
+ case LTTNG_ROTATION_STATUS_INVALID:
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ break;
+ default:
+ ret = -LTTNG_ERR_UNK;
+ break;
+ }
+error:
+ lttng_rotation_schedule_destroy(size);
+ return ret;
+}
+
+static
+int process_session_rotation_schedules_node(
+ xmlNodePtr schedules_node,
+ uint64_t *rotation_timer_interval,
+ uint64_t *rotation_size)
+{
+ int ret = 0;
+ xmlNodePtr child;
+
+ for (child = xmlFirstElementChild(schedules_node);
+ child;
+ child = xmlNextElementSibling(child)) {
+ if (!strcmp((const char *) child->name,
+ config_element_rotation_schedule_periodic)) {
+ xmlChar *content;
+ xmlNodePtr time_us_node;
+
+ /* periodic rotation schedule */
+ time_us_node = xmlFirstElementChild(child);
+ if (!time_us_node ||
+ strcmp((const char *) time_us_node->name,
+ config_element_rotation_schedule_periodic_time_us)) {
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
+ }
+
+ /* time_us child */
+ content = xmlNodeGetContent(time_us_node);
+ if (!content) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
+ ret = parse_uint(content, rotation_timer_interval);
+ free(content);
+ if (ret) {
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
+ }
+ } else if (!strcmp((const char *) child->name,
+ config_element_rotation_schedule_size_threshold)) {
+ xmlChar *content;
+ xmlNodePtr bytes_node;
+
+ /* size_threshold rotation schedule */
+ bytes_node = xmlFirstElementChild(child);
+ if (!bytes_node ||
+ strcmp((const char *) bytes_node->name,
+ config_element_rotation_schedule_size_threshold_bytes)) {
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
+ }
+
+ /* bytes child */
+ content = xmlNodeGetContent(bytes_node);
+ if (!content) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
+ ret = parse_uint(content, rotation_size);
+ free(content);
+ if (ret) {
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ goto end;
+ }
+ }
+ }
+
+end:
+ return ret;
+}
+
static
int process_session_node(xmlNodePtr session_node, const char *session_name,
- int overwrite)
+ int overwrite,
+ const struct config_load_session_override_attr *overrides)
{
int ret, started = -1, snapshot_mode = -1;
- uint64_t live_timer_interval = UINT64_MAX;
+ uint64_t live_timer_interval = UINT64_MAX,
+ 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;
shm_path = node_content;
} else {
- /* attributes, snapshot_mode or live_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;
- }
+ /*
+ * attributes, snapshot_mode, live_timer_interval, rotation_size,
+ * 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 {
- /* 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;
+ }
+ } else if (!strcmp((const char *) attributes_child->name,
+ config_element_rotation_schedules)) {
+ ret = process_session_rotation_schedules_node(
+ attributes_child,
+ &rotation_timer_interval,
+ &rotation_size);
+ 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;
}
}
}
goto error;
}
+ /* Apply overrides */
+ if (overrides) {
+ if (overrides->session_name) {
+ xmlChar *name_override = xmlStrdup(BAD_CAST(overrides->session_name));
+ if (!name_override) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
+
+ /* Overrides the session name to the provided name */
+ xmlFree(name);
+ name = name_override;
+ }
+ }
+
if (overwrite) {
/* Destroy session if it exists */
ret = lttng_destroy_session((const char *) name);
/* Create session type depending on output type */
if (snapshot_mode && snapshot_mode != -1) {
- ret = create_snapshot_session((const char *) name, output_node);
+ ret = create_snapshot_session((const char *) name, output_node,
+ 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,
- output_node, live_timer_interval);
+ 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,
- output_node, UINT64_MAX);
+ ret = create_session((const char *) name,
+ output_node, UINT64_MAX, overrides);
}
if (ret) {
goto error;
}
}
+ if (rotation_timer_interval) {
+ ret = add_periodic_rotation((const char *) name,
+ rotation_timer_interval);
+ if (ret < 0) {
+ goto error;
+ }
+ }
+ if (rotation_size) {
+ ret = add_size_rotation((const char *) name,
+ rotation_size);
+ if (ret < 0) {
+ goto error;
+ }
+ }
+
if (started) {
ret = lttng_start_tracing((const char *) name);
if (ret) {
static
int load_session_from_file(const char *path, const char *session_name,
- struct session_config_validation_ctx *validation_ctx, int overwrite)
+ struct session_config_validation_ctx *validation_ctx, int overwrite,
+ const struct config_load_session_override_attr *overrides)
{
int ret, session_found = !session_name;
xmlDocPtr doc = NULL;
session_node; session_node =
xmlNextElementSibling(session_node)) {
ret = process_session_node(session_node,
- session_name, overwrite);
+ session_name, overwrite, overrides);
if (session_name && ret == 0) {
/* Target session found and loaded */
session_found = 1;
return ret;
}
-/* Allocate dirent as recommended by READDIR(3), NOTES on readdir_r */
-static
-struct dirent *alloc_dirent(const char *path)
-{
- size_t len;
- long name_max;
- struct dirent *entry;
-
- name_max = pathconf(path, _PC_NAME_MAX);
- if (name_max == -1) {
- name_max = PATH_MAX;
- }
- len = offsetof(struct dirent, d_name) + name_max + 1;
- entry = zmalloc(len);
- return entry;
-}
-
static
int load_session_from_path(const char *path, const char *session_name,
- struct session_config_validation_ctx *validation_ctx, int overwrite)
+ struct session_config_validation_ctx *validation_ctx, int overwrite,
+ const struct config_load_session_override_attr *overrides)
{
int ret, session_found = !session_name;
DIR *directory = NULL;
+ struct lttng_dynamic_buffer file_path;
+ size_t path_len;
assert(path);
assert(validation_ctx);
+ path_len = strlen(path);
+ lttng_dynamic_buffer_init(&file_path);
+ if (path_len >= LTTNG_PATH_MAX) {
+ ERR("Session configuration load path \"%s\" length (%zu) exceeds the maximal length allowed (%d)",
+ path, path_len, LTTNG_PATH_MAX);
+ ret = -LTTNG_ERR_INVALID;
+ goto end;
+ }
directory = opendir(path);
if (!directory) {
}
}
if (directory) {
- struct dirent *entry;
- struct dirent *result;
- char *file_path = NULL;
- size_t path_len = strlen(path);
-
- if (path_len >= PATH_MAX) {
- ret = -LTTNG_ERR_INVALID;
- goto end;
- }
+ size_t file_path_root_len;
- entry = alloc_dirent(path);
- if (!entry) {
+ ret = lttng_dynamic_buffer_set_capacity(&file_path,
+ LTTNG_PATH_MAX);
+ if (ret) {
ret = -LTTNG_ERR_NOMEM;
goto end;
}
- file_path = zmalloc(PATH_MAX);
- if (!file_path) {
+ ret = lttng_dynamic_buffer_append(&file_path, path, path_len);
+ if (ret) {
ret = -LTTNG_ERR_NOMEM;
- free(entry);
goto end;
}
- strncpy(file_path, path, path_len);
- if (file_path[path_len - 1] != '/') {
- file_path[path_len++] = '/';
+ if (file_path.data[file_path.size - 1] != '/') {
+ ret = lttng_dynamic_buffer_append(&file_path, "/", 1);
+ if (ret) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
}
+ file_path_root_len = file_path.size;
- ret = 0;
/* Search for *.lttng files */
- while (!readdir_r(directory, entry, &result) && result) {
- size_t file_name_len = strlen(result->d_name);
+ for (;;) {
+ size_t file_name_len;
+ struct dirent *result;
+
+ /*
+ * When the end of the directory stream is reached, NULL
+ * is returned and errno is kept unchanged. When an
+ * error occurs, NULL is returned and errno is set
+ * accordingly. To distinguish between the two, set
+ * errno to zero before calling readdir().
+ *
+ * On success, readdir() returns a pointer to a dirent
+ * structure. This structure may be statically
+ * allocated, do not attempt to free(3) it.
+ */
+ errno = 0;
+ result = readdir(directory);
+
+ /* Reached end of dir stream or error out. */
+ if (!result) {
+ if (errno) {
+ PERROR("Failed to enumerate the contents of path \"%s\" while loading session, readdir returned", path);
+ ret = -LTTNG_ERR_LOAD_IO_FAIL;
+ goto end;
+ }
+ break;
+ }
+
+ file_name_len = strlen(result->d_name);
if (file_name_len <=
sizeof(DEFAULT_SESSION_CONFIG_FILE_EXTENSION)) {
continue;
}
- if (path_len + file_name_len >= PATH_MAX) {
+ if (file_path.size + file_name_len >= LTTNG_PATH_MAX) {
+ WARN("Ignoring file \"%s\" since the path's length (%zu) would exceed the maximal permitted size (%d)",
+ result->d_name,
+ /* +1 to account for NULL terminator. */
+ file_path.size + file_name_len + 1,
+ LTTNG_PATH_MAX);
continue;
}
+ /* Does the file end with .lttng? */
if (strcmp(DEFAULT_SESSION_CONFIG_FILE_EXTENSION,
- result->d_name + file_name_len - sizeof(
- DEFAULT_SESSION_CONFIG_FILE_EXTENSION) + 1)) {
+ result->d_name + file_name_len - sizeof(
+ DEFAULT_SESSION_CONFIG_FILE_EXTENSION) + 1)) {
continue;
}
- strncpy(file_path + path_len, result->d_name, file_name_len);
- file_path[path_len + file_name_len] = '\0';
+ ret = lttng_dynamic_buffer_append(&file_path, result->d_name,
+ file_name_len + 1);
+ if (ret) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto end;
+ }
- ret = load_session_from_file(file_path, session_name,
- validation_ctx, overwrite);
+ ret = load_session_from_file(file_path.data, session_name,
+ validation_ctx, overwrite, overrides);
if (session_name && !ret) {
session_found = 1;
break;
}
+ /*
+ * Reset the buffer's size to the location of the
+ * path's trailing '/'.
+ */
+ ret = lttng_dynamic_buffer_set_size(&file_path,
+ file_path_root_len);
+ if (ret) {
+ ret = -LTTNG_ERR_UNK;
+ goto end;
+ }
}
- free(entry);
- free(file_path);
} else {
ret = load_session_from_file(path, session_name,
- validation_ctx, overwrite);
+ validation_ctx, overwrite, overrides);
if (ret) {
goto end;
} else {
PERROR("closedir");
}
}
-
if (session_found && !ret) {
ret = 0;
}
-
+ lttng_dynamic_buffer_reset(&file_path);
return ret;
}
if (errno != ENOENT) {
PERROR("stat");
}
- ret = -LTTNG_ERR_INVALID;
goto valid;
}
LTTNG_HIDDEN
int config_load_session(const char *path, const char *session_name,
- int overwrite, unsigned int autoload)
+ int overwrite, unsigned int autoload,
+ const struct config_load_session_override_attr *overrides)
{
int ret;
bool session_loaded = false;
}
if (!path) {
- char *home_path;
+ const char *home_path;
const char *sys_path;
/* Try home path */
}
if (path_ptr) {
ret = load_session_from_path(path_ptr, session_name,
- &validation_ctx, overwrite);
+ &validation_ctx, overwrite, overrides);
if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
goto end;
}
if (path_ptr) {
ret = load_session_from_path(path_ptr, session_name,
- &validation_ctx, overwrite);
+ &validation_ctx, overwrite, overrides);
if (!ret) {
session_loaded = true;
}
}
ret = load_session_from_path(path, session_name,
- &validation_ctx, overwrite);
+ &validation_ctx, overwrite, overrides);
}
end:
fini_session_config_validation_ctx(&validation_ctx);
projects / lttng-tools.git / blobdiff