X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;h=0272d9b9331c6750c276993b14552bbeb6e565f2;hb=a834901f2890deadb815d7f9e3ab79c3ba673994;hp=aed40f26382ac94f4ad38ec26cea3a350774e9be;hpb=74d81a6cca2cd4a7718bba9368f382f9f2fbba84;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index aed40f26..0272d9b9 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -16,19 +16,39 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#include <stdint.h>
 #include <string.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <lttng/ust-config.h>
 #include <lttng/ust-ctl.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-events.h>
-#include <sys/mman.h>
-
+#include <lttng/ust-endian.h>
 #include <usterr-signal-safe.h>
 #include <ust-comm.h>
 #include <helper.h>
 
 #include "../libringbuffer/backend.h"
 #include "../libringbuffer/frontend.h"
+#include "../liblttng-ust/wait.h"
+#include "../liblttng-ust/lttng-rb-clients.h"
+#include "../liblttng-ust/clock.h"
+#include "../liblttng-ust/getenv.h"
+#include "../liblttng-ust/lttng-tracer-core.h"
+
+#include "../libcounter/shm.h"
+#include "../libcounter/smp.h"
+#include "../libcounter/counter.h"
+
+/*
+ * Number of milliseconds to retry before failing metadata writes on
+ * buffer full condition. (10 seconds)
+ */
+#define LTTNG_METADATA_TIMEOUT_MSEC	10000
 
 /*
  * Channel representation within consumer.
@@ -38,6 +58,8 @@ struct ustctl_consumer_channel {
 
 	/* initial attributes */
 	struct ustctl_consumer_channel_attr attr;
+	int wait_fd;				/* monitor close() */
+	int wakeup_fd;				/* monitor close() */
 };
 
 /*
@@ -52,14 +74,42 @@ struct ustctl_consumer_stream {
 	uint64_t memory_map_size;
 };
 
+#define USTCTL_COUNTER_ATTR_DIMENSION_MAX 8
+struct ustctl_counter_attr {
+	enum ustctl_counter_arithmetic arithmetic;
+	enum ustctl_counter_bitness bitness;
+	uint32_t nr_dimensions;
+	int64_t global_sum_step;
+	struct ustctl_counter_dimension dimensions[USTCTL_COUNTER_ATTR_DIMENSION_MAX];
+};
+
+/*
+ * Counter representation within daemon.
+ */
+struct ustctl_daemon_counter {
+	struct lib_counter *counter;
+	const struct lttng_counter_ops *ops;
+	struct ustctl_counter_attr *attr;	/* initial attributes */
+};
+
 extern void lttng_ring_buffer_client_overwrite_init(void);
+extern void lttng_ring_buffer_client_overwrite_rt_init(void);
 extern void lttng_ring_buffer_client_discard_init(void);
+extern void lttng_ring_buffer_client_discard_rt_init(void);
 extern void lttng_ring_buffer_metadata_client_init(void);
 extern void lttng_ring_buffer_client_overwrite_exit(void);
+extern void lttng_ring_buffer_client_overwrite_rt_exit(void);
 extern void lttng_ring_buffer_client_discard_exit(void);
+extern void lttng_ring_buffer_client_discard_rt_exit(void);
 extern void lttng_ring_buffer_metadata_client_exit(void);
-
-volatile enum ust_loglevel ust_loglevel;
+LTTNG_HIDDEN
+extern void lttng_counter_client_percpu_32_modular_init(void);
+LTTNG_HIDDEN
+extern void lttng_counter_client_percpu_32_modular_exit(void);
+LTTNG_HIDDEN
+extern void lttng_counter_client_percpu_64_modular_init(void);
+LTTNG_HIDDEN
+extern void lttng_counter_client_percpu_64_modular_exit(void);
 
 int ustctl_release_handle(int sock, int handle)
 {
@@ -87,7 +137,16 @@ int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
 
 	switch (data->type) {
 	case LTTNG_UST_OBJECT_TYPE_CHANNEL:
+		if (data->u.channel.wakeup_fd >= 0) {
+			ret = close(data->u.channel.wakeup_fd);
+			if (ret < 0) {
+				ret = -errno;
+				return ret;
+			}
+			data->u.channel.wakeup_fd = -1;
+		}
 		free(data->u.channel.data);
+		data->u.channel.data = NULL;
 		break;
 	case LTTNG_UST_OBJECT_TYPE_STREAM:
 		if (data->u.stream.shm_fd >= 0) {
@@ -96,6 +155,7 @@ int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
 				ret = -errno;
 				return ret;
 			}
+			data->u.stream.shm_fd = -1;
 		}
 		if (data->u.stream.wakeup_fd >= 0) {
 			ret = close(data->u.stream.wakeup_fd);
@@ -103,6 +163,36 @@ int ustctl_release_object(int sock, struct lttng_ust_object_data *data)
 				ret = -errno;
 				return ret;
 			}
+			data->u.stream.wakeup_fd = -1;
+		}
+		break;
+	case LTTNG_UST_OBJECT_TYPE_EVENT:
+	case LTTNG_UST_OBJECT_TYPE_CONTEXT:
+	case LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER_GROUP:
+	case LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER:
+		break;
+	case LTTNG_UST_OBJECT_TYPE_COUNTER:
+		free(data->u.counter.data);
+		data->u.counter.data = NULL;
+		break;
+	case LTTNG_UST_OBJECT_TYPE_COUNTER_GLOBAL:
+		if (data->u.counter_global.shm_fd >= 0) {
+			ret = close(data->u.counter_global.shm_fd);
+			if (ret < 0) {
+				ret = -errno;
+				return ret;
+			}
+			data->u.counter_global.shm_fd = -1;
+		}
+		break;
+	case LTTNG_UST_OBJECT_TYPE_COUNTER_CPU:
+		if (data->u.counter_cpu.shm_fd >= 0) {
+			ret = close(data->u.counter_cpu.shm_fd);
+			if (ret < 0) {
+				ret = -errno;
+				return ret;
+			}
+			data->u.counter_cpu.shm_fd = -1;
 		}
 		break;
 	default:
@@ -166,6 +256,7 @@ int ustctl_create_event(int sock, struct lttng_ust_event *ev,
 	event_data = zmalloc(sizeof(*event_data));
 	if (!event_data)
 		return -ENOMEM;
+	event_data->type = LTTNG_UST_OBJECT_TYPE_EVENT;
 	memset(&lum, 0, sizeof(lum));
 	lum.handle = channel_data->handle;
 	lum.cmd = LTTNG_UST_EVENT;
@@ -185,33 +276,86 @@ int ustctl_create_event(int sock, struct lttng_ust_event *ev,
 	return 0;
 }
 
-int ustctl_add_context(int sock, struct lttng_ust_context *ctx,
+int ustctl_add_context(int sock, struct lttng_ust_context_attr *ctx,
 		struct lttng_ust_object_data *obj_data,
 		struct lttng_ust_object_data **_context_data)
 {
 	struct ustcomm_ust_msg lum;
 	struct ustcomm_ust_reply lur;
-	struct lttng_ust_object_data *context_data;
+	struct lttng_ust_object_data *context_data = NULL;
+	char *buf = NULL;
+	size_t len;
 	int ret;
 
-	if (!obj_data || !_context_data)
-		return -EINVAL;
+	if (!obj_data || !_context_data) {
+		ret = -EINVAL;
+		goto end;
+	}
 
 	context_data = zmalloc(sizeof(*context_data));
-	if (!context_data)
-		return -ENOMEM;
+	if (!context_data) {
+		ret = -ENOMEM;
+		goto end;
+	}
+	context_data->type = LTTNG_UST_OBJECT_TYPE_CONTEXT;
 	memset(&lum, 0, sizeof(lum));
 	lum.handle = obj_data->handle;
 	lum.cmd = LTTNG_UST_CONTEXT;
+
 	lum.u.context.ctx = ctx->ctx;
-	ret = ustcomm_send_app_cmd(sock, &lum, &lur);
-	if (ret) {
-		free(context_data);
-		return ret;
+	switch (ctx->ctx) {
+	case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+		lum.u.context.u.perf_counter = ctx->u.perf_counter;
+		break;
+	case LTTNG_UST_CONTEXT_APP_CONTEXT:
+	{
+		size_t provider_name_len = strlen(
+				ctx->u.app_ctx.provider_name) + 1;
+		size_t ctx_name_len = strlen(ctx->u.app_ctx.ctx_name) + 1;
+
+		lum.u.context.u.app_ctx.provider_name_len = provider_name_len;
+		lum.u.context.u.app_ctx.ctx_name_len = ctx_name_len;
+
+		len = provider_name_len + ctx_name_len;
+		buf = zmalloc(len);
+		if (!buf) {
+			ret = -ENOMEM;
+			goto end;
+		}
+		memcpy(buf, ctx->u.app_ctx.provider_name,
+				provider_name_len);
+		memcpy(buf + provider_name_len, ctx->u.app_ctx.ctx_name,
+				ctx_name_len);
+		break;
+	}
+	default:
+		break;
+	}
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret)
+		goto end;
+	if (buf) {
+		/* send var len ctx_name */
+		ret = ustcomm_send_unix_sock(sock, buf, len);
+		if (ret < 0) {
+			goto end;
+		}
+		if (ret != len) {
+			ret = -EINVAL;
+			goto end;
+		}
+	}
+	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+	if (ret < 0) {
+		goto end;
 	}
-	context_data->handle = lur.ret_val;
-	DBG("received context handle %u", context_data->handle);
+	context_data->handle = -1;
+	DBG("Context created successfully");
 	*_context_data = context_data;
+	context_data = NULL;
+end:
+	free(context_data);
+	free(buf);
 	return ret;
 }
 
@@ -239,8 +383,6 @@ int ustctl_set_filter(int sock, struct lttng_ust_filter_bytecode *bytecode,
 	ret = ustcomm_send_unix_sock(sock, bytecode->data,
 				bytecode->len);
 	if (ret < 0) {
-		if (ret == -ECONNRESET)
-			fprintf(stderr, "remote end closed connection\n");
 		return ret;
 	}
 	if (ret != bytecode->len)
@@ -248,6 +390,71 @@ int ustctl_set_filter(int sock, struct lttng_ust_filter_bytecode *bytecode,
 	return ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
 }
 
+int ustctl_set_capture(int sock, struct lttng_ust_capture_bytecode *bytecode,
+		struct lttng_ust_object_data *obj_data)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret;
+
+	if (!obj_data)
+		return -EINVAL;
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = obj_data->handle;
+	lum.cmd = LTTNG_UST_CAPTURE;
+	lum.u.capture.data_size = bytecode->len;
+	lum.u.capture.reloc_offset = bytecode->reloc_offset;
+	lum.u.capture.seqnum = bytecode->seqnum;
+
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret)
+		return ret;
+	/* send var len bytecode */
+	ret = ustcomm_send_unix_sock(sock, bytecode->data,
+				bytecode->len);
+	if (ret < 0) {
+		return ret;
+	}
+	if (ret != bytecode->len)
+		return -EINVAL;
+	return ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+}
+
+int ustctl_set_exclusion(int sock, struct lttng_ust_event_exclusion *exclusion,
+		struct lttng_ust_object_data *obj_data)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret;
+
+	if (!obj_data) {
+		return -EINVAL;
+	}
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = obj_data->handle;
+	lum.cmd = LTTNG_UST_EXCLUSION;
+	lum.u.exclusion.count = exclusion->count;
+
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret) {
+		return ret;
+	}
+
+	/* send var len exclusion names */
+	ret = ustcomm_send_unix_sock(sock,
+			exclusion->names,
+			exclusion->count * LTTNG_UST_SYM_NAME_LEN);
+	if (ret < 0) {
+		return ret;
+	}
+	if (ret != exclusion->count * LTTNG_UST_SYM_NAME_LEN) {
+		return -EINVAL;
+	}
+	return ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+}
+
 /* Enable event, channel and session ioctl */
 int ustctl_enable(int sock, struct lttng_ust_object_data *object)
 {
@@ -304,6 +511,106 @@ int ustctl_stop_session(int sock, int handle)
 	return ustctl_disable(sock, &obj);
 }
 
