X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=7ee379ef898a0890becd9b90e413d10687719a0f;hp=77f5e2510552f36b784e38816d5539671e66d26f;hb=d37ac3cdc4fe21f117edfb829db4d0eb7cf914a1;hpb=7c612c2e69f7b4ebf77fd369126befb71e561a8f

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 77f5e2510..7ee379ef8 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -1,21 +1,12 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -24,10 +15,14 @@
 
 #include <common/common.h>
 #include <common/defaults.h>
+#include <common/trace-chunk.h>
+#include <common/utils.h>
 
 #include "buffer-registry.h"
 #include "trace-ust.h"
 #include "utils.h"
+#include "ust-app.h"
+#include "agent.h"
 
 /*
  * Match function for the events hash table lookup.
@@ -68,33 +63,30 @@ int trace_ust_ht_match_event(struct cds_lfht_node *node, const void *_key)
 {
 	struct ltt_ust_event *event;
 	const struct ltt_ust_ht_key *key;
+	int ev_loglevel_value;
+	int ll_match;
 
 	assert(node);
 	assert(_key);
 
 	event = caa_container_of(node, struct ltt_ust_event, node.node);
 	key = _key;
+	ev_loglevel_value = event->attr.loglevel;
 
-	/* Match the 3 elements of the key: name, filter and loglevel. */
+	/* Match the 4 elements of the key: name, filter, loglevel, exclusions. */
 
 	/* Event name */
 	if (strncmp(event->attr.name, key->name, sizeof(event->attr.name)) != 0) {
 		goto no_match;
 	}
 
-	/* Event loglevel. */
-	if (event->attr.loglevel != key->loglevel) {
-		if (event->attr.loglevel_type == LTTNG_UST_LOGLEVEL_ALL
-				&& key->loglevel == 0 && event->attr.loglevel == -1) {
-			/*
-			 * Match is accepted. This is because on event creation, the
-			 * loglevel is set to -1 if the event loglevel type is ALL so 0 and
-			 * -1 are accepted for this loglevel type since 0 is the one set by
-			 * the API when receiving an enable event.
-			 */
-		} else {
-			goto no_match;
-		}
+	/* Event loglevel value and type. */
+	ll_match = loglevels_match(event->attr.loglevel_type,
+		ev_loglevel_value, key->loglevel_type,
+		key->loglevel_value, LTTNG_UST_LOGLEVEL_ALL);
+
+	if (!ll_match) {
+		goto no_match;
 	}
 
 	/* Only one of the filters is NULL, fail. */
@@ -111,6 +103,53 @@ int trace_ust_ht_match_event(struct cds_lfht_node *node, const void *_key)
 		}
 	}
 
+	/* If only one of the exclusions is NULL, fail. */
+	if ((key->exclusion && !event->exclusion) || (!key->exclusion && event->exclusion)) {
+		goto no_match;
+	}
+
+	if (key->exclusion && event->exclusion) {
+		size_t i;
+
+		/* Check exclusion counts first. */
+		if (event->exclusion->count != key->exclusion->count) {
+			goto no_match;
+		}
+
+		/* Compare names individually. */
+		for (i = 0; i < event->exclusion->count; ++i) {
+			size_t j;
+		        bool found = false;
+			const char *name_ev =
+				LTTNG_EVENT_EXCLUSION_NAME_AT(
+					event->exclusion, i);
+
+			/*
+			 * Compare this exclusion name to all the key's
+			 * exclusion names.
+			 */
+			for (j = 0; j < key->exclusion->count; ++j) {
+				const char *name_key =
+					LTTNG_EVENT_EXCLUSION_NAME_AT(
+						key->exclusion, j);
+
+				if (!strncmp(name_ev, name_key,
+						LTTNG_SYMBOL_NAME_LEN)) {
+					/* Names match! */
+					found = true;
+					break;
+				}
+			}
+
+			/*
+			 * If the current exclusion name was not found amongst
+			 * the key's exclusion names, then there's no match.
+			 */
+			if (!found) {
+				goto no_match;
+			}
+		}
+	}
 	/* Match. */
 	return 1;
 
@@ -123,11 +162,18 @@ no_match:
  * lock MUST be acquired before calling this.
  */
 struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
-		char *name)
+		const char *name)
 {
 	struct lttng_ht_node_str *node;
 	struct lttng_ht_iter iter;
 
+	/*
+	 * If we receive an empty string for channel name, it means the
+	 * default channel name is requested.
+	 */
+	if (name[0] == '\0')
+		name = DEFAULT_CHANNEL_NAME;
+
 	lttng_ht_lookup(ht, (void *)name, &iter);
 	node = lttng_ht_iter_get_node_str(&iter);
 	if (node == NULL) {
@@ -148,7 +194,9 @@ error:
  * MUST be acquired before calling this.
  */
 struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
-		char *name, struct lttng_filter_bytecode *filter, int loglevel)
+		char *name, struct lttng_filter_bytecode *filter,
+		enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
+		struct lttng_event_exclusion *exclusion)
 {
 	struct lttng_ht_node_str *node;
 	struct lttng_ht_iter iter;
@@ -159,7 +207,9 @@ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
 
 	key.name = name;
 	key.filter = filter;
-	key.loglevel = loglevel;
+	key.loglevel_type = loglevel_type;
+	key.loglevel_value = loglevel_value;
+	key.exclusion = exclusion;
 
 	cds_lfht_lookup(ht->ht, ht->hash_fct((void *) name, lttng_ht_seed),
 			trace_ust_ht_match_event, &key, &iter.iter);
@@ -177,6 +227,38 @@ error:
 	return NULL;
 }
 
