X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=e625f316a96e735ff77485b1830926c38b663f9d;hp=bfc1bdab6decfea0938ee18fcc67b176e3386787;hb=55c9e7cac24318259d4f2549c97f7577b7b52db4;hpb=ce6176f27756b1b1453d4fef1c8f0978f02806ca

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index bfc1bdab6..e625f316a 100644
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-config.c
@@ -42,10 +42,13 @@
 #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;
@@ -58,6 +61,7 @@ struct session_config_validation_ctx {
 	xmlSchemaValidCtxtPtr schema_validation_ctx;
 };
 
+const char * const config_element_all = "all";
 const char * const config_str_yes = "yes";
 const char * const config_str_true = "true";
 const char * const config_str_on = "on";
@@ -86,6 +90,18 @@ const char * const config_element_probe_attributes = "probe_attributes";
 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";
@@ -126,12 +142,25 @@ const char * const config_element_control_uri = "control_uri";
 const char * const config_element_data_uri = "data_uri";
 const char * const config_element_max_size = "max_size";
 const char * const config_element_pid = "pid";
+const char * const config_element_id = "id";
 const char * const config_element_pids = "pids";
 const char * const config_element_shared_memory_path = "shared_memory_path";
 const char * const config_element_pid_tracker = "pid_tracker";
+const char * const config_element_vpid_tracker = "vpid_tracker";
+const char * const config_element_uid_tracker = "uid_tracker";
+const char * const config_element_vuid_tracker = "vuid_tracker";
+const char * const config_element_gid_tracker = "gid_tracker";
+const char * const config_element_vgid_tracker = "vgid_tracker";
 const char * const config_element_trackers = "trackers";
 const char * const config_element_targets = "targets";
+const char * const config_element_target_type = "target_type";
 const char * const config_element_target_pid = "pid_target";
+const char * const config_element_target_vpid = "vpid_target";
+const char * const config_element_target_uid = "uid_target";
+const char * const config_element_target_vuid = "vuid_target";
+const char * const config_element_target_gid = "gid_target";
+const char * const config_element_target_vgid = "vgid_target";
+const char * const config_element_tracker_type = "tracker_type";
 
 LTTNG_HIDDEN const char * const config_element_rotation_schedules = "rotation_schedules";
 LTTNG_HIDDEN const char * const config_element_rotation_schedule_periodic = "periodic";
@@ -162,6 +191,7 @@ const char * const config_loglevel_type_single = "SINGLE";
 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";
@@ -189,6 +219,25 @@ LTTNG_HIDDEN const char * const config_event_context_need_reschedule = "NEED_RES
 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;
@@ -234,7 +283,7 @@ int config_get_section_entries(const char *override_path, const char *section,
 		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 };
 
@@ -919,10 +968,13 @@ int get_event_type(xmlChar *event_type)
 		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;
@@ -1028,6 +1080,63 @@ int get_context_type(xmlChar *context_type)
 	} 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;
 	}
@@ -1454,6 +1563,178 @@ 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)
@@ -1539,7 +1820,7 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 {
 	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;
@@ -1548,23 +1829,27 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 	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);
@@ -1582,7 +1867,7 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 				goto end;
 			}
 
-			ret = lttng_strncpy(event.name,
+			ret = lttng_strncpy(event->name,
 					(const char *) content,
 					LTTNG_SYMBOL_NAME_LEN);
 			if (ret == -1) {
@@ -1605,7 +1890,7 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 				goto end;
 			}
 
-			ret = parse_bool(content, &event.enabled);
+			ret = parse_bool(content, &event->enabled);
 			free(content);
 			if (ret) {
 				ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
@@ -1628,7 +1913,7 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 				goto end;
 			}
 
-			event.type = ret;
+			event->type = ret;
 		} else if (!strcmp((const char *) node->name,
 			config_element_loglevel_type)) {
 			xmlChar *content = xmlNodeGetContent(node);
@@ -1646,7 +1931,7 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 				goto end;
 			}
 
-			event.loglevel_type = ret;
+			event->loglevel_type = ret;
 		} else if (!strcmp((const char *) node->name,
 			config_element_loglevel)) {
 			xmlChar *content;
@@ -1672,7 +1957,7 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 				goto end;
 			}
 
-			event.loglevel = loglevel;
+			event->loglevel = loglevel;
 		} else if (!strcmp((const char *) node->name,
 			config_element_filter)) {
 			xmlChar *content =
@@ -1737,7 +2022,7 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 				exclusion_index++;
 			}
 