+int ustctl_create_event_notifier_group(int sock, int pipe_fd,
+		struct lttng_ust_object_data **_event_notifier_group_data)
+{
+	struct lttng_ust_object_data *event_notifier_group_data;
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	ssize_t len;
+	int ret;
+
+	if (!_event_notifier_group_data)
+		return -EINVAL;
+
+	event_notifier_group_data = zmalloc(sizeof(*event_notifier_group_data));
+	if (!event_notifier_group_data)
+		return -ENOMEM;
+
+	event_notifier_group_data->type = LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER_GROUP;
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = LTTNG_UST_ROOT_HANDLE;
+	lum.cmd = LTTNG_UST_EVENT_NOTIFIER_GROUP_CREATE;
+
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret)
+		goto error;
+
+	/* Send event_notifier notification pipe. */
+	len = ustcomm_send_fds_unix_sock(sock, &pipe_fd, 1);
+	if (len <= 0) {
+		ret = len;
+		goto error;
+	}
+
+	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+	if (ret)
+		goto error;
+
+	event_notifier_group_data->handle = lur.ret_val;
+	DBG("received event_notifier group handle %d", event_notifier_group_data->handle);
+
+	*_event_notifier_group_data = event_notifier_group_data;
+
+	ret = 0;
+	goto end;
+error:
+	free(event_notifier_group_data);
+
+end:
+	return ret;
+}
+
+int ustctl_create_event_notifier(int sock, struct lttng_ust_event_notifier *event_notifier,
+		struct lttng_ust_object_data *event_notifier_group,
+		struct lttng_ust_object_data **_event_notifier_data)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	struct lttng_ust_object_data *event_notifier_data;
+	ssize_t len;
+	int ret;
+
+	if (!event_notifier_group || !_event_notifier_data)
+		return -EINVAL;
+
+	event_notifier_data = zmalloc(sizeof(*event_notifier_data));
+	if (!event_notifier_data)
+		return -ENOMEM;
+
+	event_notifier_data->type = LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER;
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = event_notifier_group->handle;
+	lum.cmd = LTTNG_UST_EVENT_NOTIFIER_CREATE;
+	lum.u.event_notifier.len = sizeof(*event_notifier);
+
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret) {
+		free(event_notifier_data);
+		return ret;
+	}
+	/* Send struct lttng_ust_event_notifier */
+	len = ustcomm_send_unix_sock(sock, event_notifier, sizeof(*event_notifier));
+	if (len != sizeof(*event_notifier)) {
+		if (len < 0)
+			return len;
+		else
+			return -EIO;
+	}
+	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+	if (ret) {
+		free(event_notifier_data);
+		return ret;
+	}
+	event_notifier_data->handle = lur.ret_val;
+	DBG("received event_notifier handle %u", event_notifier_data->handle);
+	*_event_notifier_data = event_notifier_data;
+
+	return ret;
+}
+
 int ustctl_tracepoint_list(int sock)
 {
 	struct ustcomm_ust_msg lum;
@@ -458,6 +765,7 @@ int ustctl_send_channel(int sock,
 		enum lttng_ust_chan_type type,
 		void *data,
 		uint64_t size,
+		int wakeup_fd,
 		int send_fd_only)
 {
 	ssize_t len;
@@ -491,6 +799,14 @@ int ustctl_send_channel(int sock,
 			return -EIO;
 	}
 
+	/* Send wakeup fd */
+	len = ustcomm_send_fds_unix_sock(sock, &wakeup_fd, 1);
+	if (len <= 0) {
+		if (len < 0)
+			return len;
+		else
+			return -EIO;
+	}
 	return 0;
 }
 
@@ -558,6 +874,7 @@ int ustctl_recv_channel_from_consumer(int sock,
 {
 	struct lttng_ust_object_data *channel_data;
 	ssize_t len;
+	int wakeup_fd;
 	int ret;
 
 	channel_data = zmalloc(sizeof(*channel_data));
@@ -566,6 +883,7 @@ int ustctl_recv_channel_from_consumer(int sock,
 		goto error_alloc;
 	}
 	channel_data->type = LTTNG_UST_OBJECT_TYPE_CHANNEL;
+	channel_data->handle = -1;
 
 	/* recv mmap size */
 	len = ustcomm_recv_unix_sock(sock, &channel_data->size,
@@ -604,7 +922,18 @@ int ustctl_recv_channel_from_consumer(int sock,
 			ret = -EINVAL;
 		goto error_recv_data;
 	}
-
+	/* recv wakeup fd */
+	len = ustcomm_recv_fds_unix_sock(sock, &wakeup_fd, 1);
+	if (len <= 0) {
+		if (len < 0) {
+			ret = len;
+			goto error_recv_data;
+		} else {
+			ret = -EIO;
+			goto error_recv_data;
+		}
+	}
+	channel_data->u.channel.wakeup_fd = wakeup_fd;
 	*_channel_data = channel_data;
 	return 0;
 
@@ -704,14 +1033,13 @@ int ustctl_send_channel_to_ust(int sock, int session_handle,
 			channel_data->u.channel.type,
 			channel_data->u.channel.data,
 			channel_data->size,
+			channel_data->u.channel.wakeup_fd,
 			1);
 	if (ret)
 		return ret;
 	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
 	if (!ret) {
-		if (lur.ret_val >= 0) {
-			channel_data->handle = lur.ret_val;
-		}
+		channel_data->handle = lur.ret_val;
 	}
 	return ret;
 }
@@ -746,11 +1074,168 @@ int ustctl_send_stream_to_ust(int sock,
 	return ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
 }
 
+int ustctl_duplicate_ust_object_data(struct lttng_ust_object_data **dest,
+                struct lttng_ust_object_data *src)
+{
+	struct lttng_ust_object_data *obj;
+	int ret;
+
+	if (src->handle != -1) {
+		ret = -EINVAL;
+		goto error;
+	}
+
+	obj = zmalloc(sizeof(*obj));
+	if (!obj) {
+		ret = -ENOMEM;
+		goto error;
+	}
+
+	obj->type = src->type;
+	obj->handle = src->handle;
+	obj->size = src->size;
+
+	switch (obj->type) {
+	case LTTNG_UST_OBJECT_TYPE_CHANNEL:
+	{
+		obj->u.channel.type = src->u.channel.type;
+		if (src->u.channel.wakeup_fd >= 0) {
+			obj->u.channel.wakeup_fd =
+				dup(src->u.channel.wakeup_fd);
+			if (obj->u.channel.wakeup_fd < 0) {
+				ret = errno;
+				goto chan_error_wakeup_fd;
+			}
+		} else {
+			obj->u.channel.wakeup_fd =
+				src->u.channel.wakeup_fd;
+		}
+		obj->u.channel.data = zmalloc(obj->size);
+		if (!obj->u.channel.data) {
+			ret = -ENOMEM;
+			goto chan_error_alloc;
+		}
+		memcpy(obj->u.channel.data, src->u.channel.data, obj->size);
+		break;
+
+	chan_error_alloc:
+		if (src->u.channel.wakeup_fd >= 0) {
+			int closeret;
+
+			closeret = close(obj->u.channel.wakeup_fd);
+			if (closeret) {
+				PERROR("close");
+			}
+		}
+	chan_error_wakeup_fd:
+		goto error_type;
+
+	}
+
+	case LTTNG_UST_OBJECT_TYPE_STREAM:
+	{
+		obj->u.stream.stream_nr = src->u.stream.stream_nr;
+		if (src->u.stream.wakeup_fd >= 0) {
+			obj->u.stream.wakeup_fd =
+				dup(src->u.stream.wakeup_fd);
+			if (obj->u.stream.wakeup_fd < 0) {
+				ret = errno;
+				goto stream_error_wakeup_fd;
+			}
+		} else {
+			obj->u.stream.wakeup_fd =
+				src->u.stream.wakeup_fd;
+		}
+
+		if (src->u.stream.shm_fd >= 0) {
+			obj->u.stream.shm_fd =
+				dup(src->u.stream.shm_fd);
+			if (obj->u.stream.shm_fd < 0) {
+				ret = errno;
+				goto stream_error_shm_fd;
+			}
+		} else {
+			obj->u.stream.shm_fd =
+				src->u.stream.shm_fd;
+		}
+		break;
+
+	stream_error_shm_fd:
+		if (src->u.stream.wakeup_fd >= 0) {
+			int closeret;
+
+			closeret = close(obj->u.stream.wakeup_fd);
+			if (closeret) {
+				PERROR("close");
+			}
+		}
+	stream_error_wakeup_fd:
+		goto error_type;
+	}
+
+	case LTTNG_UST_OBJECT_TYPE_COUNTER:
+	{
+		obj->u.counter.data = zmalloc(obj->size);
+		if (!obj->u.counter.data) {
+			ret = -ENOMEM;
+			goto error_type;
+		}
+		memcpy(obj->u.counter.data, src->u.counter.data, obj->size);
+		break;
+	}
+
+	case LTTNG_UST_OBJECT_TYPE_COUNTER_GLOBAL:
+	{
+		if (src->u.counter_global.shm_fd >= 0) {
+			obj->u.counter_global.shm_fd =
+				dup(src->u.counter_global.shm_fd);
+			if (obj->u.counter_global.shm_fd < 0) {
+				ret = errno;
+				goto error_type;
+			}
+		}
+		break;
+	}
+
+	case LTTNG_UST_OBJECT_TYPE_COUNTER_CPU:
+	{
+		obj->u.counter_cpu.cpu_nr = src->u.counter_cpu.cpu_nr;
+		if (src->u.counter_cpu.shm_fd >= 0) {
+			obj->u.counter_cpu.shm_fd =
+				dup(src->u.counter_cpu.shm_fd);
+			if (obj->u.counter_cpu.shm_fd < 0) {
+				ret = errno;
+				goto error_type;
+			}
+		}
+		break;
+	}
+
+	default:
+		ret = -EINVAL;
+		goto error_type;
+	}
+
+	*dest = obj;
+	return 0;
+
+error_type:
+	free(obj);
+error:
+	return ret;
+}
+
 
 /* Buffer operations */
 
+int ustctl_get_nr_stream_per_channel(void)
+{
+	return num_possible_cpus();
+}
+
 struct ustctl_consumer_channel *
-	ustctl_create_channel(struct ustctl_consumer_channel_attr *attr)
+	ustctl_create_channel(struct ustctl_consumer_channel_attr *attr,
+		const int *stream_fds, int nr_stream_fds)
 {
 	struct ustctl_consumer_channel *chan;
 	const char *transport_name;
@@ -759,8 +1244,19 @@ struct ustctl_consumer_channel *
 	switch (attr->type) {
 	case LTTNG_UST_CHAN_PER_CPU:
 		if (attr->output == LTTNG_UST_MMAP) {
-			transport_name = attr->overwrite ?
-				"relay-overwrite-mmap" : "relay-discard-mmap";
+			if (attr->overwrite) {
+				if (attr->read_timer_interval == 0) {
+					transport_name = "relay-overwrite-mmap";
+				} else {
+					transport_name = "relay-overwrite-rt-mmap";
+				}
+			} else {
+				if (attr->read_timer_interval == 0) {
+					transport_name = "relay-discard-mmap";
+				} else {
+					transport_name = "relay-discard-rt-mmap";
+				}
+			}
 		} else {
 			return NULL;
 		}
@@ -779,7 +1275,7 @@ struct ustctl_consumer_channel *
 	transport = lttng_transport_find(transport_name);
 	if (!transport) {
 		DBG("LTTng transport %s not found\n",
-		       transport_name);
+			transport_name);
 		return NULL;
 	}
 
@@ -788,15 +1284,19 @@ struct ustctl_consumer_channel *
 		return NULL;
 
 	chan->chan = transport->ops.channel_create(transport_name, NULL,
-                        attr->subbuf_size, attr->num_subbuf,
+			attr->subbuf_size, attr->num_subbuf,
 			attr->switch_timer_interval,
-                        attr->read_timer_interval,
-			attr->uuid);
+			attr->read_timer_interval,
+			attr->uuid, attr->chan_id,
+			stream_fds, nr_stream_fds,
+			attr->blocking_timeout);
 	if (!chan->chan) {
 		goto chan_error;
 	}
 	chan->chan->ops = &transport->ops;
 	memcpy(&chan->attr, attr, sizeof(chan->attr));
+	chan->wait_fd = ustctl_channel_get_wait_fd(chan);
+	chan->wakeup_fd = ustctl_channel_get_wakeup_fd(chan);
 	return chan;
 
 chan_error:
@@ -806,6 +1306,8 @@ chan_error:
 
 void ustctl_destroy_channel(struct ustctl_consumer_channel *chan)
 {
+	(void) ustctl_channel_close_wait_fd(chan);
+	(void) ustctl_channel_close_wakeup_fd(chan);
 	chan->chan->ops->channel_destroy(chan->chan);
 	free(chan);
 }
@@ -822,6 +1324,7 @@ int ustctl_send_channel_to_sessiond(int sock,
 			channel->attr.type,
 			table->objects[0].memory_map,
 			table->objects[0].memory_map_size,
+			channel->wakeup_fd,
 			0);
 }
 
@@ -838,12 +1341,116 @@ int ustctl_send_stream_to_sessiond(int sock,
 			0);
 }
 
-int ustctl_stream_close_wait_fd(struct ustctl_consumer_stream *stream)
+int ustctl_write_metadata_to_channel(
+		struct ustctl_consumer_channel *channel,
+		const char *metadata_str,	/* NOT null-terminated */
+		size_t len)			/* metadata length */
 {
-	struct channel *chan;
-
+	struct lttng_ust_lib_ring_buffer_ctx ctx;
+	struct lttng_channel *chan = channel->chan;
+	const char *str = metadata_str;
+	int ret = 0, waitret;
+	size_t reserve_len, pos;
+
+	for (pos = 0; pos < len; pos += reserve_len) {
+		reserve_len = min_t(size_t,
+				chan->ops->packet_avail_size(chan->chan, chan->handle),
+				len - pos);
+		lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, reserve_len,
+					 sizeof(char), -1, chan->handle, NULL);
+		/*
+		 * We don't care about metadata buffer's records lost
+		 * count, because we always retry here. Report error if
+		 * we need to bail out after timeout or being
+		 * interrupted.
+		 */
+		waitret = wait_cond_interruptible_timeout(
+			({
+				ret = chan->ops->event_reserve(&ctx, 0);
+				ret != -ENOBUFS || !ret;
+			}),
+			LTTNG_METADATA_TIMEOUT_MSEC);
+		if (waitret == -ETIMEDOUT || waitret == -EINTR || ret) {
+			DBG("LTTng: Failure to write metadata to buffers (%s)\n",
+				waitret == -EINTR ? "interrupted" :
+					(ret == -ENOBUFS ? "timeout" : "I/O error"));
+			if (waitret == -EINTR)
+				ret = waitret;
+			goto end;
+		}
+		chan->ops->event_write(&ctx, &str[pos], reserve_len);
+		chan->ops->event_commit(&ctx);
+	}
+end:
+	return ret;
+}
+
+/*
+ * Write at most one packet in the channel.
+ * Returns the number of bytes written on success, < 0 on error.
+ */
+ssize_t ustctl_write_one_packet_to_channel(
+		struct ustctl_consumer_channel *channel,
+		const char *metadata_str,	/* NOT null-terminated */
+		size_t len)			/* metadata length */
+{
+	struct lttng_ust_lib_ring_buffer_ctx ctx;
+	struct lttng_channel *chan = channel->chan;
+	const char *str = metadata_str;
+	ssize_t reserve_len;
+	int ret;
+
+	reserve_len = min_t(ssize_t,
+			chan->ops->packet_avail_size(chan->chan, chan->handle),
+			len);
+	lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, reserve_len,
+			sizeof(char), -1, chan->handle, NULL);
+	ret = chan->ops->event_reserve(&ctx, 0);
+	if (ret != 0) {
+		DBG("LTTng: event reservation failed");
+		assert(ret < 0);
+		reserve_len = ret;
+		goto end;
+	}
+	chan->ops->event_write(&ctx, str, reserve_len);
+	chan->ops->event_commit(&ctx);
+
+end:
+	return reserve_len;
+}
+
+int ustctl_channel_close_wait_fd(struct ustctl_consumer_channel *consumer_chan)
+{
+	struct channel *chan;
+	int ret;
+
+	chan = consumer_chan->chan->chan;
+	ret = ring_buffer_channel_close_wait_fd(&chan->backend.config,
+			chan, chan->handle);
+	if (!ret)
+		consumer_chan->wait_fd = -1;
+	return ret;
+}
+
+int ustctl_channel_close_wakeup_fd(struct ustctl_consumer_channel *consumer_chan)
+{
+	struct channel *chan;
+	int ret;
+
+	chan = consumer_chan->chan->chan;
+	ret = ring_buffer_channel_close_wakeup_fd(&chan->backend.config,
+			chan, chan->handle);
+	if (!ret)
+		consumer_chan->wakeup_fd = -1;
+	return ret;
+}
+
+int ustctl_stream_close_wait_fd(struct ustctl_consumer_stream *stream)
+{
+	struct channel *chan;
+
 	chan = stream->chan->chan->chan;
-	return ring_buffer_close_wait_fd(&chan->backend.config,
+	return ring_buffer_stream_close_wait_fd(&chan->backend.config,
 			chan, stream->handle, stream->cpu);
 }
 
@@ -852,7 +1459,7 @@ int ustctl_stream_close_wakeup_fd(struct ustctl_consumer_stream *stream)
 	struct channel *chan;
 
 	chan = stream->chan->chan->chan;
-	return ring_buffer_close_wakeup_fd(&chan->backend.config,
+	return ring_buffer_stream_close_wakeup_fd(&chan->backend.config,
 			chan, stream->handle, stream->cpu);
 }
 
@@ -909,11 +1516,29 @@ void ustctl_destroy_stream(struct ustctl_consumer_stream *stream)
 	assert(stream);
 	buf = stream->buf;
 	consumer_chan = stream->chan;
+	(void) ustctl_stream_close_wait_fd(stream);
+	(void) ustctl_stream_close_wakeup_fd(stream);
 	lib_ring_buffer_release_read(buf, consumer_chan->chan->handle);
 	free(stream);
 }
 
