X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=8e96e3e424b60e8e658909085ded0d9f9f96920d;hp=5ba14748d9014b07cd5ec1aabba2dedae87940b4;hb=3d1384a4add389c38f8554130e8dec2e2d06009d;hpb=763f0d4cef1438d3f1f5f5c5a232d72628bca550

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 5ba14748d..8e96e3e42 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -28,6 +28,7 @@
 #include <lttng/condition/condition.h>
 #include <lttng/condition/event-rule-internal.h>
 #include <lttng/condition/event-rule.h>
+#include <lttng/trigger/trigger-internal.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 
 #include "buffer-registry.h"
@@ -87,7 +88,7 @@ static uint64_t get_next_session_id(void)
 
 static void copy_channel_attr_to_ustctl(
 		struct ustctl_consumer_channel_attr *attr,
-		struct lttng_ust_channel_attr *uattr)
+		struct lttng_ust_abi_channel_attr *uattr)
 {
 	/* Copy event attributes since the layout is different. */
 	attr->subbuf_size = uattr->subbuf_size;
@@ -127,7 +128,7 @@ static int ht_match_ust_app_event(struct cds_lfht_node *node, const void *_key)
 
 	/* Event loglevel. */
 	if (ev_loglevel_value != key->loglevel_type) {
-		if (event->attr.loglevel_type == LTTNG_UST_LOGLEVEL_ALL
+		if (event->attr.loglevel_type == LTTNG_UST_ABI_LOGLEVEL_ALL
 				&& key->loglevel_type == 0 &&
 				ev_loglevel_value == -1) {
 			/*
@@ -164,7 +165,7 @@ static int ht_match_ust_app_event(struct cds_lfht_node *node, const void *_key)
 		/* Both exclusions exists, check count followed by the names. */
 		if (event->exclusion->count != key->exclusion->count ||
 				memcmp(event->exclusion->names, key->exclusion->names,
-					event->exclusion->count * LTTNG_UST_SYM_NAME_LEN) != 0) {
+					event->exclusion->count * LTTNG_UST_ABI_SYM_NAME_LEN) != 0) {
 			goto no_match;
 		}
 	}
@@ -362,7 +363,7 @@ static void delete_ust_app_event_notifier_rule(int sock,
 		free(ua_event_notifier_rule->obj);
 	}
 
-	lttng_event_rule_put(ua_event_notifier_rule->event_rule);
+	lttng_trigger_put(ua_event_notifier_rule->trigger);
 	call_rcu(&ua_event_notifier_rule->rcu_head,
 			free_ust_app_event_notifier_rule_rcu);
 }
@@ -439,7 +440,7 @@ void save_per_pid_lost_discarded_counters(struct ust_app_channel *ua_chan)
 	struct ltt_session *session;
 	struct ltt_ust_channel *uchan;
 
-	if (ua_chan->attr.type != LTTNG_UST_CHAN_PER_CPU) {
+	if (ua_chan->attr.type != LTTNG_UST_ABI_CHAN_PER_CPU) {
 		return;
 	}
 
@@ -579,7 +580,7 @@ int ust_app_register_done(struct ust_app *app)
 	return ret;
 }
 
-int ust_app_release_object(struct ust_app *app, struct lttng_ust_object_data *data)
+int ust_app_release_object(struct ust_app *app, struct lttng_ust_abi_object_data *data)
 {
 	int ret, sock;
 
@@ -1108,7 +1109,7 @@ struct ust_app_session *alloc_ust_app_session(void)
 
 	ua_sess->handle = -1;
 	ua_sess->channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
-	ua_sess->metadata_attr.type = LTTNG_UST_CHAN_METADATA;
+	ua_sess->metadata_attr.type = LTTNG_UST_ABI_CHAN_METADATA;
 	pthread_mutex_init(&ua_sess->lock, NULL);
 
 	return ua_sess;
@@ -1123,7 +1124,7 @@ error_free:
 static
 struct ust_app_channel *alloc_ust_app_channel(const char *name,
 		struct ust_app_session *ua_sess,
-		struct lttng_ust_channel_attr *attr)
+		struct lttng_ust_abi_channel_attr *attr)
 {
 	struct ust_app_channel *ua_chan;
 
@@ -1161,7 +1162,7 @@ struct ust_app_channel *alloc_ust_app_channel(const char *name,
 		ua_chan->attr.blocking_timeout = attr->u.s.blocking_timeout;
 	}
 	/* By default, the channel is a per cpu channel. */
-	ua_chan->attr.type = LTTNG_UST_CHAN_PER_CPU;
+	ua_chan->attr.type = LTTNG_UST_ABI_CHAN_PER_CPU;
 
 	DBG3("UST app channel %s allocated", ua_chan->name);
 
@@ -1198,7 +1199,7 @@ error:
  */
 static
 struct ust_app_event *alloc_ust_app_event(char *name,
-		struct lttng_ust_event *attr)
+		struct lttng_ust_abi_event *attr)
 {
 	struct ust_app_event *ua_event;
 
@@ -1231,11 +1232,13 @@ error:
  * Allocate a new UST app event notifier rule.
  */
 static struct ust_app_event_notifier_rule *alloc_ust_app_event_notifier_rule(
-		struct lttng_event_rule *event_rule, uint64_t token)
+		struct lttng_trigger *trigger)
 {
 	enum lttng_event_rule_generate_exclusions_status
 			generate_exclusion_status;
 	struct ust_app_event_notifier_rule *ua_event_notifier_rule;
+	struct lttng_condition *condition = NULL;
+	const struct lttng_event_rule *event_rule = NULL;
 
 	ua_event_notifier_rule = zmalloc(sizeof(struct ust_app_event_notifier_rule));
 	if (ua_event_notifier_rule == NULL) {
@@ -1244,15 +1247,21 @@ static struct ust_app_event_notifier_rule *alloc_ust_app_event_notifier_rule(
 	}
 
 	ua_event_notifier_rule->enabled = 1;
-	ua_event_notifier_rule->token = token;
-	lttng_ht_node_init_u64(&ua_event_notifier_rule->node, token);
+	ua_event_notifier_rule->token = lttng_trigger_get_tracer_token(trigger);
+	lttng_ht_node_init_u64(&ua_event_notifier_rule->node,
+			ua_event_notifier_rule->token);
 
-	/* Get reference of the event rule. */
-	if (!lttng_event_rule_get(event_rule)) {
-		abort();
-	}
+	condition = lttng_trigger_get_condition(trigger);
+	assert(condition);
+	assert(lttng_condition_get_type(condition) == LTTNG_CONDITION_TYPE_EVENT_RULE_HIT);
+
+	assert(LTTNG_CONDITION_STATUS_OK == lttng_condition_event_rule_get_rule(condition, &event_rule));
+	assert(event_rule);
+
+	/* Acquire the event notifier's reference to the trigger. */
+	lttng_trigger_get(trigger);
 
-	ua_event_notifier_rule->event_rule = event_rule;
+	ua_event_notifier_rule->trigger = trigger;
 	ua_event_notifier_rule->filter = lttng_event_rule_get_filter_bytecode(event_rule);
 	generate_exclusion_status = lttng_event_rule_generate_exclusions(
 			event_rule, &ua_event_notifier_rule->exclusion);
@@ -1262,8 +1271,8 @@ static struct ust_app_event_notifier_rule *alloc_ust_app_event_notifier_rule(
 		break;
 	default:
 		/* Error occured. */
-		ERR("Failed to generate exclusions from event rule while allocating an event notifier rule");
-		goto error_put_event_rule;
+		ERR("Failed to generate exclusions from trigger while allocating an event notifier rule");
+		goto error_put_trigger;
 	}
 
 	DBG3("UST app event notifier rule allocated: token = %" PRIu64,
@@ -1271,8 +1280,8 @@ static struct ust_app_event_notifier_rule *alloc_ust_app_event_notifier_rule(
 
 	return ua_event_notifier_rule;
 
-error_put_event_rule:
-	lttng_event_rule_put(event_rule);
+error_put_trigger:
+	lttng_trigger_put(trigger);
 error:
 	free(ua_event_notifier_rule);
 	return NULL;
@@ -1295,7 +1304,7 @@ struct ust_app_ctx *alloc_ust_app_ctx(struct lttng_ust_context_attr *uctx)
 
 	if (uctx) {
 		memcpy(&ua_ctx->ctx, uctx, sizeof(ua_ctx->ctx));
-		if (uctx->ctx == LTTNG_UST_CONTEXT_APP_CONTEXT) {
+		if (uctx->ctx == LTTNG_UST_ABI_CONTEXT_APP_CONTEXT) {
 			char *provider_name = NULL, *ctx_name = NULL;
 
 			provider_name = strdup(uctx->u.app_ctx.provider_name);
@@ -1323,25 +1332,49 @@ error:
  *
  * Return allocated filter or NULL on error.
  */
-static struct lttng_ust_filter_bytecode *create_ust_bytecode_from_bytecode(
-		const struct lttng_filter_bytecode *orig_f)
+static struct lttng_ust_abi_filter_bytecode *create_ust_filter_bytecode_from_bytecode(
+		const struct lttng_bytecode *orig_f)
 {
-	struct lttng_ust_filter_bytecode *filter = NULL;
+	struct lttng_ust_abi_filter_bytecode *filter = NULL;
 
-	/* Copy filter bytecode */
+	/* Copy filter bytecode. */
 	filter = zmalloc(sizeof(*filter) + orig_f->len);
 	if (!filter) {
-		PERROR("zmalloc alloc ust filter bytecode");
+		PERROR("Failed to allocate lttng_ust_filter_bytecode: bytecode len = %" PRIu32 " bytes", orig_f->len);
 		goto error;
 	}
 
-	assert(sizeof(struct lttng_filter_bytecode) ==
-			sizeof(struct lttng_ust_filter_bytecode));
+	assert(sizeof(struct lttng_bytecode) ==
+			sizeof(struct lttng_ust_abi_filter_bytecode));
 	memcpy(filter, orig_f, sizeof(*filter) + orig_f->len);
 error:
 	return filter;
 }
 
+/*
+ * Create a liblttng-ust capture bytecode from given bytecode.
+ *
+ * Return allocated filter or NULL on error.
+ */
+static struct lttng_ust_abi_capture_bytecode *
+create_ust_capture_bytecode_from_bytecode(const struct lttng_bytecode *orig_f)
+{
+	struct lttng_ust_abi_capture_bytecode *capture = NULL;
+
+	/* Copy capture bytecode. */
+	capture = zmalloc(sizeof(*capture) + orig_f->len);
+	if (!capture) {
+		PERROR("Failed to allocate lttng_ust_abi_capture_bytecode: bytecode len = %" PRIu32 " bytes", orig_f->len);
+		goto error;
+	}
+
+	assert(sizeof(struct lttng_bytecode) ==
+			sizeof(struct lttng_ust_abi_capture_bytecode));
+	memcpy(capture, orig_f, sizeof(*capture) + orig_f->len);
+error:
+	return capture;
+}
+
 /*
  * Find an ust_app using the sock and return it. RCU read side lock must be
  * held before calling this helper function.
@@ -1394,7 +1427,7 @@ error:
  * Return an ust_app_event object or NULL on error.
  */
 static struct ust_app_event *find_ust_app_event(struct lttng_ht *ht,
-		const char *name, const struct lttng_filter_bytecode *filter,
+		const char *name, const struct lttng_bytecode *filter,
 		int loglevel_value,
 		const struct lttng_event_exclusion *exclusion)
 {
@@ -1503,15 +1536,15 @@ error:
  * Set the filter on the tracer.
  */
 static int set_ust_object_filter(struct ust_app *app,
-		const struct lttng_filter_bytecode *bytecode,
-		struct lttng_ust_object_data *ust_object)
+		const struct lttng_bytecode *bytecode,
+		struct lttng_ust_abi_object_data *ust_object)
 {
 	int ret;
-	struct lttng_ust_filter_bytecode *ust_bytecode = NULL;
+	struct lttng_ust_abi_filter_bytecode *ust_bytecode = NULL;
 
 	health_code_update();
 
-	ust_bytecode = create_ust_bytecode_from_bytecode(bytecode);
+	ust_bytecode = create_ust_filter_bytecode_from_bytecode(bytecode);
 	if (!ust_bytecode) {
 		ret = -LTTNG_ERR_NOMEM;
 		goto error;
@@ -1522,8 +1555,8 @@ static int set_ust_object_filter(struct ust_app *app,
 	pthread_mutex_unlock(&app->sock_lock);
 	if (ret < 0) {
 		if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
-			ERR("UST app set object filter failed for object %p of app (pid: %d) "
-					"with ret %d", ust_object, app->pid, ret);
+			ERR("UST app set object filter failed: object = %p of app pid = %d, ret = %d",
+					ust_object, app->pid, ret);
 		} else {
 			/*
 			 * This is normal behavior, an application can die during the
@@ -1536,7 +1569,62 @@ static int set_ust_object_filter(struct ust_app *app,
 		goto error;
 	}
 
-	DBG2("UST filter successfully set for object %p", ust_object);
+	DBG2("UST filter successfully set: object = %p", ust_object);
+
+error:
+	health_code_update();
+	free(ust_bytecode);
+	return ret;
+}
+
+/*
+ * Set a capture bytecode for the passed object.
+ * The sequence number enforces the ordering at runtime and on reception of
+ * the captured payloads.
+ */
+static int set_ust_capture(struct ust_app *app,
+		const struct lttng_bytecode *bytecode,
+		unsigned int capture_seqnum,
+		struct lttng_ust_abi_object_data *ust_object)
+{
+	int ret;
+	struct lttng_ust_abi_capture_bytecode *ust_bytecode = NULL;
+
+	health_code_update();
+
+	ust_bytecode = create_ust_capture_bytecode_from_bytecode(bytecode);
+	if (!ust_bytecode) {
+		ret = -LTTNG_ERR_NOMEM;
+		goto error;
+	}
+
+	/*
+	 * Set the sequence number to ensure the capture of fields is ordered.
+	 */
+	ust_bytecode->seqnum = capture_seqnum;
+
+	pthread_mutex_lock(&app->sock_lock);
+	ret = ustctl_set_capture(app->sock, ust_bytecode,
+			ust_object);
+	pthread_mutex_unlock(&app->sock_lock);
+	if (ret < 0) {
+		if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
+			ERR("UST app set object capture failed: object = %p of app pid = %d, ret = %d",
+					ust_object, app->pid, ret);
+		} else {
+			/*
+			 * This is normal behavior, an application can die during the
+			 * creation process. Don't report an error so the execution can
+			 * continue normally.
+			 */
+			ret = 0;
+			DBG3("Failed to set UST app object capture. Application is dead.");
+		}
+
+		goto error;
+	}
+
+	DBG2("UST capture successfully set: object = %p", ust_object);
 
 error:
 	health_code_update();
@@ -1545,12 +1633,12 @@ error:
 }
 
 static
-struct lttng_ust_event_exclusion *create_ust_exclusion_from_exclusion(
+struct lttng_ust_abi_event_exclusion *create_ust_exclusion_from_exclusion(
 		const struct lttng_event_exclusion *exclusion)
 {
-	struct lttng_ust_event_exclusion *ust_exclusion = NULL;
-	size_t exclusion_alloc_size = sizeof(struct lttng_ust_event_exclusion) +
-		LTTNG_UST_SYM_NAME_LEN * exclusion->count;
+	struct lttng_ust_abi_event_exclusion *ust_exclusion = NULL;
+	size_t exclusion_alloc_size = sizeof(struct lttng_ust_abi_event_exclusion) +
+		LTTNG_UST_ABI_SYM_NAME_LEN * exclusion->count;
 
 	ust_exclusion = zmalloc(exclusion_alloc_size);
 	if (!ust_exclusion) {
@@ -1559,7 +1647,7 @@ struct lttng_ust_event_exclusion *create_ust_exclusion_from_exclusion(
 	}
 
 	assert(sizeof(struct lttng_event_exclusion) ==
-			sizeof(struct lttng_ust_event_exclusion));
+			sizeof(struct lttng_ust_abi_event_exclusion));
 	memcpy(ust_exclusion, exclusion, exclusion_alloc_size);
 end:
 	return ust_exclusion;
@@ -1570,10 +1658,10 @@ end:
  */
 static int set_ust_object_exclusions(struct ust_app *app,
 		const struct lttng_event_exclusion *exclusions,
-		struct lttng_ust_object_data *ust_object)
+		struct lttng_ust_abi_object_data *ust_object)
 {
 	int ret;
-	struct lttng_ust_event_exclusion *ust_exclusions = NULL;
+	struct lttng_ust_abi_event_exclusion *ust_exclusions = NULL;
 
 	assert(exclusions && exclusions->count > 0);
 
@@ -1616,7 +1704,7 @@ error:
  * Disable the specified event on to UST tracer for the UST session.
  */
 static int disable_ust_object(struct ust_app *app,
-		struct lttng_ust_object_data *object)
+		struct lttng_ust_abi_object_data *object)
 {
 	int ret;
 
@@ -1731,7 +1819,7 @@ error:
  * Enable the specified event on to UST tracer for the UST session.
  */
 static int enable_ust_object(
-		struct ust_app *app, struct lttng_ust_object_data *ust_object)
+		struct ust_app *app, struct lttng_ust_abi_object_data *ust_object)
 {
 	int ret;
 
@@ -1909,11 +1997,11 @@ error:
 
 static int init_ust_event_notifier_from_event_rule(
 		const struct lttng_event_rule *rule,
-		struct lttng_ust_event_notifier *event_notifier)
+		struct lttng_ust_abi_event_notifier *event_notifier)
 {
 	enum lttng_event_rule_status status;
 	enum lttng_loglevel_type loglevel_type;
-	enum lttng_ust_loglevel_type ust_loglevel_type = LTTNG_UST_LOGLEVEL_ALL;
+	enum lttng_ust_abi_loglevel_type ust_loglevel_type = LTTNG_UST_ABI_LOGLEVEL_ALL;
 	int loglevel = -1, ret = 0;
 	const char *pattern;
 
@@ -1933,7 +2021,7 @@ static int init_ust_event_notifier_from_event_rule(
 		pattern = event_get_default_agent_ust_name(
 				lttng_event_rule_get_domain_type(rule));
 		loglevel = 0;
-		ust_loglevel_type = LTTNG_UST_LOGLEVEL_ALL;
+		ust_loglevel_type = LTTNG_UST_ABI_LOGLEVEL_ALL;
 	} else {
 		status = lttng_event_rule_tracepoint_get_pattern(
 				rule, &pattern);
@@ -1951,13 +2039,13 @@ static int init_ust_event_notifier_from_event_rule(
 
 		switch (loglevel_type) {
 		case LTTNG_EVENT_LOGLEVEL_ALL:
-			ust_loglevel_type = LTTNG_UST_LOGLEVEL_ALL;
+			ust_loglevel_type = LTTNG_UST_ABI_LOGLEVEL_ALL;
 			break;
 		case LTTNG_EVENT_LOGLEVEL_RANGE:
-			ust_loglevel_type = LTTNG_UST_LOGLEVEL_RANGE;
+			ust_loglevel_type = LTTNG_UST_ABI_LOGLEVEL_RANGE;
 			break;
 		case LTTNG_EVENT_LOGLEVEL_SINGLE:
-			ust_loglevel_type = LTTNG_UST_LOGLEVEL_SINGLE;
+			ust_loglevel_type = LTTNG_UST_ABI_LOGLEVEL_SINGLE;
 			break;
 		default:
 			/* Unknown log level specification type. */
@@ -1971,9 +2059,9 @@ static int init_ust_event_notifier_from_event_rule(
 		}
 	}
 
-	event_notifier->event.instrumentation = LTTNG_UST_TRACEPOINT;
+	event_notifier->event.instrumentation = LTTNG_UST_ABI_TRACEPOINT;
 	ret = lttng_strncpy(event_notifier->event.name, pattern,
-			LTTNG_UST_SYM_NAME_LEN - 1);
+			LTTNG_UST_ABI_SYM_NAME_LEN - 1);
 	if (ret) {
 		ERR("Failed to copy event rule pattern to notifier: pattern = '%s' ",
 				pattern);
@@ -1994,19 +2082,27 @@ static int create_ust_event_notifier(struct ust_app *app,
 		struct ust_app_event_notifier_rule *ua_event_notifier_rule)
 {
 	int ret = 0;
-	struct lttng_ust_event_notifier event_notifier;
+	enum lttng_condition_status condition_status;
+	const struct lttng_condition *condition = NULL;
+	struct lttng_ust_abi_event_notifier event_notifier;
+	const struct lttng_event_rule *event_rule = NULL;
+	unsigned int capture_bytecode_count = 0, i;
+	enum lttng_condition_status cond_status;
 
 	health_code_update();
 	assert(app->event_notifier_group.object);
 
-	ret = init_ust_event_notifier_from_event_rule(
-			ua_event_notifier_rule->event_rule, &event_notifier);
-	if (ret) {
-		ERR("Failed to initialize UST event notifier from event rule: app = '%s' (ppid: %d)",
-				app->name, app->ppid);
-		goto error;
-	}
+	condition = lttng_trigger_get_const_condition(
+			ua_event_notifier_rule->trigger);
+	assert(condition);
+	assert(lttng_condition_get_type(condition) == LTTNG_CONDITION_TYPE_EVENT_RULE_HIT);
+
+	condition_status = lttng_condition_event_rule_get_rule(condition, &event_rule);
+	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
+	assert(event_rule);
+	assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_TRACEPOINT);
 
+	init_ust_event_notifier_from_event_rule(event_rule, &event_notifier);
 	event_notifier.event.token = ua_event_notifier_rule->token;
 
 	/* Create UST event notifier against the tracer. */
@@ -2061,6 +2157,23 @@ static int create_ust_event_notifier(struct ust_app *app,
 		}
 	}
 
+	/* Set the capture bytecodes. */
+	cond_status = lttng_condition_event_rule_get_capture_descriptor_count(
+			condition, &capture_bytecode_count);
+	assert(cond_status == LTTNG_CONDITION_STATUS_OK);
+
+	for (i = 0; i < capture_bytecode_count; i++) {
+		const struct lttng_bytecode *capture_bytecode =
+				lttng_condition_event_rule_get_capture_bytecode_at_index(
+						condition, i);
+
+		ret = set_ust_capture(app, capture_bytecode, i,
+				ua_event_notifier_rule->obj);
+		if (ret < 0) {
+			goto error;
+		}
+	}
+
 	/*
 	 * We now need to explicitly enable the event, since it
 	 * is disabled at creation.
@@ -2112,14 +2225,14 @@ static void shadow_copy_event(struct ust_app_event *ua_event,
 
 	/* Copy filter bytecode */
 	if (uevent->filter) {
-		ua_event->filter = lttng_filter_bytecode_copy(uevent->filter);
+		ua_event->filter = lttng_bytecode_copy(uevent->filter);
 		/* Filter might be NULL here in case of ENONEM. */
 	}
 
 	/* Copy exclusion data */
 	if (uevent->exclusion) {
 		exclusion_alloc_size = sizeof(struct lttng_event_exclusion) +
-				LTTNG_UST_SYM_NAME_LEN * uevent->exclusion->count;
+				LTTNG_UST_ABI_SYM_NAME_LEN * uevent->exclusion->count;
 		ua_event->exclusion = zmalloc(exclusion_alloc_size);
 		if (ua_event->exclusion == NULL) {
 			PERROR("malloc");
@@ -2569,14 +2682,14 @@ static int ht_match_ust_app_ctx(struct cds_lfht_node *node, const void *_key)
 	}
 
 	switch(key->ctx) {
-	case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+	case LTTNG_UST_ABI_CONTEXT_PERF_THREAD_COUNTER:
 		if (strncmp(key->u.perf_counter.name,
 				ctx->ctx.u.perf_counter.name,
 				sizeof(key->u.perf_counter.name))) {
 			goto no_match;
 		}
 		break;
-	case LTTNG_UST_CONTEXT_APP_CONTEXT:
+	case LTTNG_UST_ABI_CONTEXT_APP_CONTEXT:
 		if (strcmp(key->u.app_ctx.provider_name,
 				ctx->ctx.u.app_ctx.provider_name) ||
 				strcmp(key->u.app_ctx.ctx_name,
@@ -3419,7 +3532,7 @@ error:
  */
 static int ust_app_channel_allocate(struct ust_app_session *ua_sess,
 		struct ltt_ust_channel *uchan,
-		enum lttng_ust_chan_type type, struct ltt_ust_session *usess,
+		enum lttng_ust_abi_chan_type type, struct ltt_ust_session *usess,
 		struct ust_app_channel **ua_chanp)
 {
 	int ret = 0;
@@ -3522,13 +3635,13 @@ error:
  * Called with ust app session mutex held.
  */
 static
-int create_ust_app_event_notifier_rule(struct lttng_event_rule *rule,
-		struct ust_app *app, uint64_t token)
+int create_ust_app_event_notifier_rule(struct lttng_trigger *trigger,
+		struct ust_app *app)
 {
 	int ret = 0;
 	struct ust_app_event_notifier_rule *ua_event_notifier_rule;
 
-	ua_event_notifier_rule = alloc_ust_app_event_notifier_rule(rule, token);
+	ua_event_notifier_rule = alloc_ust_app_event_notifier_rule(trigger);
 	if (ua_event_notifier_rule == NULL) {
 		ret = -ENOMEM;
 		goto end;
@@ -3546,7 +3659,7 @@ int create_ust_app_event_notifier_rule(struct lttng_event_rule *rule,
 		if (ret == -LTTNG_UST_ERR_EXIST) {
 			ERR("Tracer for application reported that an event notifier being created already exists: "
 					"token = \"%" PRIu64 "\", pid = %d, ppid = %d, uid = %d, gid = %d",
-					token,
+					lttng_trigger_get_tracer_token(trigger),
 					app->pid, app->ppid, app->uid,
 					app->gid);
 		}
@@ -3557,7 +3670,7 @@ int create_ust_app_event_notifier_rule(struct lttng_event_rule *rule,
 			&ua_event_notifier_rule->node);
 
 	DBG2("UST app create token event rule completed: app = '%s' (ppid: %d), token = %" PRIu64,
-			app->name, app->ppid, token);
+			app->name, app->ppid, lttng_trigger_get_tracer_token(trigger));
 
 end:
 	return ret;
@@ -3877,7 +3990,7 @@ int ust_app_setup_event_notifier_group(struct ust_app *app)
 {
 	int ret;
 	int event_pipe_write_fd;
-	struct lttng_ust_object_data *event_notifier_group = NULL;
+	struct lttng_ust_abi_object_data *event_notifier_group = NULL;
 	enum lttng_error_code lttng_ret;
 
 	assert(app);
@@ -4077,7 +4190,7 @@ int ust_app_list_events(struct lttng_event **events)
 	rcu_read_lock();
 
 	cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
-		struct lttng_ust_tracepoint_iter uiter;
+		struct lttng_ust_abi_tracepoint_iter uiter;
 
 		health_code_update();
 
@@ -4160,9 +4273,9 @@ int ust_app_list_events(struct lttng_event **events)
 				nbmem = new_nbmem;
 				tmp_event = new_tmp_event;
 			}
-			memcpy(tmp_event[count].name, uiter.name, LTTNG_UST_SYM_NAME_LEN);
+			memcpy(tmp_event[count].name, uiter.name, LTTNG_UST_ABI_SYM_NAME_LEN);
 			tmp_event[count].loglevel = uiter.loglevel;
-			tmp_event[count].type = (enum lttng_event_type) LTTNG_UST_TRACEPOINT;
+			tmp_event[count].type = (enum lttng_event_type) LTTNG_UST_ABI_TRACEPOINT;
 			tmp_event[count].pid = app->pid;
 			tmp_event[count].enabled = -1;
 			count++;
@@ -4208,7 +4321,7 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 	rcu_read_lock();
 
 	cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
-		struct lttng_ust_field_iter uiter;
+		struct lttng_ust_abi_field_iter uiter;
 
 		health_code_update();
 
@@ -4292,12 +4405,12 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 				tmp_event = new_tmp_event;
 			}
 
-			memcpy(tmp_event[count].field_name, uiter.field_name, LTTNG_UST_SYM_NAME_LEN);
+			memcpy(tmp_event[count].field_name, uiter.field_name, LTTNG_UST_ABI_SYM_NAME_LEN);
 			/* Mapping between these enums matches 1 to 1. */
 			tmp_event[count].type = (enum lttng_event_field_type) uiter.type;
 			tmp_event[count].nowrite = uiter.nowrite;
 
-			memcpy(tmp_event[count].event.name, uiter.event_name, LTTNG_UST_SYM_NAME_LEN);
+			memcpy(tmp_event[count].event.name, uiter.event_name, LTTNG_UST_ABI_SYM_NAME_LEN);
 			tmp_event[count].event.loglevel = uiter.loglevel;
 			tmp_event[count].event.type = LTTNG_EVENT_TRACEPOINT;
 			tmp_event[count].event.pid = app->pid;
@@ -4596,7 +4709,7 @@ int ust_app_channel_create(struct ltt_ust_session *usess,
 		 * configuration.
 		 */
 		ret = ust_app_channel_allocate(ua_sess, uchan,
-			LTTNG_UST_CHAN_PER_CPU, usess,
+			LTTNG_UST_ABI_CHAN_PER_CPU, usess,
 			&ua_chan);
 		if (ret < 0) {
 			goto error;
@@ -5556,7 +5669,7 @@ void ust_app_synchronize_event_notifier_rules(struct ust_app *app)
 		looked_up_event_notifier_rule = find_ust_app_event_notifier_rule(
 				app->token_to_event_notifier_rule_ht, token);
 		if (!looked_up_event_notifier_rule) {
-			ret = create_ust_app_event_notifier_rule(event_rule, app, token);
+			ret = create_ust_app_event_notifier_rule(trigger, app);
 			if (ret < 0) {
 				goto end;
 			}
@@ -6316,7 +6429,7 @@ int ust_app_recv_notify(int sock)
 	case USTCTL_NOTIFY_CMD_EVENT:
 	{
 		int sobjd, cobjd, loglevel_value;
-		char name[LTTNG_UST_SYM_NAME_LEN], *sig, *model_emf_uri;
+		char name[LTTNG_UST_ABI_SYM_NAME_LEN], *sig, *model_emf_uri;
 		size_t nr_fields;
 		struct ustctl_field *fields;
 
@@ -6383,7 +6496,7 @@ int ust_app_recv_notify(int sock)
 	case USTCTL_NOTIFY_CMD_ENUM:
 	{
 		int sobjd;
-		char name[LTTNG_UST_SYM_NAME_LEN];
+		char name[LTTNG_UST_ABI_SYM_NAME_LEN];
 		size_t nr_entries;
 		struct ustctl_enum_entry *entries;