+/*
+ * Lookup an agent in the session agents hash table by domain type and return
+ * the object if found else NULL.
+ *
+ * RCU read side lock must be acquired before calling and only released
+ * once the agent is no longer in scope or being used.
+ */
+struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
+		enum lttng_domain_type domain_type)
+{
+	struct agent *agt = NULL;
+	struct lttng_ht_node_u64 *node;
+	struct lttng_ht_iter iter;
+	uint64_t key;
+
+	assert(session);
+
+	DBG3("Trace ust agent lookup for domain %d", domain_type);
+
+	key = domain_type;
+
+	lttng_ht_lookup(session->agents, &key, &iter);
+	node = lttng_ht_iter_get_node_u64(&iter);
+	if (!node) {
+		goto end;
+	}
+	agt = caa_container_of(node, struct agent, node);
+
+end:
+	return agt;
+}
+
 /*
  * Allocate and initialize a ust session data structure.
  *
@@ -190,12 +272,20 @@ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
 	lus = zmalloc(sizeof(struct ltt_ust_session));
 	if (lus == NULL) {
 		PERROR("create ust session zmalloc");
-		goto error;
+		goto error_alloc;
 	}
 
 	/* Init data structure */
 	lus->id = session_id;
-	lus->start_trace = 0;
+	lus->active = 0;
+
+	/* Set default metadata channel attribute. */
+	lus->metadata_attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
+	lus->metadata_attr.subbuf_size = default_get_metadata_subbuf_size();
+	lus->metadata_attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
+	lus->metadata_attr.switch_timer_interval = DEFAULT_METADATA_SWITCH_TIMER;
+	lus->metadata_attr.read_timer_interval = DEFAULT_METADATA_READ_TIMER;
+	lus->metadata_attr.output = LTTNG_UST_MMAP;
 
 	/*
 	 * Default buffer type. This can be changed through an enable channel
@@ -203,7 +293,7 @@ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
 	 * during the session lifetime which is at the first enable channel and
 	 * only before start. The flag buffer_type_changed indicates the status.
 	 */
-	lus->buffer_type = LTTNG_BUFFER_PER_PID;
+	lus->buffer_type = LTTNG_BUFFER_PER_UID;
 	/* Once set to 1, the buffer_type is immutable for the session. */
 	lus->buffer_type_changed = 0;
 	/* Init it in case it get used after allocation. */
@@ -211,28 +301,38 @@ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
 
 	/* Alloc UST global domain channels' HT */
 	lus->domain_global.channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
+	/* Alloc agent hash table. */
+	lus->agents = lttng_ht_new(0, LTTNG_HT_TYPE_U64);
 
+	lus->tracker_vpid = process_attr_tracker_create();
+	if (!lus->tracker_vpid) {
+		goto error;
+	}
+	lus->tracker_vuid = process_attr_tracker_create();
+	if (!lus->tracker_vuid) {
+		goto error;
+	}
+	lus->tracker_vgid = process_attr_tracker_create();
+	if (!lus->tracker_vgid) {
+		goto error;
+	}
 	lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
 	if (lus->consumer == NULL) {
-		goto error_consumer;
+		goto error;
 	}
 
-	/*
-	 * The tmp_consumer stays NULL until a set_consumer_uri command is
-	 * executed. At this point, the consumer should be nullify until an
-	 * enable_consumer command. This assignment is symbolic since we've zmalloc
-	 * the struct.
-	 */
-	lus->tmp_consumer = NULL;
-
 	DBG2("UST trace session create successful");
 
 	return lus;
 
-error_consumer:
+error:
+	process_attr_tracker_destroy(lus->tracker_vpid);
+	process_attr_tracker_destroy(lus->tracker_vuid);
+	process_attr_tracker_destroy(lus->tracker_vgid);
 	ht_cleanup_push(lus->domain_global.channels);
+	ht_cleanup_push(lus->agents);
 	free(lus);
-error:
+error_alloc:
 	return NULL;
 }
 
@@ -241,7 +341,8 @@ error:
  *
  * Return pointer to structure or NULL.
  */
-struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan)
+struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
+		enum lttng_domain_type domain)
 {
 	struct ltt_ust_channel *luc;
 
@@ -253,6 +354,8 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan)
 		goto error;
 	}
 
+	luc->domain = domain;
+
 	/* Copy UST channel attributes */
 	luc->attr.overwrite = chan->attr.overwrite;
 	luc->attr.subbuf_size = chan->attr.subbuf_size;
@@ -260,6 +363,10 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan)
 	luc->attr.switch_timer_interval = chan->attr.switch_timer_interval;
 	luc->attr.read_timer_interval = chan->attr.read_timer_interval;
 	luc->attr.output = (enum lttng_ust_output) chan->attr.output;
+	luc->monitor_timer_interval = ((struct lttng_channel_extended *)
+			chan->attr.extended.ptr)->monitor_timer_interval;
+	luc->attr.u.s.blocking_timeout = ((struct lttng_channel_extended *)
+			chan->attr.extended.ptr)->blocking_timeout;
 
 	/* Translate to UST output enum */
 	switch (luc->attr.output) {
@@ -268,12 +375,22 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan)
 		break;
 	}
 
-	/* Copy channel name */
-	strncpy(luc->name, chan->name, sizeof(luc->name));
+	/*
+	 * If we receive an empty string for channel name, it means the
+	 * default channel name is requested.
+	 */
+	if (chan->name[0] == '\0') {
+		strncpy(luc->name, DEFAULT_CHANNEL_NAME, sizeof(luc->name));
+	} else {
+		/* Copy channel name */
+		strncpy(luc->name, chan->name, sizeof(luc->name));
+	}
 	luc->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
 
 	/* Init node */
 	lttng_ht_node_init_str(&luc->node, luc->name);
+	CDS_INIT_LIST_HEAD(&luc->ctx_list);
+
 	/* Alloc hash tables */
 	luc->events = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
 	luc->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
@@ -288,171 +405,792 @@ error:
 	return luc;
 }
 