-			event.exclusion = 1;
+			event->exclusion = 1;
 		} else if (!strcmp((const char *) node->name,
 			config_element_attributes)) {
 			xmlNodePtr attribute_node = xmlFirstElementChild(node);
@@ -1748,7 +2033,7 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 				goto end;
 			}
 
-			if (!strcmp((const char *) node->name,
+			if (!strcmp((const char *) attribute_node->name,
 						config_element_probe_attributes)) {
 				xmlNodePtr probe_attribute_node;
 
@@ -1759,12 +2044,13 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 							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);
@@ -1785,7 +2071,7 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 				}
 
 				ret = lttng_strncpy(
-						event.attr.ftrace.symbol_name,
+						event->attr.ftrace.symbol_name,
 						(char *) content, sym_len);
 				if (ret == -1) {
 					ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
@@ -1793,15 +2079,60 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 					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;
 		}
@@ -1812,6 +2143,7 @@ end:
 		free(exclusions[i]);
 	}
 
+	lttng_event_destroy(event);
 	free(exclusions);
 	free(filter_expression);
 	return ret;
@@ -2343,19 +2675,90 @@ end:
 	return ret;
 }
 
-static
-int process_pid_tracker_node(xmlNodePtr pid_tracker_node,
-	struct lttng_handle *handle)
+static int get_tracker_elements(enum lttng_tracker_type tracker_type,
+		const char **element_id_tracker,
+		const char **element_target_id,
+		const char **element_id,
+		const char **element_id_alias,
+		const char **element_name)
+{
+	int ret = 0;
+
+	switch (tracker_type) {
+	case LTTNG_TRACKER_PID:
+		*element_id_tracker = config_element_pid_tracker;
+		*element_target_id = config_element_target_pid;
+		*element_id = config_element_id;
+		*element_id_alias = config_element_pid;
+		*element_name = NULL;
+		break;
+	case LTTNG_TRACKER_VPID:
+		*element_id_tracker = config_element_vpid_tracker;
+		*element_target_id = config_element_target_vpid;
+		*element_id = config_element_id;
+		*element_id_alias = NULL;
+		*element_name = NULL;
+		break;
+	case LTTNG_TRACKER_UID:
+		*element_id_tracker = config_element_uid_tracker;
+		*element_target_id = config_element_target_uid;
+		*element_id = config_element_id;
+		*element_id_alias = NULL;
+		*element_name = config_element_name;
+		break;
+	case LTTNG_TRACKER_VUID:
+		*element_id_tracker = config_element_vuid_tracker;
+		*element_target_id = config_element_target_vuid;
+		*element_id = config_element_id;
+		*element_id_alias = NULL;
+		*element_name = config_element_name;
+		break;
+	case LTTNG_TRACKER_GID:
+		*element_id_tracker = config_element_gid_tracker;
+		*element_target_id = config_element_target_gid;
+		*element_id = config_element_id;
+		*element_id_alias = NULL;
+		*element_name = config_element_name;
+		break;
+	case LTTNG_TRACKER_VGID:
+		*element_id_tracker = config_element_vgid_tracker;
+		*element_target_id = config_element_target_vgid;
+		*element_id = config_element_id;
+		*element_id_alias = NULL;
+		*element_name = config_element_name;
+		break;
+	default:
+		ret = LTTNG_ERR_INVALID;
+	}
+	return ret;
+}
+
+static int process_id_tracker_node(xmlNodePtr id_tracker_node,
+		struct lttng_handle *handle,
+		enum lttng_tracker_type tracker_type)
 {
 	int ret = 0, child;
 	xmlNodePtr targets_node = NULL;
 	xmlNodePtr node;
+	const char *element_id_tracker;
+	const char *element_target_id;
+	const char *element_id;
+	const char *element_id_alias;
+	const char *element_name;
 
 	assert(handle);
-	assert(pid_tracker_node);
+	assert(id_tracker_node);
+
+	ret = get_tracker_elements(tracker_type, &element_id_tracker,
+			&element_target_id, &element_id, &element_id_alias,
+			&element_name);
+	if (ret) {
+		return ret;
+	}
+
 	/* get the targets node */
-	for (node = xmlFirstElementChild(pid_tracker_node); node;
-		node = xmlNextElementSibling(node)) {
+	for (node = xmlFirstElementChild(id_tracker_node); node;
+			node = xmlNextElementSibling(node)) {
 		if (!strcmp((const char *) node->name,
 				config_element_targets)) {
 			targets_node = node;
@@ -2368,26 +2771,32 @@ int process_pid_tracker_node(xmlNodePtr pid_tracker_node,
 		goto end;
 	}
 
-	/* Go through all pid_target node */
+	/* Go through all id target node */
 	child = xmlChildElementCount(targets_node);
 	if (child == 0) {
+		struct lttng_tracker_id tracker_id;
+
+		tracker_id.type = LTTNG_ID_ALL;
 		/* The session is explicitly set to target nothing. */
-		ret = lttng_untrack_pid(handle, -1);
+		ret = lttng_untrack_id(handle, tracker_type, &tracker_id);
 		if (ret) {
 			goto end;
 		}
 	}
 	for (node = xmlFirstElementChild(targets_node); node;
 			node = xmlNextElementSibling(node)) {
-		xmlNodePtr pid_target_node = node;
+		xmlNodePtr id_target_node = node;
 
-		/* get pid node and track it */
-		for (node = xmlFirstElementChild(pid_target_node); node;
-			node = xmlNextElementSibling(node)) {
-			if (!strcmp((const char *) node->name,
-					config_element_pid)) {
-				int64_t pid;
+		/* get id node and track it */
+		for (node = xmlFirstElementChild(id_target_node); node;
+				node = xmlNextElementSibling(node)) {
+			if (!strcmp((const char *) node->name, element_id) ||
+					(element_id_alias &&
+							!strcmp((const char *) node->name,
+									element_id_alias))) {
+				int64_t id;
 				xmlChar *content = NULL;
+				struct lttng_tracker_id tracker_id;
 
 				content = xmlNodeGetContent(node);
 				if (!content) {
@@ -2395,20 +2804,42 @@ int process_pid_tracker_node(xmlNodePtr pid_tracker_node,
 					goto end;
 				}
 
-				ret = parse_int(content, &pid);
+				ret = parse_int(content, &id);
 				free(content);
 				if (ret) {
 					ret = LTTNG_ERR_LOAD_INVALID_CONFIG;
 					goto end;
 				}
 
-				ret = lttng_track_pid(handle, (int) pid);
+				tracker_id.type = LTTNG_ID_VALUE;
+				tracker_id.value = (int) id;
+				ret = lttng_track_id(handle, tracker_type,
+						&tracker_id);
+				if (ret) {
+					goto end;
+				}
+			}
+			if (element_name && !strcmp((const char *) node->name,
+							    element_name)) {
+				xmlChar *content = NULL;
+				struct lttng_tracker_id tracker_id;
+
+				content = xmlNodeGetContent(node);
+				if (!content) {
+					ret = LTTNG_ERR_LOAD_INVALID_CONFIG;
+					goto end;
+				}
+				tracker_id.type = LTTNG_ID_STRING;
+				tracker_id.string = (char *) content;
+				ret = lttng_track_id(handle, tracker_type,
+						&tracker_id);
+				free(content);
 				if (ret) {
 					goto end;
 				}
 			}
 		}
-		node = pid_target_node;
+		node = id_target_node;
 	}
 
 end:
@@ -2425,6 +2856,11 @@ int process_domain_node(xmlNodePtr domain_node, const char *session_name)
 	xmlNodePtr channels_node = NULL;
 	xmlNodePtr trackers_node = NULL;
 	xmlNodePtr pid_tracker_node = NULL;
+	xmlNodePtr vpid_tracker_node = NULL;
+	xmlNodePtr uid_tracker_node = NULL;
+	xmlNodePtr vuid_tracker_node = NULL;
+	xmlNodePtr gid_tracker_node = NULL;
+	xmlNodePtr vgid_tracker_node = NULL;
 	xmlNodePtr node;
 
 	assert(session_name);
@@ -2537,17 +2973,60 @@ int process_domain_node(xmlNodePtr domain_node, const char *session_name)
 
 	for (node = xmlFirstElementChild(trackers_node); node;
 			node = xmlNextElementSibling(node)) {
-		if (!strcmp((const char *)node->name,config_element_pid_tracker)) {
+		if (!strcmp((const char *) node->name,
+				    config_element_pid_tracker)) {
 			pid_tracker_node = node;
-			ret = process_pid_tracker_node(pid_tracker_node, handle);
+			ret = process_id_tracker_node(pid_tracker_node, handle,
+					LTTNG_TRACKER_PID);
+			if (ret) {
+				goto end;
+			}
+		}
+		if (!strcmp((const char *) node->name,
+				    config_element_vpid_tracker)) {
+			vpid_tracker_node = node;
+			ret = process_id_tracker_node(vpid_tracker_node, handle,
+					LTTNG_TRACKER_VPID);
+			if (ret) {
+				goto end;
+			}
+		}
+		if (!strcmp((const char *) node->name,
+				    config_element_uid_tracker)) {
+			uid_tracker_node = node;
+			ret = process_id_tracker_node(uid_tracker_node, handle,
+					LTTNG_TRACKER_UID);
+			if (ret) {
+				goto end;
+			}
+		}
+		if (!strcmp((const char *) node->name,
+				    config_element_vuid_tracker)) {
+			vuid_tracker_node = node;
+			ret = process_id_tracker_node(vuid_tracker_node, handle,
+					LTTNG_TRACKER_VUID);
+			if (ret) {
+				goto end;
+			}
+		}
+		if (!strcmp((const char *) node->name,
+				    config_element_gid_tracker)) {
+			gid_tracker_node = node;
+			ret = process_id_tracker_node(gid_tracker_node, handle,
+					LTTNG_TRACKER_GID);
+			if (ret) {
+				goto end;
+			}
+		}
+		if (!strcmp((const char *) node->name,
+				    config_element_vgid_tracker)) {
+			vgid_tracker_node = node;
+			ret = process_id_tracker_node(vgid_tracker_node, handle,
+					LTTNG_TRACKER_VGID);
 			if (ret) {
 				goto end;
 			}
 		}
-	}
-
-	if (!pid_tracker_node) {
-		lttng_track_pid(handle, -1);
 	}
 
 end:
@@ -3059,6 +3538,7 @@ int load_session_from_file(const char *path, const char *session_name,
 
 	sessions_node = xmlDocGetRootElement(doc);
 	if (!sessions_node) {
+		ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
 		goto end;
 	}
 
@@ -3078,6 +3558,9 @@ end:
 	if (!ret) {
 		ret = session_found ? 0 : -LTTNG_ERR_LOAD_SESSION_NOENT;
 	}
+	if (ret == -LTTNG_ERR_NO_SESSION) {
+		ret = -LTTNG_ERR_LOAD_SESSION_NOENT;
+	}
 	return ret;
 }
 
@@ -3202,10 +3685,14 @@ int load_session_from_path(const char *path, const char *session_name,
 
 			ret = load_session_from_file(file_path.data, session_name,
 				validation_ctx, overwrite, overrides);
-			if (session_name && !ret) {
+			if (session_name &&
+					(!ret || ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) {
 				session_found = 1;
 				break;
 			}
+			if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
+				goto end;
+			}
 			/*
 			 * Reset the buffer's size to the location of the
 			 * path's trailing '/'.
@@ -3217,25 +3704,24 @@ int load_session_from_path(const char *path, const char *session_name,
 				goto end;
 			}
 		}
-
 	} else {
 		ret = load_session_from_file(path, session_name,
 			validation_ctx, overwrite, overrides);
 		if (ret) {
 			goto end;
-		} else {
-			session_found = 1;
 		}
+		session_found = 1;
 	}
 
+	ret = 0;
 end:
 	if (directory) {
 		if (closedir(directory)) {
 			PERROR("closedir");
 		}
 	}
-	if (session_found && !ret) {
-		ret = 0;
+	if (!ret && !session_found) {
+		ret = -LTTNG_ERR_LOAD_SESSION_NOENT;
 	}
 	lttng_dynamic_buffer_reset(&file_path);
 	return ret;
@@ -3290,7 +3776,7 @@ int config_load_session(const char *path, const char *session_name,
 	}
 
 	if (!path) {
-		char *home_path;
+		const char *home_path;
 		const char *sys_path;
 
 		/* Try home path */
@@ -3308,6 +3794,7 @@ int config_load_session(const char *path, const char *session_name,
 						DEFAULT_SESSION_CONFIG_AUTOLOAD, home_path);
 				if (ret < 0) {
 					PERROR("snprintf session autoload home config path");
+					ret = -LTTNG_ERR_INVALID;
 					goto end;
 				}
 
@@ -3325,6 +3812,7 @@ int config_load_session(const char *path, const char *session_name,
 						DEFAULT_SESSION_HOME_CONFIGPATH, home_path);
 				if (ret < 0) {
 					PERROR("snprintf session home config path");
+					ret = -LTTNG_ERR_INVALID;
 					goto end;
 				}
 				path_ptr = path;
@@ -3365,6 +3853,8 @@ int config_load_session(const char *path, const char *session_name,
 			if (!ret) {
 				session_loaded = true;
 			}
+		} else {
+			ret = 0;
 		}
 	} else {
 		ret = access(path, F_OK);