-int ustctl_get_wait_fd(struct ustctl_consumer_stream *stream)
+int ustctl_channel_get_wait_fd(struct ustctl_consumer_channel *chan)
+{
+	if (!chan)
+		return -EINVAL;
+	return shm_get_wait_fd(chan->chan->handle,
+		&chan->chan->handle->chan._ref);
+}
+
+int ustctl_channel_get_wakeup_fd(struct ustctl_consumer_channel *chan)
+{
+	if (!chan)
+		return -EINVAL;
+	return shm_get_wakeup_fd(chan->chan->handle,
+		&chan->chan->handle->chan._ref);
+}
+
+int ustctl_stream_get_wait_fd(struct ustctl_consumer_stream *stream)
 {
 	struct lttng_ust_lib_ring_buffer *buf;
 	struct ustctl_consumer_channel *consumer_chan;
@@ -925,7 +1550,7 @@ int ustctl_get_wait_fd(struct ustctl_consumer_stream *stream)
 	return shm_get_wait_fd(consumer_chan->chan->handle, &buf->self._ref);
 }
 
-int ustctl_get_wakeup_fd(struct ustctl_consumer_stream *stream)
+int ustctl_stream_get_wakeup_fd(struct ustctl_consumer_stream *stream)
 {
 	struct lttng_ust_lib_ring_buffer *buf;
 	struct ustctl_consumer_channel *consumer_chan;
@@ -1002,6 +1627,8 @@ int ustctl_get_mmap_read_offset(struct ustctl_consumer_stream *stream,
 	unsigned long sb_bindex;
 	struct lttng_ust_lib_ring_buffer *buf;
 	struct ustctl_consumer_channel *consumer_chan;
+	struct lttng_ust_lib_ring_buffer_backend_pages_shmp *barray_idx;
+	struct lttng_ust_lib_ring_buffer_backend_pages *pages;
 
 	if (!stream)
 		return -EINVAL;
@@ -1011,9 +1638,15 @@ int ustctl_get_mmap_read_offset(struct ustctl_consumer_stream *stream,
 	if (chan->backend.config.output != RING_BUFFER_MMAP)
 		return -EINVAL;
 	sb_bindex = subbuffer_id_get_index(&chan->backend.config,
-					   buf->backend.buf_rsb.id);
-	*off = shmp(consumer_chan->chan->handle,
-		shmp_index(consumer_chan->chan->handle, buf->backend.array, sb_bindex)->shmp)->mmap_offset;
+					buf->backend.buf_rsb.id);
+	barray_idx = shmp_index(consumer_chan->chan->handle, buf->backend.array,
+			sb_bindex);
+	if (!barray_idx)
+		return -EINVAL;
+	pages = shmp(consumer_chan->chan->handle, barray_idx->shmp);
+	if (!pages)
+		return -EINVAL;
+	*off = pages->mmap_offset;
 	return 0;
 }
 
@@ -1051,7 +1684,7 @@ int ustctl_get_padded_subbuf_size(struct ustctl_consumer_stream *stream,
 	chan = consumer_chan->chan->chan;
 	*len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
 		consumer_chan->chan->handle);
-	*len = PAGE_ALIGN(*len);
+	*len = LTTNG_UST_PAGE_ALIGN(*len);
 	return 0;
 }
 