+/*
+ * Validates an exclusion list.
+ *
+ * Returns 0 if valid, negative value if invalid.
+ */
+static int validate_exclusion(struct lttng_event_exclusion *exclusion)
+{
+	size_t i;
+	int ret = 0;
+
+	assert(exclusion);
+
+	for (i = 0; i < exclusion->count; ++i) {
+		size_t j;
+		const char *name_a =
+			LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, i);
+
+		for (j = 0; j < i; ++j) {
+			const char *name_b =
+				LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, j);
+
+			if (!strncmp(name_a, name_b, LTTNG_SYMBOL_NAME_LEN)) {
+				/* Match! */
+				ret = -1;
+				goto end;
+			}
+		}
+	}
+
+end:
+	return ret;
+}
+
 /*
  * Allocate and initialize a ust event. Set name and event type.
+ * We own filter_expression, filter, and exclusion.
  *
- * Return pointer to structure or NULL.
+ * Return an lttng_error_code
  */
-struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
-		struct lttng_filter_bytecode *filter)
+enum lttng_error_code trace_ust_create_event(struct lttng_event *ev,
+		char *filter_expression,
+		struct lttng_filter_bytecode *filter,
+		struct lttng_event_exclusion *exclusion,
+		bool internal_event,
+		struct ltt_ust_event **ust_event)
 {
-	struct ltt_ust_event *lue;
+	struct ltt_ust_event *local_ust_event;
+	enum lttng_error_code ret = LTTNG_OK;
 
 	assert(ev);
 
-	lue = zmalloc(sizeof(struct ltt_ust_event));
-	if (lue == NULL) {
+	if (exclusion && validate_exclusion(exclusion)) {
+		ret = LTTNG_ERR_INVALID;
+		goto error;
+	}
+
+	local_ust_event = zmalloc(sizeof(struct ltt_ust_event));
+	if (local_ust_event == NULL) {
 		PERROR("ust event zmalloc");
+		ret = LTTNG_ERR_NOMEM;
 		goto error;
 	}
 
+	local_ust_event->internal = internal_event;
+
 	switch (ev->type) {
 	case LTTNG_EVENT_PROBE:
-		lue->attr.instrumentation = LTTNG_UST_PROBE;
+		local_ust_event->attr.instrumentation = LTTNG_UST_PROBE;
 		break;
 	case LTTNG_EVENT_FUNCTION:
-		lue->attr.instrumentation = LTTNG_UST_FUNCTION;
+		local_ust_event->attr.instrumentation = LTTNG_UST_FUNCTION;
 		break;
 	case LTTNG_EVENT_FUNCTION_ENTRY:
-		lue->attr.instrumentation = LTTNG_UST_FUNCTION;
+		local_ust_event->attr.instrumentation = LTTNG_UST_FUNCTION;
 		break;
 	case LTTNG_EVENT_TRACEPOINT:
-		lue->attr.instrumentation = LTTNG_UST_TRACEPOINT;
+		local_ust_event->attr.instrumentation = LTTNG_UST_TRACEPOINT;
 		break;
 	default:
 		ERR("Unknown ust instrumentation type (%d)", ev->type);
+		ret = LTTNG_ERR_INVALID;
 		goto error_free_event;
 	}
 
 	/* Copy event name */
-	strncpy(lue->attr.name, ev->name, LTTNG_UST_SYM_NAME_LEN);
-	lue->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+	strncpy(local_ust_event->attr.name, ev->name, LTTNG_UST_SYM_NAME_LEN);
+	local_ust_event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
 
 	switch (ev->loglevel_type) {
 	case LTTNG_EVENT_LOGLEVEL_ALL:
-		lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_ALL;
-		lue->attr.loglevel = -1;	/* Force to -1 */
+		local_ust_event->attr.loglevel_type = LTTNG_UST_LOGLEVEL_ALL;
+		local_ust_event->attr.loglevel = -1;	/* Force to -1 */
 		break;
 	case LTTNG_EVENT_LOGLEVEL_RANGE:
-		lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_RANGE;
-		lue->attr.loglevel = ev->loglevel;
+		local_ust_event->attr.loglevel_type = LTTNG_UST_LOGLEVEL_RANGE;
+		local_ust_event->attr.loglevel = ev->loglevel;
 		break;
 	case LTTNG_EVENT_LOGLEVEL_SINGLE:
-		lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_SINGLE;
-		lue->attr.loglevel = ev->loglevel;
+		local_ust_event->attr.loglevel_type = LTTNG_UST_LOGLEVEL_SINGLE;
+		local_ust_event->attr.loglevel = ev->loglevel;
 		break;
 	default:
 		ERR("Unknown ust loglevel type (%d)", ev->loglevel_type);
+		ret = LTTNG_ERR_INVALID;
 		goto error_free_event;
 	}
 
 	/* Same layout. */
-	lue->filter = (struct lttng_ust_filter_bytecode *) filter;
+	local_ust_event->filter_expression = filter_expression;
+	local_ust_event->filter = filter;
+	local_ust_event->exclusion = exclusion;
 
 	/* Init node */
-	lttng_ht_node_init_str(&lue->node, lue->attr.name);
+	lttng_ht_node_init_str(&local_ust_event->node, local_ust_event->attr.name);
 
 	DBG2("Trace UST event %s, loglevel (%d,%d) created",
-		lue->attr.name, lue->attr.loglevel_type,
-		lue->attr.loglevel);
+		local_ust_event->attr.name, local_ust_event->attr.loglevel_type,
+		local_ust_event->attr.loglevel);
 
-	return lue;
+	*ust_event = local_ust_event;
+
+	return ret;
 
 error_free_event:
-	free(lue);
+	free(local_ust_event);
 error:
-	return NULL;
+	free(filter_expression);
+	free(filter);
+	free(exclusion);
+	return ret;
+}
+
+static
+int trace_ust_context_type_event_to_ust(
+		enum lttng_event_context_type type)
+{
+	int utype;
+
+	switch (type) {
+	case LTTNG_EVENT_CONTEXT_VTID:
+		utype = LTTNG_UST_CONTEXT_VTID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VPID:
+		utype = LTTNG_UST_CONTEXT_VPID;
+		break;
+	case LTTNG_EVENT_CONTEXT_PTHREAD_ID:
+		utype = LTTNG_UST_CONTEXT_PTHREAD_ID;
+		break;
+	case LTTNG_EVENT_CONTEXT_PROCNAME:
+		utype = LTTNG_UST_CONTEXT_PROCNAME;
+		break;
+	case LTTNG_EVENT_CONTEXT_IP:
+		utype = LTTNG_UST_CONTEXT_IP;
+		break;
+	case LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER:
+		if (!ustctl_has_perf_counters()) {
+			utype = -1;
+			WARN("Perf counters not implemented in UST");
+		} else {
+			utype = LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER;
+		}
+		break;
+	case LTTNG_EVENT_CONTEXT_APP_CONTEXT:
+		utype = LTTNG_UST_CONTEXT_APP_CONTEXT;
+		break;
+	case LTTNG_EVENT_CONTEXT_CGROUP_NS:
+		utype = LTTNG_UST_CONTEXT_CGROUP_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_IPC_NS:
+		utype = LTTNG_UST_CONTEXT_IPC_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_MNT_NS:
+		utype = LTTNG_UST_CONTEXT_MNT_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_NET_NS:
+		utype = LTTNG_UST_CONTEXT_NET_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_PID_NS:
+		utype = LTTNG_UST_CONTEXT_PID_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_TIME_NS:
+		utype = LTTNG_UST_CONTEXT_TIME_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_USER_NS:
+		utype = LTTNG_UST_CONTEXT_USER_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_UTS_NS:
+		utype = LTTNG_UST_CONTEXT_UTS_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_VUID:
+		utype = LTTNG_UST_CONTEXT_VUID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VEUID:
+		utype = LTTNG_UST_CONTEXT_VEUID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VSUID:
+		utype = LTTNG_UST_CONTEXT_VSUID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VGID:
+		utype = LTTNG_UST_CONTEXT_VGID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VEGID:
+		utype = LTTNG_UST_CONTEXT_VEGID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VSGID:
+		utype = LTTNG_UST_CONTEXT_VSGID;
+		break;
+	default:
+		utype = -1;
+		break;
+	}
+	return utype;
 }
 
 /*
- * Allocate and initialize a ust metadata.
+ * Return 1 if contexts match, 0 otherwise.
+ */
+int trace_ust_match_context(const struct ltt_ust_context *uctx,
+		const struct lttng_event_context *ctx)
+{
+	int utype;
+
+	utype = trace_ust_context_type_event_to_ust(ctx->ctx);
+	if (utype < 0) {
+		return 0;
+	}
+	if (uctx->ctx.ctx != utype) {
+		return 0;
+	}
+	switch (utype) {
+	case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+		if (uctx->ctx.u.perf_counter.type
+				!= ctx->u.perf_counter.type) {
+			return 0;
+		}
+		if (uctx->ctx.u.perf_counter.config
+				!= ctx->u.perf_counter.config) {
+			return 0;
+		}
+		if (strncmp(uctx->ctx.u.perf_counter.name,
+				ctx->u.perf_counter.name,
+				LTTNG_UST_SYM_NAME_LEN)) {
+			return 0;
+		}
+		break;
+	case LTTNG_UST_CONTEXT_APP_CONTEXT:
+		assert(uctx->ctx.u.app_ctx.provider_name);
+		assert(uctx->ctx.u.app_ctx.ctx_name);
+		if (strcmp(uctx->ctx.u.app_ctx.provider_name,
+				ctx->u.app_ctx.provider_name) ||
+				strcmp(uctx->ctx.u.app_ctx.ctx_name,
+				ctx->u.app_ctx.ctx_name)) {
+			return 0;
+		}
+	default:
+		break;
+
+	}
+	return 1;
+}
+
+/*
+ * Allocate and initialize an UST context.
  *
  * Return pointer to structure or NULL.
  */
-struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
+struct ltt_ust_context *trace_ust_create_context(
+		const struct lttng_event_context *ctx)
 {
-	int ret;
-	struct ltt_ust_metadata *lum;
+	struct ltt_ust_context *uctx = NULL;
+	int utype;
 
-	assert(path);
+	assert(ctx);
 
-	lum = zmalloc(sizeof(struct ltt_ust_metadata));
-	if (lum == NULL) {
-		PERROR("ust metadata zmalloc");
-		goto error;
+	utype = trace_ust_context_type_event_to_ust(ctx->ctx);
+	if (utype < 0) {
+		ERR("Invalid UST context");
+		goto end;
 	}
 
-	/* Set default attributes */
-	lum->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
-	lum->attr.subbuf_size = default_get_metadata_subbuf_size();
-	lum->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
-	lum->attr.switch_timer_interval = DEFAULT_METADATA_SWITCH_TIMER;
-	lum->attr.read_timer_interval = DEFAULT_METADATA_READ_TIMER;
-	lum->attr.output = LTTNG_UST_MMAP;
-
-	lum->handle = -1;
-	/* Set metadata trace path */
-	ret = snprintf(lum->pathname, PATH_MAX, "%s/" DEFAULT_METADATA_NAME, path);
-	if (ret < 0) {
-		PERROR("asprintf ust metadata");
-		goto error_free_metadata;
+	uctx = zmalloc(sizeof(struct ltt_ust_context));
+	if (!uctx) {
+		PERROR("zmalloc ltt_ust_context");
+		goto end;
 	}
 
-	return lum;
+	uctx->ctx.ctx = (enum lttng_ust_context_type) utype;
+	switch (utype) {
+	case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+		uctx->ctx.u.perf_counter.type = ctx->u.perf_counter.type;
+		uctx->ctx.u.perf_counter.config = ctx->u.perf_counter.config;
+		strncpy(uctx->ctx.u.perf_counter.name, ctx->u.perf_counter.name,
+				LTTNG_UST_SYM_NAME_LEN);
+		uctx->ctx.u.perf_counter.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+		break;
+	case LTTNG_UST_CONTEXT_APP_CONTEXT:
+	{
+		char *provider_name = NULL, *ctx_name = NULL;
+
+		provider_name = strdup(ctx->u.app_ctx.provider_name);
+		if (!provider_name) {
+			goto error;
+		}
+		uctx->ctx.u.app_ctx.provider_name = provider_name;
 
-error_free_metadata:
-	free(lum);
+		ctx_name = strdup(ctx->u.app_ctx.ctx_name);
+		if (!ctx_name) {
+			goto error;
+		}
+		uctx->ctx.u.app_ctx.ctx_name = ctx_name;
+		break;
+	}
+	default:
+		break;
+	}
+	lttng_ht_node_init_ulong(&uctx->node, (unsigned long) uctx->ctx.ctx);
+end:
+	return uctx;
 error:
+	trace_ust_destroy_context(uctx);
 	return NULL;
 }
 
+static void destroy_id_tracker_node_rcu(struct rcu_head *head)
+{
+	struct ust_id_tracker_node *tracker_node = caa_container_of(
+			head, struct ust_id_tracker_node, node.head);
+	free(tracker_node);
+}
+
+static void destroy_id_tracker_node(struct ust_id_tracker_node *tracker_node)
+{
+	call_rcu(&tracker_node->node.head, destroy_id_tracker_node_rcu);
+}
+
+static int init_id_tracker(struct ust_id_tracker *id_tracker)
+{
+	int ret = LTTNG_OK;
+
+	id_tracker->ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
+	if (!id_tracker->ht) {
+		ret = LTTNG_ERR_NOMEM;
+		goto end;
+	}
+
+end:
+	return ret;
+}
+
 /*
- * Allocate and initialize an UST context.
- *
- * Return pointer to structure or NULL.
+ * Teardown id tracker content, but don't free id_tracker object.
  */
-struct ltt_ust_context *trace_ust_create_context(
-		struct lttng_event_context *ctx)
+static void fini_id_tracker(struct ust_id_tracker *id_tracker)
 {
-	struct ltt_ust_context *uctx;
-	enum lttng_ust_context_type utype;
+	struct ust_id_tracker_node *tracker_node;
+	struct lttng_ht_iter iter;
 
-	assert(ctx);
+	if (!id_tracker->ht) {
+		return;
+	}
+	rcu_read_lock();
+	cds_lfht_for_each_entry (id_tracker->ht->ht, &iter.iter, tracker_node,
+			node.node) {
+		int ret = lttng_ht_del(id_tracker->ht, &iter);
 
-	switch (ctx->ctx) {
-	case LTTNG_EVENT_CONTEXT_VTID:
-		utype = LTTNG_UST_CONTEXT_VTID;
+		assert(!ret);
+		destroy_id_tracker_node(tracker_node);
+	}
+	rcu_read_unlock();
+	ht_cleanup_push(id_tracker->ht);
+	id_tracker->ht = NULL;
+}
+
+static struct ust_id_tracker_node *id_tracker_lookup(
+		struct ust_id_tracker *id_tracker,
+		int id,
+		struct lttng_ht_iter *iter)
+{
+	unsigned long _id = (unsigned long) id;
+	struct lttng_ht_node_ulong *node;
+
+	lttng_ht_lookup(id_tracker->ht, (void *) _id, iter);
+	node = lttng_ht_iter_get_node_ulong(iter);
+	if (node) {
+		return caa_container_of(node, struct ust_id_tracker_node, node);
+	} else {
+		return NULL;
+	}
+}
+
+static int id_tracker_add_id(struct ust_id_tracker *id_tracker, int id)
+{
+	int retval = LTTNG_OK;
+	struct ust_id_tracker_node *tracker_node;
+	struct lttng_ht_iter iter;
+
+	if (id < 0) {
+		retval = LTTNG_ERR_INVALID;
+		goto end;
+	}
+	tracker_node = id_tracker_lookup(id_tracker, id, &iter);
+	if (tracker_node) {
+		/* Already exists. */
+		retval = LTTNG_ERR_PROCESS_ATTR_EXISTS;
+		goto end;
+	}
+	tracker_node = zmalloc(sizeof(*tracker_node));
+	if (!tracker_node) {
+		retval = LTTNG_ERR_NOMEM;
+		goto end;
+	}
+	lttng_ht_node_init_ulong(&tracker_node->node, (unsigned long) id);
+	lttng_ht_add_unique_ulong(id_tracker->ht, &tracker_node->node);
+end:
+	return retval;
+}
+
+static int id_tracker_del_id(struct ust_id_tracker *id_tracker, int id)
+{
+	int retval = LTTNG_OK, ret;
+	struct ust_id_tracker_node *tracker_node;
+	struct lttng_ht_iter iter;
+
+	if (id < 0) {
+		retval = LTTNG_ERR_INVALID;
+		goto end;
+	}
+	tracker_node = id_tracker_lookup(id_tracker, id, &iter);
+	if (!tracker_node) {
+		/* Not found */
+		retval = LTTNG_ERR_PROCESS_ATTR_MISSING;
+		goto end;
+	}
+	ret = lttng_ht_del(id_tracker->ht, &iter);
+	assert(!ret);
+
+	destroy_id_tracker_node(tracker_node);
+end:
+	return retval;
+}
+
+static struct ust_id_tracker *get_id_tracker(struct ltt_ust_session *session,
+		enum lttng_process_attr process_attr)
+{
+	switch (process_attr) {
+	case LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID:
+		return &session->vpid_tracker;
+	case LTTNG_PROCESS_ATTR_VIRTUAL_USER_ID:
+		return &session->vuid_tracker;
+	case LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID:
+		return &session->vgid_tracker;
+	default:
+		return NULL;
+	}
+}
+
+static struct process_attr_tracker *_trace_ust_get_process_attr_tracker(
+		struct ltt_ust_session *session,
+		enum lttng_process_attr process_attr)
+{
+	switch (process_attr) {
+	case LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID:
+		return session->tracker_vpid;
+	case LTTNG_PROCESS_ATTR_VIRTUAL_USER_ID:
+		return session->tracker_vuid;
+	case LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID:
+		return session->tracker_vgid;
+	default:
+		return NULL;
+	}
+}
+
+const struct process_attr_tracker *trace_ust_get_process_attr_tracker(
+		struct ltt_ust_session *session,
+		enum lttng_process_attr process_attr)
+{
+	return (const struct process_attr_tracker *)
+			_trace_ust_get_process_attr_tracker(
+					session, process_attr);
+}
+
+/*
+ * The session lock is held when calling this function.
+ */
+int trace_ust_id_tracker_lookup(enum lttng_process_attr process_attr,
+		struct ltt_ust_session *session,
+		int id)
+{
+	struct lttng_ht_iter iter;
+	struct ust_id_tracker *id_tracker;
+
+	id_tracker = get_id_tracker(session, process_attr);
+	if (!id_tracker) {
+		abort();
+	}
+	if (!id_tracker->ht) {
+		return 1;
+	}
+	if (id_tracker_lookup(id_tracker, id, &iter)) {
+		return 1;
+	}
+	return 0;
+}
+
+/*
+ * Called with the session lock held.
+ */
+enum lttng_error_code trace_ust_process_attr_tracker_set_tracking_policy(
+		struct ltt_ust_session *session,
+		enum lttng_process_attr process_attr,
+		enum lttng_tracking_policy policy)
+{
+	int ret;
+	enum lttng_error_code ret_code = LTTNG_OK;
+	struct ust_id_tracker *id_tracker =
+			get_id_tracker(session, process_attr);
+	struct process_attr_tracker *tracker =
+			_trace_ust_get_process_attr_tracker(
+					session, process_attr);
+	bool should_update_apps = false;
+	enum lttng_tracking_policy previous_policy;
+
+	if (!tracker) {
+		ret_code = LTTNG_ERR_INVALID;
+		goto end;
+	}
+
+	previous_policy = process_attr_tracker_get_tracking_policy(tracker);
+	ret = process_attr_tracker_set_tracking_policy(tracker, policy);
+	if (ret) {
+		ret_code = LTTNG_ERR_UNK;
+		goto end;
+	}
+
+	if (previous_policy == policy) {
+		goto end;
+	}
+
+	switch (policy) {
+	case LTTNG_TRACKING_POLICY_INCLUDE_ALL:
+		/* Track all values: destroy tracker if exists. */
+		if (id_tracker->ht) {
+			fini_id_tracker(id_tracker);
+			/* Ensure all apps have session. */
+			should_update_apps = true;
+		}
 		break;
-	case LTTNG_EVENT_CONTEXT_VPID:
-		utype = LTTNG_UST_CONTEXT_VPID;
+	case LTTNG_TRACKING_POLICY_EXCLUDE_ALL:
+	case LTTNG_TRACKING_POLICY_INCLUDE_SET:
+		/* fall-through. */
+		fini_id_tracker(id_tracker);
+		ret_code = init_id_tracker(id_tracker);
+		if (ret_code != LTTNG_OK) {
+			ERR("Error initializing ID tracker");
+			goto end;
+		}
+		/* Remove all apps from session. */
+		should_update_apps = true;
 		break;
-	case LTTNG_EVENT_CONTEXT_PTHREAD_ID:
-		utype = LTTNG_UST_CONTEXT_PTHREAD_ID;
+	default:
+		abort();
+	}
+	if (should_update_apps && session->active) {
+		ust_app_global_update_all(session);
+	}
+end:
+	return ret_code;
+}
+
+/* Called with the session lock held. */
+enum lttng_error_code trace_ust_process_attr_tracker_inclusion_set_add_value(
+		struct ltt_ust_session *session,
+		enum lttng_process_attr process_attr,
+		const struct process_attr_value *value)
+{
+	enum lttng_error_code ret_code = LTTNG_OK;
+	bool should_update_apps = false;
+	struct ust_id_tracker *id_tracker =
+			get_id_tracker(session, process_attr);
+	struct process_attr_tracker *tracker;
+	int integral_value;
+	enum process_attr_tracker_status status;
+	struct ust_app *app;
+
+	/*
+	 * Convert process attribute tracker value to the integral
+	 * representation required by the kern-ctl API.
+	 */
+	switch (process_attr) {
+	case LTTNG_PROCESS_ATTR_PROCESS_ID:
+	case LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID:
+		integral_value = (int) value->value.pid;
 		break;
-	case LTTNG_EVENT_CONTEXT_PROCNAME:
-		utype = LTTNG_UST_CONTEXT_PROCNAME;
+	case LTTNG_PROCESS_ATTR_USER_ID:
+	case LTTNG_PROCESS_ATTR_VIRTUAL_USER_ID:
+		if (value->type == LTTNG_PROCESS_ATTR_VALUE_TYPE_USER_NAME) {
+			uid_t uid;
+
+			ret_code = utils_user_id_from_name(
+					value->value.user_name, &uid);
+			if (ret_code != LTTNG_OK) {
+				goto end;
+			}
+			integral_value = (int) uid;
+		} else {
+			integral_value = (int) value->value.uid;
+		}
 		break;
-	case LTTNG_EVENT_CONTEXT_IP:
-		utype = LTTNG_UST_CONTEXT_IP;
+	case LTTNG_PROCESS_ATTR_GROUP_ID:
+	case LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID:
+		if (value->type == LTTNG_PROCESS_ATTR_VALUE_TYPE_GROUP_NAME) {
+			gid_t gid;
+
+			ret_code = utils_group_id_from_name(
+					value->value.group_name, &gid);
+			if (ret_code != LTTNG_OK) {
+				goto end;
+			}
+			integral_value = (int) gid;
+		} else {
+			integral_value = (int) value->value.gid;
+		}
 		break;
 	default:
-		ERR("Invalid UST context");
-		return NULL;
+		ret_code = LTTNG_ERR_INVALID;
+		goto end;
 	}
 
-	uctx = zmalloc(sizeof(struct ltt_ust_context));
-	if (uctx == NULL) {
-		PERROR("zmalloc ltt_ust_context");
-		goto error;
+	tracker = _trace_ust_get_process_attr_tracker(session, process_attr);
+	if (!tracker) {
+		ret_code = LTTNG_ERR_INVALID;
+		goto end;
 	}
 
-	uctx->ctx.ctx = utype;
-	lttng_ht_node_init_ulong(&uctx->node, (unsigned long) uctx->ctx.ctx);
+	status = process_attr_tracker_inclusion_set_add_value(tracker, value);
+	if (status != PROCESS_ATTR_TRACKER_STATUS_OK) {
+		switch (status) {
+		case PROCESS_ATTR_TRACKER_STATUS_EXISTS:
+			ret_code = LTTNG_ERR_PROCESS_ATTR_EXISTS;
+			break;
+		case PROCESS_ATTR_TRACKER_STATUS_INVALID_TRACKING_POLICY:
+			ret_code = LTTNG_ERR_PROCESS_ATTR_TRACKER_INVALID_TRACKING_POLICY;
+			break;
+		case PROCESS_ATTR_TRACKER_STATUS_ERROR:
+		default:
+			ret_code = LTTNG_ERR_UNK;
+			break;
+		}
+		goto end;
+	}
 
-	return uctx;
+	DBG("User space track %s %d for session id %" PRIu64,
+			lttng_process_attr_to_string(process_attr),
+			integral_value, session->id);
 
-error:
-	return NULL;
+	ret_code = id_tracker_add_id(id_tracker, integral_value);
+	if (ret_code != LTTNG_OK) {
+		goto end;
+	}
+	/* Add session to application */
+	switch (process_attr) {
+	case LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID:
+		app = ust_app_find_by_pid(integral_value);
+		if (app) {
+			should_update_apps = true;
+		}
+		break;
+	default:
+		should_update_apps = true;
+		break;
+	}
+	if (should_update_apps && session->active) {
+		ust_app_global_update_all(session);
+	}
+end:
+	return ret_code;
+}
+
+/* Called with the session lock held. */
+enum lttng_error_code trace_ust_process_attr_tracker_inclusion_set_remove_value(
+		struct ltt_ust_session *session,
+		enum lttng_process_attr process_attr,
+		const struct process_attr_value *value)
+{
+	enum lttng_error_code ret_code = LTTNG_OK;
+	bool should_update_apps = false;
+	struct ust_id_tracker *id_tracker =
+			get_id_tracker(session, process_attr);
+	struct process_attr_tracker *tracker;
+	int integral_value;
+	enum process_attr_tracker_status status;
+	struct ust_app *app;
+
+	/*
+	 * Convert process attribute tracker value to the integral
+	 * representation required by the kern-ctl API.
+	 */
+	switch (process_attr) {
+	case LTTNG_PROCESS_ATTR_PROCESS_ID:
+	case LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID:
+		integral_value = (int) value->value.pid;
+		break;
+	case LTTNG_PROCESS_ATTR_USER_ID:
+	case LTTNG_PROCESS_ATTR_VIRTUAL_USER_ID:
+		if (value->type == LTTNG_PROCESS_ATTR_VALUE_TYPE_USER_NAME) {
+			uid_t uid;
+
+			ret_code = utils_user_id_from_name(
+					value->value.user_name, &uid);
+			if (ret_code != LTTNG_OK) {
+				goto end;
+			}
+			integral_value = (int) uid;
+		} else {
+			integral_value = (int) value->value.uid;
+		}
+		break;
+	case LTTNG_PROCESS_ATTR_GROUP_ID:
+	case LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID:
+		if (value->type == LTTNG_PROCESS_ATTR_VALUE_TYPE_GROUP_NAME) {
+			gid_t gid;
+
+			ret_code = utils_group_id_from_name(
+					value->value.group_name, &gid);
+			if (ret_code != LTTNG_OK) {
+				goto end;
+			}
+			integral_value = (int) gid;
+		} else {
+			integral_value = (int) value->value.gid;
+		}
+		break;
+	default:
+		ret_code = LTTNG_ERR_INVALID;
+		goto end;
+	}
+
+	tracker = _trace_ust_get_process_attr_tracker(session, process_attr);
+	if (!tracker) {
+		ret_code = LTTNG_ERR_INVALID;
+		goto end;
+	}
+
+	status = process_attr_tracker_inclusion_set_remove_value(
+			tracker, value);
+	if (status != PROCESS_ATTR_TRACKER_STATUS_OK) {
+		switch (status) {
+		case PROCESS_ATTR_TRACKER_STATUS_MISSING:
+			ret_code = LTTNG_ERR_PROCESS_ATTR_MISSING;
+			break;
+		case PROCESS_ATTR_TRACKER_STATUS_INVALID_TRACKING_POLICY:
+			ret_code = LTTNG_ERR_PROCESS_ATTR_TRACKER_INVALID_TRACKING_POLICY;
+			break;
+		case PROCESS_ATTR_TRACKER_STATUS_ERROR:
+		default:
+			ret_code = LTTNG_ERR_UNK;
+			break;
+		}
+		goto end;
+	}
+
+	DBG("User space untrack %s %d for session id %" PRIu64,
+			lttng_process_attr_to_string(process_attr),
+			integral_value, session->id);
+
+	ret_code = id_tracker_del_id(id_tracker, integral_value);
+	if (ret_code != LTTNG_OK) {
+		goto end;
+	}
+	/* Add session to application */
+	switch (process_attr) {
+	case LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID:
+		app = ust_app_find_by_pid(integral_value);
+		if (app) {
+			should_update_apps = true;
+		}
+		break;
+	default:
+		should_update_apps = true;
+		break;
+	}
+	if (should_update_apps && session->active) {
+		ust_app_global_update_all(session);
+	}
+end:
+	return ret_code;
 }
 
 /*
@@ -465,7 +1203,7 @@ static void destroy_context_rcu(struct rcu_head *head)
 	struct ltt_ust_context *ctx =
 		caa_container_of(node, struct ltt_ust_context, node);
 
-	free(ctx);
+	trace_ust_destroy_context(ctx);
 }
 
 /*
@@ -476,11 +1214,16 @@ static void destroy_contexts(struct lttng_ht *ht)
 	int ret;
 	struct lttng_ht_node_ulong *node;
 	struct lttng_ht_iter iter;
+	struct ltt_ust_context *ctx;
 
 	assert(ht);
 
 	rcu_read_lock();
 	cds_lfht_for_each_entry(ht->ht, &iter.iter, node, node) {
+		/* Remove from ordered list. */
+		ctx = caa_container_of(node, struct ltt_ust_context, node);
+		cds_list_del(&ctx->list);
+		/* Remove from channel's hash table. */
 		ret = lttng_ht_del(ht, &iter);
 		if (!ret) {
 			call_rcu(&node->head, destroy_context_rcu);
@@ -499,10 +1242,26 @@ void trace_ust_destroy_event(struct ltt_ust_event *event)
 	assert(event);
 
 	DBG2("Trace destroy UST event %s", event->attr.name);
+	free(event->filter_expression);
 	free(event->filter);
+	free(event->exclusion);
 	free(event);
 }
 
+/*
+ * Cleanup ust context structure.
+ */
+void trace_ust_destroy_context(struct ltt_ust_context *ctx)
+{
+	assert(ctx);
+
+	if (ctx->ctx.ctx == LTTNG_UST_CONTEXT_APP_CONTEXT) {
+		free(ctx->ctx.u.app_ctx.provider_name);
+		free(ctx->ctx.u.app_ctx.ctx_name);
+	}
+	free(ctx);
+}
+
 /*
  * URCU intermediate call to complete destroy event.
  */
@@ -549,11 +1308,6 @@ static void _trace_ust_destroy_channel(struct ltt_ust_channel *channel)
 
 	DBG2("Trace destroy UST channel %s", channel->name);
 
-	/* Destroying all events of the channel */
-	destroy_events(channel->events);
-	/* Destroying all context of the channel */
-	destroy_contexts(channel->ctx);
-
 	free(channel);
 }
 
@@ -572,6 +1326,11 @@ static void destroy_channel_rcu(struct rcu_head *head)
 
 void trace_ust_destroy_channel(struct ltt_ust_channel *channel)
 {
+	/* Destroying all events of the channel */
+	destroy_events(channel->events);
+	/* Destroying all context of the channel */
+	destroy_contexts(channel->ctx);
+
 	call_rcu(&channel->node.head, destroy_channel_rcu);
 }
 
@@ -592,37 +1351,23 @@ void trace_ust_delete_channel(struct lttng_ht *ht,
 	assert(!ret);
 }
 
-/*
- * Cleanup ust metadata structure.
- */
-void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata)
-{
-	assert(metadata);
-
-	if (!metadata->handle) {
-		return;
-	}
-	DBG2("Trace UST destroy metadata %d", metadata->handle);
-	free(metadata);
-}
-
 /*
  * Iterate over a hash table containing channels and cleanup safely.
  */
 static void destroy_channels(struct lttng_ht *channels)
 {
-	int ret;
 	struct lttng_ht_node_str *node;
 	struct lttng_ht_iter iter;
 
 	assert(channels);
 
 	rcu_read_lock();
-
 	cds_lfht_for_each_entry(channels->ht, &iter.iter, node, node) {
-		ret = lttng_ht_del(channels, &iter);
-		assert(!ret);
-		call_rcu(&node->head, destroy_channel_rcu);
+		struct ltt_ust_channel *chan =
+			caa_container_of(node, struct ltt_ust_channel, node);
+
+		trace_ust_delete_channel(channels, chan);
+		trace_ust_destroy_channel(chan);
 	}
 	rcu_read_unlock();
 
@@ -640,13 +1385,16 @@ static void destroy_domain_global(struct ltt_ust_domain_global *dom)
 }
 
 /*
- * Cleanup ust session structure
+ * Cleanup ust session structure, keeping data required by
+ * destroy notifier.
  *
  * Should *NOT* be called with RCU read-side lock held.
  */
 void trace_ust_destroy_session(struct ltt_ust_session *session)
 {
+	struct agent *agt;
 	struct buffer_reg_uid *reg, *sreg;
+	struct lttng_ht_iter iter;
 
 	assert(session);
 
@@ -655,6 +1403,17 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
 	/* Cleaning up UST domain */
 	destroy_domain_global(&session->domain_global);
 
+	rcu_read_lock();
+	cds_lfht_for_each_entry(session->agents->ht, &iter.iter, agt, node.node) {
+		int ret = lttng_ht_del(session->agents, &iter);
+
+		assert(!ret);
+		agent_destroy(agt);
+	}
+	rcu_read_unlock();
+
+	ht_cleanup_push(session->agents);
+
 	/* Cleanup UID buffer registry object(s). */
 	cds_list_for_each_entry_safe(reg, sreg, &session->buffer_reg_uid_list,
 			lnode) {
@@ -663,8 +1422,19 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
 		buffer_reg_uid_destroy(reg, session->consumer);
 	}
 
-	consumer_destroy_output(session->consumer);
-	consumer_destroy_output(session->tmp_consumer);
+	process_attr_tracker_destroy(session->tracker_vpid);
+	process_attr_tracker_destroy(session->tracker_vuid);
+	process_attr_tracker_destroy(session->tracker_vgid);
 
+	fini_id_tracker(&session->vpid_tracker);
+	fini_id_tracker(&session->vuid_tracker);
+	fini_id_tracker(&session->vgid_tracker);
+	lttng_trace_chunk_put(session->current_trace_chunk);
+}
+
+/* Free elements needed by destroy notifiers. */
+void trace_ust_free_session(struct ltt_ust_session *session)
+{
+	consumer_output_put(session->consumer);
 	free(session);
 }