@@ -1100,6 +1733,25 @@ int ustctl_snapshot(struct ustctl_consumer_stream *stream)
 			&buf->prod_snapshot, consumer_chan->chan->handle);
 }
 
+/*
+ * Get a snapshot of the current ring buffer producer and consumer positions
+ * even if the consumed and produced positions are contained within the same
+ * subbuffer.
+ */
+int ustctl_snapshot_sample_positions(struct ustctl_consumer_stream *stream)
+{
+	struct lttng_ust_lib_ring_buffer *buf;
+	struct ustctl_consumer_channel *consumer_chan;
+
+	if (!stream)
+		return -EINVAL;
+	buf = stream->buf;
+	consumer_chan = stream->chan;
+	return lib_ring_buffer_snapshot_sample_positions(buf,
+			&buf->cons_snapshot, &buf->prod_snapshot,
+			consumer_chan->chan->handle);
+}
+
 /* Get the consumer position (iteration start) */
 int ustctl_snapshot_get_consumed(struct ustctl_consumer_stream *stream,
 		unsigned long *pos)
@@ -1169,19 +1821,1136 @@ void ustctl_flush_buffer(struct ustctl_consumer_stream *stream,
 		consumer_chan->chan->handle);
 }
 
+void ustctl_clear_buffer(struct ustctl_consumer_stream *stream)
+{
+	struct lttng_ust_lib_ring_buffer *buf;
+	struct ustctl_consumer_channel *consumer_chan;
+
+	assert(stream);
+	buf = stream->buf;
+	consumer_chan = stream->chan;
+	lib_ring_buffer_switch_slow(buf, SWITCH_ACTIVE,
+		consumer_chan->chan->handle);
+	lib_ring_buffer_clear_reader(buf, consumer_chan->chan->handle);
+}
+
+static
+struct lttng_ust_client_lib_ring_buffer_client_cb *get_client_cb(
+		struct lttng_ust_lib_ring_buffer *buf,
+		struct lttng_ust_shm_handle *handle)
+{
+	struct channel *chan;
+	const struct lttng_ust_lib_ring_buffer_config *config;
+	struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
+
+	chan = shmp(handle, buf->backend.chan);
+	if (!chan)
+		return NULL;
+	config = &chan->backend.config;
+	if (!config->cb_ptr)
+		return NULL;
+	client_cb = caa_container_of(config->cb_ptr,
+			struct lttng_ust_client_lib_ring_buffer_client_cb,
+			parent);
+	return client_cb;
+}
+
+int ustctl_get_timestamp_begin(struct ustctl_consumer_stream *stream,
+		uint64_t *timestamp_begin)
+{
+	struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
+	struct lttng_ust_lib_ring_buffer *buf;
+	struct lttng_ust_shm_handle *handle;
+
+	if (!stream || !timestamp_begin)
+		return -EINVAL;
+	buf = stream->buf;
+	handle = stream->chan->chan->handle;
+	client_cb = get_client_cb(buf, handle);
+	if (!client_cb)
+		return -ENOSYS;
+	return client_cb->timestamp_begin(buf, handle, timestamp_begin);
+}
+
+int ustctl_get_timestamp_end(struct ustctl_consumer_stream *stream,
+	uint64_t *timestamp_end)
+{
+	struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
+	struct lttng_ust_lib_ring_buffer *buf;
+	struct lttng_ust_shm_handle *handle;
+
+	if (!stream || !timestamp_end)
+		return -EINVAL;
+	buf = stream->buf;
+	handle = stream->chan->chan->handle;
+	client_cb = get_client_cb(buf, handle);
+	if (!client_cb)
+		return -ENOSYS;
+	return client_cb->timestamp_end(buf, handle, timestamp_end);
+}
+
+int ustctl_get_events_discarded(struct ustctl_consumer_stream *stream,
+	uint64_t *events_discarded)
+{
+	struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
+	struct lttng_ust_lib_ring_buffer *buf;
+	struct lttng_ust_shm_handle *handle;
+
+	if (!stream || !events_discarded)
+		return -EINVAL;
+	buf = stream->buf;
+	handle = stream->chan->chan->handle;
+	client_cb = get_client_cb(buf, handle);
+	if (!client_cb)
+		return -ENOSYS;
+	return client_cb->events_discarded(buf, handle, events_discarded);
+}
+
+int ustctl_get_content_size(struct ustctl_consumer_stream *stream,
+	uint64_t *content_size)
+{
+	struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
+	struct lttng_ust_lib_ring_buffer *buf;
+	struct lttng_ust_shm_handle *handle;
+
+	if (!stream || !content_size)
+		return -EINVAL;
+	buf = stream->buf;
+	handle = stream->chan->chan->handle;
+	client_cb = get_client_cb(buf, handle);
+	if (!client_cb)
+		return -ENOSYS;
+	return client_cb->content_size(buf, handle, content_size);
+}
+
+int ustctl_get_packet_size(struct ustctl_consumer_stream *stream,
+	uint64_t *packet_size)
+{
+	struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
+	struct lttng_ust_lib_ring_buffer *buf;
+	struct lttng_ust_shm_handle *handle;
+
+	if (!stream || !packet_size)
+		return -EINVAL;
+	buf = stream->buf;
+	handle = stream->chan->chan->handle;
+	client_cb = get_client_cb(buf, handle);
+	if (!client_cb)
+		return -ENOSYS;
+	return client_cb->packet_size(buf, handle, packet_size);
+}
+
+int ustctl_get_stream_id(struct ustctl_consumer_stream *stream,
+		uint64_t *stream_id)
+{
+	struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
+	struct lttng_ust_lib_ring_buffer *buf;
+	struct lttng_ust_shm_handle *handle;
+
+	if (!stream || !stream_id)
+		return -EINVAL;
+	buf = stream->buf;
+	handle = stream->chan->chan->handle;
+	client_cb = get_client_cb(buf, handle);
+	if (!client_cb)
+		return -ENOSYS;
+	return client_cb->stream_id(buf, handle, stream_id);
+}
+
+int ustctl_get_current_timestamp(struct ustctl_consumer_stream *stream,
+		uint64_t *ts)
+{
+	struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
+	struct lttng_ust_lib_ring_buffer *buf;
+	struct lttng_ust_shm_handle *handle;
+
+	if (!stream || !ts)
+		return -EINVAL;
+	buf = stream->buf;
+	handle = stream->chan->chan->handle;
+	client_cb = get_client_cb(buf, handle);
+	if (!client_cb || !client_cb->current_timestamp)
+		return -ENOSYS;
+	return client_cb->current_timestamp(buf, handle, ts);
+}
+
+int ustctl_get_sequence_number(struct ustctl_consumer_stream *stream,
+		uint64_t *seq)
+{
+	struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
+	struct lttng_ust_lib_ring_buffer *buf;
+	struct lttng_ust_shm_handle *handle;
+
+	if (!stream || !seq)
+		return -EINVAL;
+	buf = stream->buf;
+	handle = stream->chan->chan->handle;
+	client_cb = get_client_cb(buf, handle);
+	if (!client_cb || !client_cb->sequence_number)
+		return -ENOSYS;
+	return client_cb->sequence_number(buf, handle, seq);
+}
+
+int ustctl_get_instance_id(struct ustctl_consumer_stream *stream,
+		uint64_t *id)
+{
+	struct lttng_ust_client_lib_ring_buffer_client_cb *client_cb;
+	struct lttng_ust_lib_ring_buffer *buf;
+	struct lttng_ust_shm_handle *handle;
+
+	if (!stream || !id)
+		return -EINVAL;
+	buf = stream->buf;
+	handle = stream->chan->chan->handle;
+	client_cb = get_client_cb(buf, handle);
+	if (!client_cb)
+		return -ENOSYS;
+	return client_cb->instance_id(buf, handle, id);
+}
+
+#ifdef LTTNG_UST_HAVE_PERF_EVENT
+
+int ustctl_has_perf_counters(void)
+{
+	return 1;
+}
+
+#else
+
+int ustctl_has_perf_counters(void)
+{
+	return 0;
+}
+
+#endif
+
+#ifdef __linux__
+/*
+ * Override application pid/uid/gid with unix socket credentials. If
+ * the application announced a pid matching our view, it means it is
+ * within the same pid namespace, so expose the ppid provided by the
+ * application.
+ */
+static
+int get_cred(int sock,
+	const struct ustctl_reg_msg *reg_msg,
+	uint32_t *pid,
+	uint32_t *ppid,
+	uint32_t *uid,
+	uint32_t *gid)
+{
+	struct ucred ucred;
+	socklen_t ucred_len = sizeof(struct ucred);
+	int ret;
+
+	ret = getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &ucred_len);
+	if (ret) {
+		return -LTTNG_UST_ERR_PEERCRED;
+	}
+	DBG("Unix socket peercred [ pid: %u, uid: %u, gid: %u ], "
+		"application registered claiming [ pid: %u, ppid: %u, uid: %u, gid: %u ]",
+		ucred.pid, ucred.uid, ucred.gid,
+		reg_msg->pid, reg_msg->ppid, reg_msg->uid, reg_msg->gid);
+	if (!ucred.pid) {
+		ERR("Unix socket credential pid=0. Refusing application in distinct, non-nested pid namespace.");
+		return -LTTNG_UST_ERR_PEERCRED_PID;
+	}
+	*pid = ucred.pid;
+	*uid = ucred.uid;
+	*gid = ucred.gid;
+	if (ucred.pid == reg_msg->pid) {
+		*ppid = reg_msg->ppid;
+	} else {
+		*ppid = 0;
+	}
+	return 0;
+}
+#elif defined(__FreeBSD__)
+#include <sys/ucred.h>
+
+/*
+ * Override application uid/gid with unix socket credentials. Use the
+ * first group of the cr_groups.
+ * Use the pid and ppid provided by the application on registration.
+ */
+static
+int get_cred(int sock,
+	const struct ustctl_reg_msg *reg_msg,
+	uint32_t *pid,
+	uint32_t *ppid,
+	uint32_t *uid,
+	uint32_t *gid)
+{
+	struct xucred xucred;
+	socklen_t xucred_len = sizeof(struct xucred);
+	int ret;
+
+	ret = getsockopt(sock, SOL_SOCKET, LOCAL_PEERCRED, &xucred, &xucred_len);
+	if (ret) {
+		return -LTTNG_UST_ERR_PEERCRED;
+	}
+	if (xucred.cr_version != XUCRED_VERSION || xucred.cr_ngroups < 1) {
+		return -LTTNG_UST_ERR_PEERCRED;
+	}
+	DBG("Unix socket peercred [ uid: %u, gid: %u ], "
+		"application registered claiming [ pid: %d, ppid: %d, uid: %u, gid: %u ]",
+		xucred.uid, xucred.cr_groups[0],
+		reg_msg->pid, reg_msg->ppid, reg_msg->uid, reg_msg->gid);
+	*pid = reg_msg->pid;
+	*ppid = reg_msg->ppid;
+	*uid = xucred.uid;
+	*gid = xucred.cr_groups[0];
+	return 0;
+}
+#else
+#warning "Using insecure fallback: trusting user id provided by registered applications. Please consider implementing use of unix socket credentials on your platform."
+static
+int get_cred(int sock,
+	const struct ustctl_reg_msg *reg_msg,
+	uint32_t *pid,
+	uint32_t *ppid,
+	uint32_t *uid,
+	uint32_t *gid)
+{
+	DBG("Application registered claiming [ pid: %u, ppid: %d, uid: %u, gid: %u ]",
+		reg_msg->pid, reg_msg->ppid, reg_msg->uid, reg_msg->gid);
+	*pid = reg_msg->pid;
+	*ppid = reg_msg->ppid;
+	*uid = reg_msg->uid;
+	*gid = reg_msg->gid;
+	return 0;
+}
+#endif
+
+/*
+ * Returns 0 on success, negative error value on error.
+ */
+int ustctl_recv_reg_msg(int sock,
+	enum ustctl_socket_type *type,
+	uint32_t *major,
+	uint32_t *minor,
+	uint32_t *pid,
+	uint32_t *ppid,
+	uint32_t *uid,
+	uint32_t *gid,
+	uint32_t *bits_per_long,
+	uint32_t *uint8_t_alignment,
+	uint32_t *uint16_t_alignment,
+	uint32_t *uint32_t_alignment,
+	uint32_t *uint64_t_alignment,
+	uint32_t *long_alignment,
+	int *byte_order,
+	char *name)
+{
+	ssize_t len;
+	struct ustctl_reg_msg reg_msg;
+
+	len = ustcomm_recv_unix_sock(sock, &reg_msg, sizeof(reg_msg));
+	if (len > 0 && len != sizeof(reg_msg))
+		return -EIO;
+	if (len == 0)
+		return -EPIPE;
+	if (len < 0)
+		return len;
+
+	if (reg_msg.magic == LTTNG_UST_COMM_MAGIC) {
+		*byte_order = BYTE_ORDER == BIG_ENDIAN ?
+				BIG_ENDIAN : LITTLE_ENDIAN;
+	} else if (reg_msg.magic == bswap_32(LTTNG_UST_COMM_MAGIC)) {
+		*byte_order = BYTE_ORDER == BIG_ENDIAN ?
+				LITTLE_ENDIAN : BIG_ENDIAN;
+	} else {
+		return -LTTNG_UST_ERR_INVAL_MAGIC;
+	}
+	switch (reg_msg.socket_type) {
+	case 0:	*type = USTCTL_SOCKET_CMD;
+		break;
+	case 1:	*type = USTCTL_SOCKET_NOTIFY;
+		break;
+	default:
+		return -LTTNG_UST_ERR_INVAL_SOCKET_TYPE;
+	}
+	*major = reg_msg.major;
+	*minor = reg_msg.minor;
+	*bits_per_long = reg_msg.bits_per_long;
+	*uint8_t_alignment = reg_msg.uint8_t_alignment;
+	*uint16_t_alignment = reg_msg.uint16_t_alignment;
+	*uint32_t_alignment = reg_msg.uint32_t_alignment;
+	*uint64_t_alignment = reg_msg.uint64_t_alignment;
+	*long_alignment = reg_msg.long_alignment;
+	memcpy(name, reg_msg.name, LTTNG_UST_ABI_PROCNAME_LEN);
+	if (reg_msg.major < LTTNG_UST_ABI_MAJOR_VERSION_OLDEST_COMPATIBLE ||
+			reg_msg.major > LTTNG_UST_ABI_MAJOR_VERSION) {
+		return -LTTNG_UST_ERR_UNSUP_MAJOR;
+	}
+	return get_cred(sock, &reg_msg, pid, ppid, uid, gid);
+}
+
+int ustctl_recv_notify(int sock, enum ustctl_notify_cmd *notify_cmd)
+{
+	struct ustcomm_notify_hdr header;
+	ssize_t len;
+
+	len = ustcomm_recv_unix_sock(sock, &header, sizeof(header));
+	if (len > 0 && len != sizeof(header))
+		return -EIO;
+	if (len == 0)
+		return -EPIPE;
+	if (len < 0)
+		return len;
+	switch (header.notify_cmd) {
+	case 0:
+		*notify_cmd = USTCTL_NOTIFY_CMD_EVENT;
+		break;
+	case 1:
+		*notify_cmd = USTCTL_NOTIFY_CMD_CHANNEL;
+		break;
+	case 2:
+		*notify_cmd = USTCTL_NOTIFY_CMD_ENUM;
+		break;
+	default:
+		return -EINVAL;
+	}
+	return 0;
+}
+
+/*
+ * Returns 0 on success, negative error value on error.
+ */
+int ustctl_recv_register_event(int sock,
+	int *session_objd,
+	int *channel_objd,
+	char *event_name,
+	int *loglevel,
+	char **signature,
+	size_t *nr_fields,
+	struct ustctl_field **fields,
+	char **model_emf_uri)
+{
+	ssize_t len;
+	struct ustcomm_notify_event_msg msg;
+	size_t signature_len, fields_len, model_emf_uri_len;
+	char *a_sign = NULL, *a_model_emf_uri = NULL;
+	struct ustctl_field *a_fields = NULL;
+
+	len = ustcomm_recv_unix_sock(sock, &msg, sizeof(msg));
+	if (len > 0 && len != sizeof(msg))
+		return -EIO;
+	if (len == 0)
+		return -EPIPE;
+	if (len < 0)
+		return len;
+
+	*session_objd = msg.session_objd;
+	*channel_objd = msg.channel_objd;
+	strncpy(event_name, msg.event_name, LTTNG_UST_SYM_NAME_LEN);
+	event_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+	*loglevel = msg.loglevel;
+	signature_len = msg.signature_len;
+	fields_len = msg.fields_len;
+
+	if (fields_len % sizeof(*a_fields) != 0) {
+		return -EINVAL;
+	}
+
+	model_emf_uri_len = msg.model_emf_uri_len;
+
+	/* recv signature. contains at least \0. */
+	a_sign = zmalloc(signature_len);
+	if (!a_sign)
+		return -ENOMEM;
+	len = ustcomm_recv_unix_sock(sock, a_sign, signature_len);
+	if (len > 0 && len != signature_len) {
+		len = -EIO;
+		goto signature_error;
+	}
+	if (len == 0) {
+		len = -EPIPE;
+		goto signature_error;
+	}
+	if (len < 0) {
+		goto signature_error;
+	}
+	/* Enforce end of string */
+	a_sign[signature_len - 1] = '\0';
+
+	/* recv fields */
+	if (fields_len) {
+		a_fields = zmalloc(fields_len);
+		if (!a_fields) {
+			len = -ENOMEM;
+			goto signature_error;
+		}
+		len = ustcomm_recv_unix_sock(sock, a_fields, fields_len);
+		if (len > 0 && len != fields_len) {
+			len = -EIO;
+			goto fields_error;
+		}
+		if (len == 0) {
+			len = -EPIPE;
+			goto fields_error;
+		}
+		if (len < 0) {
+			goto fields_error;
+		}
+	}
+
+	if (model_emf_uri_len) {
+		/* recv model_emf_uri_len */
+		a_model_emf_uri = zmalloc(model_emf_uri_len);
+		if (!a_model_emf_uri) {
+			len = -ENOMEM;
+			goto fields_error;
+		}
+		len = ustcomm_recv_unix_sock(sock, a_model_emf_uri,
+				model_emf_uri_len);
+		if (len > 0 && len != model_emf_uri_len) {
+			len = -EIO;
+			goto model_error;
+		}
+		if (len == 0) {
+			len = -EPIPE;
+			goto model_error;
+		}
+		if (len < 0) {
+			goto model_error;
+		}
+		/* Enforce end of string */
+		a_model_emf_uri[model_emf_uri_len - 1] = '\0';
+	}
+
+	*signature = a_sign;
+	*nr_fields = fields_len / sizeof(*a_fields);
+	*fields = a_fields;
+	*model_emf_uri = a_model_emf_uri;
+
+	return 0;
+
+model_error:
+	free(a_model_emf_uri);
+fields_error:
+	free(a_fields);
+signature_error:
+	free(a_sign);
+	return len;
+}
+
+/*
+ * Returns 0 on success, negative error value on error.
+ */
+int ustctl_reply_register_event(int sock,
+	uint32_t id,
+	int ret_code)
+{
+	ssize_t len;
+	struct {
+		struct ustcomm_notify_hdr header;
+		struct ustcomm_notify_event_reply r;
+	} reply;
+
+	memset(&reply, 0, sizeof(reply));
+	reply.header.notify_cmd = USTCTL_NOTIFY_CMD_EVENT;
+	reply.r.ret_code = ret_code;
+	reply.r.event_id = id;
+	len = ustcomm_send_unix_sock(sock, &reply, sizeof(reply));
+	if (len > 0 && len != sizeof(reply))
+		return -EIO;
+	if (len < 0)
+		return len;
+	return 0;
+}
+
+/*
+ * Returns 0 on success, negative UST or system error value on error.
+ */
+int ustctl_recv_register_enum(int sock,
+	int *session_objd,
+	char *enum_name,
+	struct ustctl_enum_entry **entries,
+	size_t *nr_entries)
+{
+	ssize_t len;
+	struct ustcomm_notify_enum_msg msg;
+	size_t entries_len;
+	struct ustctl_enum_entry *a_entries = NULL;
+
+	len = ustcomm_recv_unix_sock(sock, &msg, sizeof(msg));
+	if (len > 0 && len != sizeof(msg))
+		return -EIO;
+	if (len == 0)
+		return -EPIPE;
+	if (len < 0)
+		return len;
+
+	*session_objd = msg.session_objd;
+	strncpy(enum_name, msg.enum_name, LTTNG_UST_SYM_NAME_LEN);
+	enum_name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+	entries_len = msg.entries_len;
+
+	if (entries_len % sizeof(*a_entries) != 0) {
+		return -EINVAL;
+	}
+
+	/* recv entries */
+	if (entries_len) {
+		a_entries = zmalloc(entries_len);
+		if (!a_entries)
+			return -ENOMEM;
+		len = ustcomm_recv_unix_sock(sock, a_entries, entries_len);
+		if (len > 0 && len != entries_len) {
+			len = -EIO;
+			goto entries_error;
+		}
+		if (len == 0) {
+			len = -EPIPE;
+			goto entries_error;
+		}
+		if (len < 0) {
+			goto entries_error;
+		}
+	}
+	*nr_entries = entries_len / sizeof(*a_entries);
+	*entries = a_entries;
+
+	return 0;
+
+entries_error:
+	free(a_entries);
+	return len;
+}
+
+/*
+ * Returns 0 on success, negative error value on error.
+ */
+int ustctl_reply_register_enum(int sock,
+	uint64_t id,
+	int ret_code)
+{
+	ssize_t len;
+	struct {
+		struct ustcomm_notify_hdr header;
+		struct ustcomm_notify_enum_reply r;
+	} reply;
+
+	memset(&reply, 0, sizeof(reply));
+	reply.header.notify_cmd = USTCTL_NOTIFY_CMD_ENUM;
+	reply.r.ret_code = ret_code;
+	reply.r.enum_id = id;
+	len = ustcomm_send_unix_sock(sock, &reply, sizeof(reply));
+	if (len > 0 && len != sizeof(reply))
+		return -EIO;
+	if (len < 0)
+		return len;
+	return 0;
+}
+
+/*
+ * Returns 0 on success, negative UST or system error value on error.
+ */
+int ustctl_recv_register_channel(int sock,
+	int *session_objd,		/* session descriptor (output) */
+	int *channel_objd,		/* channel descriptor (output) */
+	size_t *nr_fields,
+	struct ustctl_field **fields)
+{
+	ssize_t len;
+	struct ustcomm_notify_channel_msg msg;
+	size_t fields_len;
+	struct ustctl_field *a_fields;
+
+	len = ustcomm_recv_unix_sock(sock, &msg, sizeof(msg));
+	if (len > 0 && len != sizeof(msg))
+		return -EIO;
+	if (len == 0)
+		return -EPIPE;
+	if (len < 0)
+		return len;
+
+	*session_objd = msg.session_objd;
+	*channel_objd = msg.channel_objd;
+	fields_len = msg.ctx_fields_len;
+
+	if (fields_len % sizeof(*a_fields) != 0) {
+		return -EINVAL;
+	}
+
+	/* recv fields */
+	if (fields_len) {
+		a_fields = zmalloc(fields_len);
+		if (!a_fields) {
+			len = -ENOMEM;
+			goto alloc_error;
+		}
+		len = ustcomm_recv_unix_sock(sock, a_fields, fields_len);
+		if (len > 0 && len != fields_len) {
+			len = -EIO;
+			goto fields_error;
+		}
+		if (len == 0) {
+			len = -EPIPE;
+			goto fields_error;
+		}
+		if (len < 0) {
+			goto fields_error;
+		}
+		*fields = a_fields;
+	} else {
+		*fields = NULL;
+	}
+	*nr_fields = fields_len / sizeof(*a_fields);
+	return 0;
+
+fields_error:
+	free(a_fields);
+alloc_error:
+	return len;
+}
+
+/*
+ * Returns 0 on success, negative error value on error.
+ */
+int ustctl_reply_register_channel(int sock,
+	uint32_t chan_id,
+	enum ustctl_channel_header header_type,
+	int ret_code)
+{
+	ssize_t len;
+	struct {
+		struct ustcomm_notify_hdr header;
+		struct ustcomm_notify_channel_reply r;
+	} reply;
+
+	memset(&reply, 0, sizeof(reply));
+	reply.header.notify_cmd = USTCTL_NOTIFY_CMD_CHANNEL;
+	reply.r.ret_code = ret_code;
+	reply.r.chan_id = chan_id;
+	switch (header_type) {
+	case USTCTL_CHANNEL_HEADER_COMPACT:
+		reply.r.header_type = 1;
+		break;
+	case USTCTL_CHANNEL_HEADER_LARGE:
+		reply.r.header_type = 2;
+		break;
+	default:
+		reply.r.header_type = 0;
+		break;
+	}
+	len = ustcomm_send_unix_sock(sock, &reply, sizeof(reply));
+	if (len > 0 && len != sizeof(reply))
+		return -EIO;
+	if (len < 0)
+		return len;
+	return 0;
+}
+
+/* Regenerate the statedump. */
+int ustctl_regenerate_statedump(int sock, int handle)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret;
+
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = handle;
+	lum.cmd = LTTNG_UST_SESSION_STATEDUMP;
+	ret = ustcomm_send_app_cmd(sock, &lum, &lur);
+	if (ret)
+		return ret;
+	DBG("Regenerated statedump for handle %u", handle);
+	return 0;
+}
+
+/* counter operations */
+
+int ustctl_get_nr_cpu_per_counter(void)
+{
+	return lttng_counter_num_possible_cpus();
+}
+
+struct ustctl_daemon_counter *
+	ustctl_create_counter(size_t nr_dimensions,
+		const struct ustctl_counter_dimension *dimensions,
+		int64_t global_sum_step,
+		int global_counter_fd,
+		int nr_counter_cpu_fds,
+		const int *counter_cpu_fds,
+		enum ustctl_counter_bitness bitness,
+		enum ustctl_counter_arithmetic arithmetic,
+		uint32_t alloc_flags)
+{
+	const char *transport_name;
+	struct ustctl_daemon_counter *counter;
+	struct lttng_counter_transport *transport;
+	struct lttng_counter_dimension ust_dim[LTTNG_COUNTER_DIMENSION_MAX];
+	size_t i;
+
+	if (nr_dimensions > LTTNG_COUNTER_DIMENSION_MAX)
+		return NULL;
+	/* Currently, only per-cpu allocation is supported. */
+	switch (alloc_flags) {
+	case USTCTL_COUNTER_ALLOC_PER_CPU:
+		break;
+
+	case USTCTL_COUNTER_ALLOC_PER_CPU | USTCTL_COUNTER_ALLOC_GLOBAL:
+	case USTCTL_COUNTER_ALLOC_GLOBAL:
+	default:
+		return NULL;
+	}
+	switch (bitness) {
+	case USTCTL_COUNTER_BITNESS_32:
+		switch (arithmetic) {
+		case USTCTL_COUNTER_ARITHMETIC_MODULAR:
+			transport_name = "counter-per-cpu-32-modular";
+			break;
+		case USTCTL_COUNTER_ARITHMETIC_SATURATION:
+			transport_name = "counter-per-cpu-32-saturation";
+			break;
+		default:
+			return NULL;
+		}
+		break;
+	case USTCTL_COUNTER_BITNESS_64:
+		switch (arithmetic) {
+		case USTCTL_COUNTER_ARITHMETIC_MODULAR:
+			transport_name = "counter-per-cpu-64-modular";
+			break;
+		case USTCTL_COUNTER_ARITHMETIC_SATURATION:
+			transport_name = "counter-per-cpu-64-saturation";
+			break;
+		default:
+			return NULL;
+		}
+		break;
+	default:
+		return NULL;
+	}
+
+	transport = lttng_counter_transport_find(transport_name);
+	if (!transport) {
+		DBG("LTTng transport %s not found\n",
+			transport_name);
+		return NULL;
+	}
+
+	counter = zmalloc(sizeof(*counter));
+	if (!counter)
+		return NULL;
+	counter->attr = zmalloc(sizeof(*counter->attr));
+	if (!counter->attr)
+		goto free_counter;
+	counter->attr->bitness = bitness;
+	counter->attr->arithmetic = arithmetic;
+	counter->attr->nr_dimensions = nr_dimensions;
+	counter->attr->global_sum_step = global_sum_step;
+	for (i = 0; i < nr_dimensions; i++)
+		counter->attr->dimensions[i] = dimensions[i];
+
+	for (i = 0; i < nr_dimensions; i++) {
+		ust_dim[i].size = dimensions[i].size;
+		ust_dim[i].underflow_index = dimensions[i].underflow_index;
+		ust_dim[i].overflow_index = dimensions[i].overflow_index;
+		ust_dim[i].has_underflow = dimensions[i].has_underflow;
+		ust_dim[i].has_overflow = dimensions[i].has_overflow;
+	}
+	counter->counter = transport->ops.counter_create(nr_dimensions,
+		ust_dim, global_sum_step, global_counter_fd,
+		nr_counter_cpu_fds, counter_cpu_fds, true);
+	if (!counter->counter)
+		goto free_attr;
+	counter->ops = &transport->ops;
+	return counter;
+
+free_attr:
+	free(counter->attr);
+free_counter:
+	free(counter);
+	return NULL;
+}
+
+int ustctl_create_counter_data(struct ustctl_daemon_counter *counter,
+		struct lttng_ust_object_data **_counter_data)
+{
+	struct lttng_ust_object_data *counter_data;
+	struct lttng_ust_counter_conf counter_conf = {0};
+	size_t i;
+	int ret;
+
+	switch (counter->attr->arithmetic) {
+	case USTCTL_COUNTER_ARITHMETIC_MODULAR:
+		counter_conf.arithmetic = LTTNG_UST_COUNTER_ARITHMETIC_MODULAR;
+		break;
+	case USTCTL_COUNTER_ARITHMETIC_SATURATION:
+		counter_conf.arithmetic = LTTNG_UST_COUNTER_ARITHMETIC_SATURATION;
+		break;
+	default:
+		return -EINVAL;
+	}
+	switch (counter->attr->bitness) {
+	case USTCTL_COUNTER_BITNESS_32:
+		counter_conf.bitness = LTTNG_UST_COUNTER_BITNESS_32;
+		break;
+	case USTCTL_COUNTER_BITNESS_64:
+		counter_conf.bitness = LTTNG_UST_COUNTER_BITNESS_64;
+		break;
+	default:
+		return -EINVAL;
+	}
+	counter_conf.number_dimensions = counter->attr->nr_dimensions;
+	counter_conf.global_sum_step = counter->attr->global_sum_step;
+	for (i = 0; i < counter->attr->nr_dimensions; i++) {
+		counter_conf.dimensions[i].size = counter->attr->dimensions[i].size;
+		counter_conf.dimensions[i].underflow_index = counter->attr->dimensions[i].underflow_index;
+		counter_conf.dimensions[i].overflow_index = counter->attr->dimensions[i].overflow_index;
+		counter_conf.dimensions[i].has_underflow = counter->attr->dimensions[i].has_underflow;
+		counter_conf.dimensions[i].has_overflow = counter->attr->dimensions[i].has_overflow;
+	}
+
+	counter_data = zmalloc(sizeof(*counter_data));
+	if (!counter_data) {
+		ret = -ENOMEM;
+		goto error_alloc;
+	}
+	counter_data->type = LTTNG_UST_OBJECT_TYPE_COUNTER;
+	counter_data->handle = -1;
+
+	counter_data->size = sizeof(counter_conf);
+	counter_data->u.counter.data = zmalloc(sizeof(counter_conf));
+	if (!counter_data->u.counter.data) {
+		ret = -ENOMEM;
+		goto error_alloc_data;
+	}
+
+	memcpy(counter_data->u.counter.data, &counter_conf, sizeof(counter_conf));
+	*_counter_data = counter_data;
+
+	return 0;
+
+error_alloc_data:
+	free(counter_data);
+error_alloc:
+	return ret;
+}
+
+int ustctl_create_counter_global_data(struct ustctl_daemon_counter *counter,
+		struct lttng_ust_object_data **_counter_global_data)
+{
+	struct lttng_ust_object_data *counter_global_data;
+	int ret, fd;
+	size_t len;
+
+	if (lttng_counter_get_global_shm(counter->counter, &fd, &len))
+		return -EINVAL;
+	counter_global_data = zmalloc(sizeof(*counter_global_data));
+	if (!counter_global_data) {
+		ret = -ENOMEM;
+		goto error_alloc;
+	}
+	counter_global_data->type = LTTNG_UST_OBJECT_TYPE_COUNTER_GLOBAL;
+	counter_global_data->handle = -1;
+	counter_global_data->size = len;
+	counter_global_data->u.counter_global.shm_fd = fd;
+	*_counter_global_data = counter_global_data;
+	return 0;
+
+error_alloc:
+	return ret;
+}
+
+int ustctl_create_counter_cpu_data(struct ustctl_daemon_counter *counter, int cpu,
+		struct lttng_ust_object_data **_counter_cpu_data)
+{
+	struct lttng_ust_object_data *counter_cpu_data;
+	int ret, fd;
+	size_t len;
+
+	if (lttng_counter_get_cpu_shm(counter->counter, cpu, &fd, &len))
+		return -EINVAL;
+	counter_cpu_data = zmalloc(sizeof(*counter_cpu_data));
+	if (!counter_cpu_data) {
+		ret = -ENOMEM;
+		goto error_alloc;
+	}
+	counter_cpu_data->type = LTTNG_UST_OBJECT_TYPE_COUNTER_CPU;
+	counter_cpu_data->handle = -1;
+	counter_cpu_data->size = len;
+	counter_cpu_data->u.counter_cpu.shm_fd = fd;
+	counter_cpu_data->u.counter_cpu.cpu_nr = cpu;
+	*_counter_cpu_data = counter_cpu_data;
+	return 0;
+
+error_alloc:
+	return ret;
+}
+
+void ustctl_destroy_counter(struct ustctl_daemon_counter *counter)
+{
+	counter->ops->counter_destroy(counter->counter);
+	free(counter->attr);
+	free(counter);
+}
+
+int ustctl_send_counter_data_to_ust(int sock, int parent_handle,
+		struct lttng_ust_object_data *counter_data)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret;
+	size_t size;
+	ssize_t len;
+
+	if (!counter_data)
+		return -EINVAL;
+
+	size = counter_data->size;
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = parent_handle;
+	lum.cmd = LTTNG_UST_COUNTER;
+	lum.u.counter.len = size;
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret)
+		return ret;
+
+	/* Send counter data */
+	len = ustcomm_send_unix_sock(sock, counter_data->u.counter.data, size);
+	if (len != size) {
+		if (len < 0)
+			return len;
+		else
+			return -EIO;
+	}
+
+	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+	if (!ret) {
+		counter_data->handle = lur.ret_val;
+	}
+	return ret;
+}
+
+int ustctl_send_counter_global_data_to_ust(int sock,
+		struct lttng_ust_object_data *counter_data,
+		struct lttng_ust_object_data *counter_global_data)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret, shm_fd[1];
+	size_t size;
+	ssize_t len;
+
+	if (!counter_data || !counter_global_data)
+		return -EINVAL;
+
+	size = counter_global_data->size;
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = counter_data->handle;	/* parent handle */
+	lum.cmd = LTTNG_UST_COUNTER_GLOBAL;
+	lum.u.counter_global.len = size;
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret)
+		return ret;
+
+	shm_fd[0] = counter_global_data->u.counter_global.shm_fd;
+	len = ustcomm_send_fds_unix_sock(sock, shm_fd, 1);
+	if (len <= 0) {
+		if (len < 0)
+			return len;
+		else
+			return -EIO;
+	}
+
+	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+	if (!ret) {
+		counter_global_data->handle = lur.ret_val;
+	}
+	return ret;
+}
+
+int ustctl_send_counter_cpu_data_to_ust(int sock,
+		struct lttng_ust_object_data *counter_data,
+		struct lttng_ust_object_data *counter_cpu_data)
+{
+	struct ustcomm_ust_msg lum;
+	struct ustcomm_ust_reply lur;
+	int ret, shm_fd[1];
+	size_t size;
+	ssize_t len;
+
+	if (!counter_data || !counter_cpu_data)
+		return -EINVAL;
+
+	size = counter_cpu_data->size;
+	memset(&lum, 0, sizeof(lum));
+	lum.handle = counter_data->handle;	/* parent handle */
+	lum.cmd = LTTNG_UST_COUNTER_CPU;
+	lum.u.counter_cpu.len = size;
+	lum.u.counter_cpu.cpu_nr = counter_cpu_data->u.counter_cpu.cpu_nr;
+	ret = ustcomm_send_app_msg(sock, &lum);
+	if (ret)
+		return ret;
+
+	shm_fd[0] = counter_cpu_data->u.counter_global.shm_fd;
+	len = ustcomm_send_fds_unix_sock(sock, shm_fd, 1);
+	if (len <= 0) {
+		if (len < 0)
+			return len;
+		else
+			return -EIO;
+	}
+
+	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+	if (!ret) {
+		counter_cpu_data->handle = lur.ret_val;
+	}
+	return ret;
+}
+
+int ustctl_counter_read(struct ustctl_daemon_counter *counter,
+		const size_t *dimension_indexes,
+		int cpu, int64_t *value,
+		bool *overflow, bool *underflow)
+{
+	return counter->ops->counter_read(counter->counter, dimension_indexes, cpu,
+			value, overflow, underflow);
+}
+
+int ustctl_counter_aggregate(struct ustctl_daemon_counter *counter,
+		const size_t *dimension_indexes,
+		int64_t *value,
+		bool *overflow, bool *underflow)
+{
+	return counter->ops->counter_aggregate(counter->counter, dimension_indexes,
+			value, overflow, underflow);
+}
+
+int ustctl_counter_clear(struct ustctl_daemon_counter *counter,
+		const size_t *dimension_indexes)
+{
+	return counter->ops->counter_clear(counter->counter, dimension_indexes);
+}
+
 static __attribute__((constructor))
 void ustctl_init(void)
 {
 	init_usterr();
+	lttng_ust_getenv_init();	/* Needs init_usterr() to be completed. */
+	lttng_ust_clock_init();
 	lttng_ring_buffer_metadata_client_init();
 	lttng_ring_buffer_client_overwrite_init();
+	lttng_ring_buffer_client_overwrite_rt_init();
 	lttng_ring_buffer_client_discard_init();
+	lttng_ring_buffer_client_discard_rt_init();
+	lttng_counter_client_percpu_32_modular_init();
+	lttng_counter_client_percpu_64_modular_init();
+	lib_ringbuffer_signal_init();
 }
 
 static __attribute__((destructor))
 void ustctl_exit(void)
 {
+	lttng_ring_buffer_client_discard_rt_exit();
 	lttng_ring_buffer_client_discard_exit();
+	lttng_ring_buffer_client_overwrite_rt_exit();
 	lttng_ring_buffer_client_overwrite_exit();
 	lttng_ring_buffer_metadata_client_exit();
+	lttng_counter_client_percpu_32_modular_exit();
+	lttng_counter_client_percpu_64_modular_exit();
 }