X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=c060e2d9aaae49f033cf420f0155bb7a03d5d4c8;hb=09434f96935202d1e6cf64a74d4da4b95d06246d;hp=56d588a8d246cd74a3662c72c3eacf1663fd0f1d;hpb=f488575f3420027d33050e779e1e3916e3b91c8c;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 56d588a8..c060e2d9 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -37,17 +37,28 @@
  *     - Takes instrumentation source specific arguments.
  */
 
-#include <lttng/ust-abi.h>
-#include <lttng/ust-error.h>
+#define _LGPL_SOURCE
+#include <stdint.h>
+#include <unistd.h>
+
 #include <urcu/compiler.h>
 #include <urcu/list.h>
+
+#include <helper.h>
+#include <lttng/tracepoint.h>
+#include <lttng/ust-abi.h>
+#include <lttng/ust-error.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-version.h>
-#include <lttng/tracepoint.h>
-#include "tracepoint-internal.h"
+#include <ust-fd.h>
 #include <usterr-signal-safe.h>
-#include <helper.h>
-#include "ltt-tracer.h"
+
+#include "../libringbuffer/frontend_types.h"
+#include "../libringbuffer/shm.h"
+#include "lttng-tracer.h"
+#include "string-utils.h"
+
+#define OBJ_NAME_LEN	16
 
 static int lttng_ust_abi_close_in_progress;
 
@@ -67,7 +78,9 @@ struct lttng_ust_obj {
 			void *private_data;
 			const struct lttng_ust_objd_ops *ops;
 			int f_count;
+			int owner_ref;	/* has ref from owner */
 			void *owner;
+			char name[OBJ_NAME_LEN];
 		} s;
 		int freelist_next;	/* offset freelist. end is -1. */
 	} u;
@@ -85,7 +98,7 @@ static struct lttng_ust_objd_table objd_table = {
 
 static
 int objd_alloc(void *private_data, const struct lttng_ust_objd_ops *ops,
-		void *owner)
+		void *owner, const char *name)
 {
 	struct lttng_ust_obj *obj;
 
@@ -121,7 +134,10 @@ end:
 	obj->u.s.ops = ops;
 	obj->u.s.f_count = 2;	/* count == 1 : object is allocated */
 				/* count == 2 : allocated + hold ref */
+	obj->u.s.owner_ref = 1;	/* One owner reference */
 	obj->u.s.owner = owner;
+	strncpy(obj->u.s.name, name, OBJ_NAME_LEN);
+	obj->u.s.name[OBJ_NAME_LEN - 1] = '\0';
 	return obj - objd_table.array;
 }
 
@@ -176,10 +192,11 @@ static
 void objd_ref(int id)
 {
 	struct lttng_ust_obj *obj = _objd_get(id);
+	assert(obj != NULL);
 	obj->u.s.f_count++;
 }
 
-int lttng_ust_objd_unref(int id)
+int lttng_ust_objd_unref(int id, int is_owner)
 {
 	struct lttng_ust_obj *obj = _objd_get(id);
 
@@ -189,9 +206,16 @@ int lttng_ust_objd_unref(int id)
 		ERR("Reference counting error\n");
 		return -EINVAL;
 	}
+	if (is_owner) {
+		if (!obj->u.s.owner_ref) {
+			ERR("Error decrementing owner reference");
+			return -EINVAL;
+		}
+		obj->u.s.owner_ref--;
+	}
 	if ((--obj->u.s.f_count) == 1) {
 		const struct lttng_ust_objd_ops *ops = objd_ops(id);
-		
+
 		if (ops->release)
 			ops->release(id);
 		objd_free(id);
@@ -204,8 +228,16 @@ void objd_table_destroy(void)
 {
 	int i;
 
-	for (i = 0; i < objd_table.allocated_len; i++)
-		(void) lttng_ust_objd_unref(i);
+	for (i = 0; i < objd_table.allocated_len; i++) {
+		struct lttng_ust_obj *obj;
+
+		obj = _objd_get(i);
+		if (!obj)
+			continue;
+		if (!obj->u.s.owner_ref)
+			continue;	/* only unref owner ref. */
+		(void) lttng_ust_objd_unref(i, 1);
+	}
 	free(objd_table.array);
 	objd_table.array = NULL;
 	objd_table.len = 0;
@@ -213,6 +245,15 @@ void objd_table_destroy(void)
 	objd_table.freelist_head = -1;
 }
 
+const char *lttng_ust_obj_get_name(int id)
+{
+	struct lttng_ust_obj *obj = _objd_get(id);
+
+	if (!obj)
+		return NULL;
+	return obj->u.s.name;
+}
+
 void lttng_ust_objd_table_owner_cleanup(void *owner)
 {
 	int i;
@@ -225,8 +266,10 @@ void lttng_ust_objd_table_owner_cleanup(void *owner)
 			continue;
 		if (!obj->u.s.owner)
 			continue;	/* skip root handles */
+		if (!obj->u.s.owner_ref)
+			continue;	/* only unref owner ref. */
 		if (obj->u.s.owner == owner)
-			(void) lttng_ust_objd_unref(i);
+			(void) lttng_ust_objd_unref(i, 1);
 	}
 }
 
@@ -238,46 +281,51 @@ void lttng_ust_objd_table_owner_cleanup(void *owner)
 static const struct lttng_ust_objd_ops lttng_ops;
 static const struct lttng_ust_objd_ops lttng_session_ops;
 static const struct lttng_ust_objd_ops lttng_channel_ops;
-static const struct lttng_ust_objd_ops lttng_metadata_ops;
-static const struct lttng_ust_objd_ops lttng_event_ops;
-static const struct lttng_ust_objd_ops lttng_wildcard_ops;
-static const struct lttng_ust_objd_ops lib_ring_buffer_objd_ops;
+static const struct lttng_ust_objd_ops lttng_enabler_ops;
 static const struct lttng_ust_objd_ops lttng_tracepoint_list_ops;
 static const struct lttng_ust_objd_ops lttng_tracepoint_field_list_ops;
 
-enum channel_type {
-	PER_CPU_CHANNEL,
-	METADATA_CHANNEL,
-};
-
 int lttng_abi_create_root_handle(void)
 {
 	int root_handle;
 
 	/* root handles have NULL owners */
-	root_handle = objd_alloc(NULL, &lttng_ops, NULL);
+	root_handle = objd_alloc(NULL, &lttng_ops, NULL, "root");
 	return root_handle;
 }
 
+static
+int lttng_is_channel_ready(struct lttng_channel *lttng_chan)
+{
+	struct channel *chan;
+	unsigned int nr_streams, exp_streams;
+
+	chan = lttng_chan->chan;
+	nr_streams = channel_handle_get_nr_streams(lttng_chan->handle);
+	exp_streams = chan->nr_streams;
+	return nr_streams == exp_streams;
+}
+
 static
 int lttng_abi_create_session(void *owner)
 {
-	struct ltt_session *session;
+	struct lttng_session *session;
 	int session_objd, ret;
 
-	session = ltt_session_create();
+	session = lttng_session_create();
 	if (!session)
 		return -ENOMEM;
-	session_objd = objd_alloc(session, &lttng_session_ops, owner);
+	session_objd = objd_alloc(session, &lttng_session_ops, owner, "session");
 	if (session_objd < 0) {
 		ret = session_objd;
 		goto objd_error;
 	}
 	session->objd = session_objd;
+	session->owner = owner;
 	return session_objd;
 
 objd_error:
-	ltt_session_destroy(session);
+	lttng_session_destroy(session);
 	return ret;
 }
 
@@ -285,32 +333,19 @@ static
 long lttng_abi_tracer_version(int objd,
 	struct lttng_ust_tracer_version *v)
 {
-	v->major = LTTNG_UST_INTERNAL_MAJOR_VERSION;
-	v->minor = LTTNG_UST_INTERNAL_MINOR_VERSION;
-	v->patchlevel = LTTNG_UST_INTERNAL_PATCHLEVEL_VERSION;
+	v->major = LTTNG_UST_MAJOR_VERSION;
+	v->minor = LTTNG_UST_MINOR_VERSION;
+	v->patchlevel = LTTNG_UST_PATCHLEVEL_VERSION;
 	return 0;
 }
 
 static
 long lttng_abi_add_context(int objd,
 	struct lttng_ust_context *context_param,
-	struct lttng_ctx **ctx, struct ltt_session *session)
+	union ust_args *uargs,
+	struct lttng_ctx **ctx, struct lttng_session *session)
 {
-	if (session->been_active)
-		return -EPERM;
-
-	switch (context_param->ctx) {
-	case LTTNG_UST_CONTEXT_PTHREAD_ID:
-		return lttng_add_pthread_id_to_ctx(ctx);
-	case LTTNG_UST_CONTEXT_VTID:
-		return lttng_add_vtid_to_ctx(ctx);
-	case LTTNG_UST_CONTEXT_VPID:
-		return lttng_add_vpid_to_ctx(ctx);
-	case LTTNG_UST_CONTEXT_PROCNAME:
-		return lttng_add_procname_to_ctx(ctx);
-	default:
-		return -EINVAL;
-	}
+	return lttng_attach_context(context_param, uargs, ctx, session);
 }
 
 /**
@@ -362,119 +397,151 @@ static const struct lttng_ust_objd_ops lttng_ops = {
 	.cmd = lttng_cmd,
 };
 
-/*
- * We tolerate no failure in this function (if one happens, we print a dmesg
- * error, but cannot return any error, because the channel information is
- * invariant.
- */
-static
-void lttng_metadata_create_events(int channel_objd)
+int lttng_abi_map_channel(int session_objd,
+		struct lttng_ust_channel *ust_chan,
+		union ust_args *uargs,
+		void *owner)
 {
-	struct ltt_channel *channel = objd_private(channel_objd);
-	static struct lttng_ust_event metadata_params = {
-		.instrumentation = LTTNG_UST_TRACEPOINT,
-		.name = "lttng_ust:metadata",
-		.loglevel_type = LTTNG_UST_LOGLEVEL_ALL,
-		.loglevel = TRACE_DEFAULT,
-	};
-	struct ltt_event *event;
+	struct lttng_session *session = objd_private(session_objd);
+	const char *transport_name;
+	const struct lttng_transport *transport;
+	const char *chan_name;
+	int chan_objd;
+	struct lttng_ust_shm_handle *channel_handle;
+	struct lttng_channel *lttng_chan;
+	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_config *config;
+	void *chan_data;
+	int wakeup_fd;
+	uint64_t len;
 	int ret;
+	enum lttng_ust_chan_type type;
 
-	/*
-	 * We tolerate no failure path after event creation. It will stay
-	 * invariant for the rest of the session.
-	 */
-	ret = ltt_event_create(channel, &metadata_params, &event);
-	if (ret < 0) {
-		goto create_error;
+	chan_data = uargs->channel.chan_data;
+	wakeup_fd = uargs->channel.wakeup_fd;
+	len = ust_chan->len;
+	type = ust_chan->type;
+
+	switch (type) {
+	case LTTNG_UST_CHAN_PER_CPU:
+		break;
+	default:
+		ret = -EINVAL;
+		goto invalid;
 	}
-	return;
 
-create_error:
-	WARN_ON(1);
-	return;		/* not allowed to return error */
-}
+	if (session->been_active) {
+		ret = -EBUSY;
+		goto active;	/* Refuse to add channel to active session */
+	}
 
-int lttng_abi_create_channel(int session_objd,
-			     struct lttng_ust_channel *chan_param,
-			     enum channel_type channel_type,
-			     union ust_args *uargs,
-			     void *owner)
-{
-	struct ltt_session *session = objd_private(session_objd);
-	const struct lttng_ust_objd_ops *ops;
-	const char *transport_name;
-	struct ltt_channel *chan;
-	int chan_objd;
-	int ret = 0;
-	struct ltt_channel chan_priv_init;
-
-	switch (channel_type) {
-	case PER_CPU_CHANNEL:
-		if (chan_param->output == LTTNG_UST_MMAP) {
-			transport_name = chan_param->overwrite ?
-				"relay-overwrite-mmap" : "relay-discard-mmap";
+	channel_handle = channel_handle_create(chan_data, len, wakeup_fd);
+	if (!channel_handle) {
+		ret = -EINVAL;
+		goto handle_error;
+	}
+
+	chan = shmp(channel_handle, channel_handle->chan);
+	assert(chan);
+	chan->handle = channel_handle;
+	config = &chan->backend.config;
+	lttng_chan = channel_get_private(chan);
+	if (!lttng_chan) {
+		ret = -EINVAL;
+		goto alloc_error;
+	}
+
+	/* Lookup transport name */
+	switch (type) {
+	case LTTNG_UST_CHAN_PER_CPU:
+		if (config->output == RING_BUFFER_MMAP) {
+			if (config->mode == RING_BUFFER_OVERWRITE) {
+				if (config->wakeup == RING_BUFFER_WAKEUP_BY_WRITER) {
+					transport_name = "relay-overwrite-mmap";
+				} else {
+					transport_name = "relay-overwrite-rt-mmap";
+				}
+			} else {
+				if (config->wakeup == RING_BUFFER_WAKEUP_BY_WRITER) {
+					transport_name = "relay-discard-mmap";
+				} else {
+					transport_name = "relay-discard-rt-mmap";
+				}
+			}
 		} else {
-			return -EINVAL;
+			ret = -EINVAL;
+			goto notransport;
 		}
-		ops = &lttng_channel_ops;
-		break;
-	case METADATA_CHANNEL:
-		if (chan_param->output == LTTNG_UST_MMAP)
-			transport_name = "relay-metadata-mmap";
-		else
-			return -EINVAL;
-		ops = &lttng_metadata_ops;
+		chan_name = "channel";
 		break;
 	default:
-		transport_name = "<unknown>";
-		return -EINVAL;
+		ret = -EINVAL;
+		goto notransport;
+	}
+	transport = lttng_transport_find(transport_name);
+	if (!transport) {
+		DBG("LTTng transport %s not found\n",
+		       transport_name);
+		ret = -EINVAL;
+		goto notransport;
 	}
-	chan_objd = objd_alloc(NULL, ops, owner);
+
+	chan_objd = objd_alloc(NULL, &lttng_channel_ops, owner, chan_name);
 	if (chan_objd < 0) {
 		ret = chan_objd;
 		goto objd_error;
 	}
-	memset(&chan_priv_init, 0, sizeof(chan_priv_init));
-	/* Copy of session UUID for consumer (availability through shm) */
-	memcpy(chan_priv_init.uuid, session->uuid, sizeof(session->uuid));
-	
+
+	/* Initialize our lttng chan */
+	lttng_chan->chan = chan;
+	lttng_chan->tstate = 1;
+	lttng_chan->enabled = 1;
+	lttng_chan->ctx = NULL;
+	lttng_chan->session = session;
+	lttng_chan->ops = &transport->ops;
+	memcpy(&lttng_chan->chan->backend.config,
+		transport->client_config,
+		sizeof(lttng_chan->chan->backend.config));
+	cds_list_add(&lttng_chan->node, &session->chan_head);
+	lttng_chan->header_type = 0;
+	lttng_chan->handle = channel_handle;
+	lttng_chan->type = type;
+
 	/*
 	 * We tolerate no failure path after channel creation. It will stay
 	 * invariant for the rest of the session.
 	 */
-	chan = ltt_channel_create(session, transport_name, NULL,
-				  chan_param->subbuf_size,
-				  chan_param->num_subbuf,
-				  chan_param->switch_timer_interval,
-				  chan_param->read_timer_interval,
-				  &uargs->channel.shm_fd,
-				  &uargs->channel.wait_fd,
-				  &uargs->channel.memory_map_size,
-				  &chan_priv_init);
-	if (!chan) {
-		ret = -EINVAL;
-		goto chan_error;
-	}
-	objd_set_private(chan_objd, chan);
-	chan->objd = chan_objd;
-	if (channel_type == METADATA_CHANNEL) {
-		session->metadata = chan;
-		lttng_metadata_create_events(chan_objd);
-	}
+	objd_set_private(chan_objd, lttng_chan);
+	lttng_chan->objd = chan_objd;
 	/* The channel created holds a reference on the session */
 	objd_ref(session_objd);
-
 	return chan_objd;
 
-chan_error:
+	/* error path after channel was created */
+objd_error:
+notransport:
+alloc_error:
+	channel_destroy(chan, channel_handle, 0);
+	return ret;
+
+	/*
+	 * error path before channel creation (owning chan_data and
+	 * wakeup_fd).
+	 */
+handle_error:
+active:
+invalid:
 	{
-		int err;
+		int close_ret;
 
-		err = lttng_ust_objd_unref(chan_objd);
-		assert(!err);
+		lttng_ust_lock_fd_tracker();
+		close_ret = close(wakeup_fd);
+		lttng_ust_unlock_fd_tracker();
+		if (close_ret) {
+			PERROR("close");
+		}
 	}
-objd_error:
+	free(chan_data);
 	return ret;
 }
 
@@ -494,8 +561,6 @@ objd_error:
  *		Enables tracing for a session (weak enable)
  *	LTTNG_UST_DISABLE
  *		Disables tracing for a session (strong disable)
- *	LTTNG_UST_METADATA
- *		Returns a LTTng metadata object descriptor
  *
  * The returned channel will be deleted when its file descriptor is closed.
  */
@@ -503,23 +568,21 @@ static
 long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg,
 	union ust_args *uargs, void *owner)
 {
-	struct ltt_session *session = objd_private(objd);
+	struct lttng_session *session = objd_private(objd);
 
 	switch (cmd) {
 	case LTTNG_UST_CHANNEL:
-		return lttng_abi_create_channel(objd,
+		return lttng_abi_map_channel(objd,
 				(struct lttng_ust_channel *) arg,
-				PER_CPU_CHANNEL, uargs, owner);
+				uargs, owner);
 	case LTTNG_UST_SESSION_START:
 	case LTTNG_UST_ENABLE:
-		return ltt_session_enable(session);
+		return lttng_session_enable(session);
 	case LTTNG_UST_SESSION_STOP:
 	case LTTNG_UST_DISABLE:
-		return ltt_session_disable(session);
-	case LTTNG_UST_METADATA:
-		return lttng_abi_create_channel(objd,
-				(struct lttng_ust_channel *) arg,
-				METADATA_CHANNEL, uargs, owner);
+		return lttng_session_disable(session);
+	case LTTNG_UST_SESSION_STATEDUMP:
+		return lttng_session_statedump(session);
 	default:
 		return -EINVAL;
 	}
@@ -536,10 +599,10 @@ long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg,
 static
 int lttng_release_session(int objd)
 {
-	struct ltt_session *session = objd_private(objd);
+	struct lttng_session *session = objd_private(objd);
 
 	if (session) {
-		ltt_session_destroy(session);
+		lttng_session_destroy(session);
 		return 0;
 	} else {
 		return -EINVAL;
@@ -563,12 +626,9 @@ long lttng_tracepoint_list_cmd(int objd, unsigned int cmd, unsigned long arg,
 	switch (cmd) {
 	case LTTNG_UST_TRACEPOINT_LIST_GET:
 	{
-	retry:
 		iter = lttng_ust_tracepoint_list_get_iter_next(list);
 		if (!iter)
 			return -LTTNG_UST_ERR_NOENT;
-		if (!strcmp(iter->name, "lttng_ust:metadata"))
-			goto retry;
 		memcpy(tp, iter, sizeof(*tp));
 		return 0;
 	}
@@ -583,7 +643,7 @@ int lttng_abi_tracepoint_list(void *owner)
 	int list_objd, ret;
 	struct lttng_ust_tracepoint_list *list;
 
-	list_objd = objd_alloc(NULL, &lttng_tracepoint_list_ops, owner);
+	list_objd = objd_alloc(NULL, &lttng_tracepoint_list_ops, owner, "tp_list");
 	if (list_objd < 0) {
 		ret = list_objd;
 		goto objd_error;
@@ -596,7 +656,7 @@ int lttng_abi_tracepoint_list(void *owner)
 	objd_set_private(list_objd, list);
 
 	/* populate list by walking on all registered probes. */
-	ret = ltt_probes_get_event_list(list);
+	ret = lttng_probes_get_event_list(list);
 	if (ret) {
 		goto list_error;
 	}
@@ -608,7 +668,7 @@ alloc_error:
 	{
 		int err;
 
-		err = lttng_ust_objd_unref(list_objd);
+		err = lttng_ust_objd_unref(list_objd, 1);
 		assert(!err);
 	}
 objd_error:
@@ -621,7 +681,7 @@ int lttng_release_tracepoint_list(int objd)
 	struct lttng_ust_tracepoint_list *list = objd_private(objd);
 
 	if (list) {
-		ltt_probes_prune_event_list(list);
+		lttng_probes_prune_event_list(list);
 		free(list);
 		return 0;
 	} else {
@@ -645,12 +705,9 @@ long lttng_tracepoint_field_list_cmd(int objd, unsigned int cmd,
 	switch (cmd) {
 	case LTTNG_UST_TRACEPOINT_FIELD_LIST_GET:
 	{
-	retry:
 		iter = lttng_ust_field_list_get_iter_next(list);
 		if (!iter)
 			return -LTTNG_UST_ERR_NOENT;
-		if (!strcmp(iter->event_name, "lttng_ust:metadata"))
-			goto retry;
 		memcpy(tp, iter, sizeof(*tp));
 		return 0;
 	}
@@ -665,7 +722,8 @@ int lttng_abi_tracepoint_field_list(void *owner)
 	int list_objd, ret;
 	struct lttng_ust_field_list *list;
 
-	list_objd = objd_alloc(NULL, &lttng_tracepoint_field_list_ops, owner);
+	list_objd = objd_alloc(NULL, &lttng_tracepoint_field_list_ops, owner,
+			"tp_field_list");
 	if (list_objd < 0) {
 		ret = list_objd;
 		goto objd_error;
@@ -678,7 +736,7 @@ int lttng_abi_tracepoint_field_list(void *owner)
 	objd_set_private(list_objd, list);
 
 	/* populate list by walking on all registered probes. */
-	ret = ltt_probes_get_field_list(list);
+	ret = lttng_probes_get_field_list(list);
 	if (ret) {
 		goto list_error;
 	}
@@ -690,7 +748,7 @@ alloc_error:
 	{
 		int err;
 
-		err = lttng_ust_objd_unref(list_objd);
+		err = lttng_ust_objd_unref(list_objd, 1);
 		assert(!err);
 	}
 objd_error:
@@ -703,7 +761,7 @@ int lttng_release_tracepoint_field_list(int objd)
 	struct lttng_ust_field_list *list = objd_private(objd);
 
 	if (list) {
-		ltt_probes_prune_field_list(list);
+		lttng_probes_prune_field_list(list);
 		free(list);
 		return 0;
 	} else {
@@ -716,61 +774,37 @@ static const struct lttng_ust_objd_ops lttng_tracepoint_field_list_ops = {
 	.cmd = lttng_tracepoint_field_list_cmd,
 };
 
-struct stream_priv_data {
-	struct lttng_ust_lib_ring_buffer *buf;
-	struct ltt_channel *ltt_chan;
-};
-
 static
-int lttng_abi_open_stream(int channel_objd, struct lttng_ust_stream *info,
+int lttng_abi_map_stream(int channel_objd, struct lttng_ust_stream *info,
 		union ust_args *uargs, void *owner)
 {
-	struct ltt_channel *channel = objd_private(channel_objd);
-	struct lttng_ust_lib_ring_buffer *buf;
-	struct stream_priv_data *priv;
-	int stream_objd, ret;
-
-	buf = channel->ops->buffer_read_open(channel->chan, channel->handle,
-			&uargs->stream.shm_fd,
-			&uargs->stream.wait_fd,
-			&uargs->stream.memory_map_size);
-	if (!buf)
-		return -ENOENT;
-
-	priv = zmalloc(sizeof(*priv));
-	if (!priv) {
-		ret = -ENOMEM;
-		goto alloc_error;
-	}
-	priv->buf = buf;
-	priv->ltt_chan = channel;
-	stream_objd = objd_alloc(priv, &lib_ring_buffer_objd_ops, owner);
-	if (stream_objd < 0) {
-		ret = stream_objd;
-		goto objd_error;
-	}
-	/* Hold a reference on the channel object descriptor */
-	objd_ref(channel_objd);
-	return stream_objd;
+	struct lttng_channel *channel = objd_private(channel_objd);
+	int ret;
 
-objd_error:
-	free(priv);
-alloc_error:
-	channel->ops->buffer_read_close(buf, channel->handle);
+	ret = channel_handle_add_stream(channel->handle,
+		uargs->stream.shm_fd, uargs->stream.wakeup_fd,
+		info->stream_nr, info->len);
+	if (ret)
+		goto error_add_stream;
+
+	return 0;
+
+error_add_stream:
 	return ret;
 }
 
 static
-int lttng_abi_create_event(int channel_objd,
+int lttng_abi_create_enabler(int channel_objd,
 			   struct lttng_ust_event *event_param,
-			   void *owner)
+			   void *owner,
+			   enum lttng_enabler_type type)
 {
-	struct ltt_channel *channel = objd_private(channel_objd);
-	struct ltt_event *event;
+	struct lttng_channel *channel = objd_private(channel_objd);
+	struct lttng_enabler *enabler;
 	int event_objd, ret;
 
 	event_param->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
-	event_objd = objd_alloc(NULL, &lttng_event_ops, owner);
+	event_objd = objd_alloc(NULL, &lttng_enabler_ops, owner, "enabler");
 	if (event_objd < 0) {
 		ret = event_objd;
 		goto objd_error;
@@ -779,11 +813,12 @@ int lttng_abi_create_event(int channel_objd,
 	 * We tolerate no failure path after event creation. It will stay
 	 * invariant for the rest of the session.
 	 */
-	ret = ltt_event_create(channel, event_param, &event);
-	if (ret < 0) {
+	enabler = lttng_enabler_create(type, event_param, channel);
+	if (!enabler) {
+		ret = -ENOMEM;
 		goto event_error;
 	}
-	objd_set_private(event_objd, event);
+	objd_set_private(event_objd, enabler);
 	/* The event holds a reference on the channel */
 	objd_ref(channel_objd);
 	return event_objd;
@@ -792,46 +827,7 @@ event_error:
 	{
 		int err;
 
-		err = lttng_ust_objd_unref(event_objd);
-		assert(!err);
-	}
-objd_error:
-	return ret;
-}
-
-static
-int lttng_abi_create_wildcard(int channel_objd,
-			      struct lttng_ust_event *event_param,
-			      void *owner)
-{
-	struct ltt_channel *channel = objd_private(channel_objd);
-	struct session_wildcard *wildcard;
-	int wildcard_objd, ret;
-
-	event_param->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
-	wildcard_objd = objd_alloc(NULL, &lttng_wildcard_ops, owner);
-	if (wildcard_objd < 0) {
-		ret = wildcard_objd;
-		goto objd_error;
-	}
-	/*
-	 * We tolerate no failure path after wildcard creation. It will
-	 * stay invariant for the rest of the session.
-	 */
-	ret = ltt_wildcard_create(channel, event_param, &wildcard);
-	if (ret < 0) {
-		goto wildcard_error;
-	}
-	objd_set_private(wildcard_objd, wildcard);
-	/* The wildcard holds a reference on the channel */
-	objd_ref(channel_objd);
-	return wildcard_objd;
-
-wildcard_error:
-	{
-		int err;
-
-		err = lttng_ust_objd_unref(wildcard_objd);
+		err = lttng_ust_objd_unref(event_objd, 1);
 		assert(!err);
 	}
 objd_error:
@@ -866,7 +862,15 @@ static
 long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
 	union ust_args *uargs, void *owner)
 {
-	struct ltt_channel *channel = objd_private(objd);
+	struct lttng_channel *channel = objd_private(objd);
+
+	if (cmd != LTTNG_UST_STREAM) {
+		/*
+		 * Check if channel received all streams.
+		 */
+		if (!lttng_is_channel_ready(channel))
+			return -EPERM;
+	}
 
 	switch (cmd) {
 	case LTTNG_UST_STREAM:
@@ -875,66 +879,33 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
 
 		stream = (struct lttng_ust_stream *) arg;
 		/* stream used as output */
-		return lttng_abi_open_stream(objd, stream, uargs, owner);
+		return lttng_abi_map_stream(objd, stream, uargs, owner);
 	}
 	case LTTNG_UST_EVENT:
 	{
 		struct lttng_ust_event *event_param =
 			(struct lttng_ust_event *) arg;
-		if (event_param->name[strlen(event_param->name) - 1] == '*') {
-			/* If ends with wildcard, create wildcard. */
-			return lttng_abi_create_wildcard(objd, event_param,
-							owner);
+
+		if (strutils_is_star_glob_pattern(event_param->name)) {
+			/*
+			 * If the event name is a star globbing pattern,
+			 * we create the special star globbing enabler.
+			 */
+			return lttng_abi_create_enabler(objd, event_param,
+					owner, LTTNG_ENABLER_STAR_GLOB);
 		} else {
-			return lttng_abi_create_event(objd, event_param,
-							owner);
+			return lttng_abi_create_enabler(objd, event_param,
+					owner, LTTNG_ENABLER_EVENT);
 		}
 	}
 	case LTTNG_UST_CONTEXT:
 		return lttng_abi_add_context(objd,
-				(struct lttng_ust_context *) arg,
+				(struct lttng_ust_context *) arg, uargs,
 				&channel->ctx, channel->session);
 	case LTTNG_UST_ENABLE:
-		return ltt_channel_enable(channel);
+		return lttng_channel_enable(channel);
 	case LTTNG_UST_DISABLE:
-		return ltt_channel_disable(channel);
-	case LTTNG_UST_FLUSH_BUFFER:
-		return channel->ops->flush_buffer(channel->chan, channel->handle);
-	default:
-		return -EINVAL;
-	}
-}
-
-/**
- *	lttng_metadata_cmd - lttng control through object descriptors
- *
- *	@objd: the object descriptor
- *	@cmd: the command
- *	@arg: command arg
- *	@uargs: UST arguments (internal)
- *	@owner: objd owner
- *
- *	This object descriptor implements lttng commands:
- *      LTTNG_UST_STREAM
- *              Returns an event stream file descriptor or failure.
- *
- * Channel and event file descriptors also hold a reference on the session.
- */
-static
-long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg,
-	union ust_args *uargs, void *owner)
-{
-	struct ltt_channel *channel = objd_private(objd);
-
-	switch (cmd) {
-	case LTTNG_UST_STREAM:
-	{
-		struct lttng_ust_stream *stream;
-
-		stream = (struct lttng_ust_stream *) arg;
-		/* stream used as output */
-		return lttng_abi_open_stream(objd, stream, uargs, owner);
-	}
+		return lttng_channel_disable(channel);
 	case LTTNG_UST_FLUSH_BUFFER:
 		return channel->ops->flush_buffer(channel->chan, channel->handle);
 	default:
@@ -942,183 +913,23 @@ long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg,
 	}
 }
 
-#if 0
-/**
- *	lttng_channel_poll - lttng stream addition/removal monitoring
- *
- *	@file: the file
- *	@wait: poll table
- */
-unsigned int lttng_channel_poll(struct file *file, poll_table *wait)
-{
-	struct ltt_channel *channel = file->private_data;
-	unsigned int mask = 0;
-
-	if (file->f_mode & FMODE_READ) {
-		poll_wait_set_exclusive(wait);
-		poll_wait(file, channel->ops->get_hp_wait_queue(channel->chan),
-			  wait);
-
-		if (channel->ops->is_disabled(channel->chan))
-			return POLLERR;
-		if (channel->ops->is_finalized(channel->chan))
-			return POLLHUP;
-		if (channel->ops->buffer_has_read_closed_stream(channel->chan))
-			return POLLIN | POLLRDNORM;
-		return 0;
-	}
-	return mask;
-
-}
-#endif //0
-
 static
 int lttng_channel_release(int objd)
 {
-	struct ltt_channel *channel = objd_private(objd);
+	struct lttng_channel *channel = objd_private(objd);
 
 	if (channel)
-		return lttng_ust_objd_unref(channel->session->objd);
+		return lttng_ust_objd_unref(channel->session->objd, 0);
 	return 0;
 }
 
 static const struct lttng_ust_objd_ops lttng_channel_ops = {
 	.release = lttng_channel_release,
-	//.poll = lttng_channel_poll,
 	.cmd = lttng_channel_cmd,
 };
 
-static const struct lttng_ust_objd_ops lttng_metadata_ops = {
-	.release = lttng_channel_release,
-	.cmd = lttng_metadata_cmd,
-};
-
 /**
- *	lttng_rb_cmd - lttng ring buffer control through object descriptors
- *
- *	@objd: the object descriptor
- *	@cmd: the command
- *	@arg: command arg
- *	@uargs: UST arguments (internal)
- *	@owner: objd owner
- *
- *	This object descriptor implements lttng commands:
- *		(None for now. Access is done directly though shm.)
- */
-static
-long lttng_rb_cmd(int objd, unsigned int cmd, unsigned long arg,
-	union ust_args *uargs, void *owner)
-{
-	switch (cmd) {
-	default:
-		return -EINVAL;
-	}
-}
-
-static
-int lttng_rb_release(int objd)
-{
-	struct stream_priv_data *priv = objd_private(objd);
-	struct lttng_ust_lib_ring_buffer *buf;
-	struct ltt_channel *channel;
-
-	if (priv) {
-		buf = priv->buf;
-		channel = priv->ltt_chan;
-		free(priv);
-		/*
-		 * If we are at ABI exit, we don't want to close the
-		 * buffer opened for read: it is being shared between
-		 * the parent and child (right after fork), and we don't
-		 * want the child to close it for the parent. For a real
-		 * exit, we don't care about marking it as closed, as
-		 * the consumer daemon (if there is one) will do fine
-		 * even if we don't mark it as "closed" for reading on
-		 * our side.
-		 * We only mark it as closed if it is being explicitely
-		 * released by the session daemon with an explicit
-		 * release command.
-		 */
-		if (!lttng_ust_abi_close_in_progress)
-			channel->ops->buffer_read_close(buf, channel->handle);
-
-		return lttng_ust_objd_unref(channel->objd);
-	}
-	return 0;
-}
-
-static const struct lttng_ust_objd_ops lib_ring_buffer_objd_ops = {
-	.release = lttng_rb_release,
-	.cmd = lttng_rb_cmd,
-};
-
-/**
- *	lttng_event_cmd - lttng control through object descriptors
- *
- *	@objd: the object descriptor
- *	@cmd: the command
- *	@arg: command arg
- *	@uargs: UST arguments (internal)
- *	@owner: objd owner
- *
- *	This object descriptor implements lttng commands:
- *	LTTNG_UST_CONTEXT
- *		Prepend a context field to each record of this event
- *	LTTNG_UST_ENABLE
- *		Enable recording for this event (weak enable)
- *	LTTNG_UST_DISABLE
- *		Disable recording for this event (strong disable)
- *	LTTNG_UST_FILTER
- *		Attach a filter to an event.
- */
-static
-long lttng_event_cmd(int objd, unsigned int cmd, unsigned long arg,
-	union ust_args *uargs, void *owner)
-{
-	struct ltt_event *event = objd_private(objd);
-
-	switch (cmd) {
-	case LTTNG_UST_CONTEXT:
-		return lttng_abi_add_context(objd,
-				(struct lttng_ust_context *) arg,
-				&event->ctx, event->chan->session);
-	case LTTNG_UST_ENABLE:
-		return ltt_event_enable(event);
-	case LTTNG_UST_DISABLE:
-		return ltt_event_disable(event);
-	case LTTNG_UST_FILTER:
-	{
-		int ret;
-		ret = lttng_filter_event_attach_bytecode(event,
-				(struct lttng_ust_filter_bytecode_node *) arg);
-		if (ret)
-			return ret;
-		lttng_filter_event_link_bytecode(event);
-		return 0;
-	}
-	default:
-		return -EINVAL;
-	}
-}
-
-static
-int lttng_event_release(int objd)
-{
-	struct ltt_event *event = objd_private(objd);
-
-	if (event)
-		return lttng_ust_objd_unref(event->chan->objd);
-	return 0;
-}
-
-/* TODO: filter control ioctl */
-static const struct lttng_ust_objd_ops lttng_event_ops = {
-	.release = lttng_event_release,
-	.cmd = lttng_event_cmd,
-};
-
-/**
- *	lttng_wildcard_cmd - lttng control through object descriptors
+ *	lttng_enabler_cmd - lttng control through object descriptors
  *
  *	@objd: the object descriptor
  *	@cmd: the command
@@ -1129,67 +940,70 @@ static const struct lttng_ust_objd_ops lttng_event_ops = {
  *	This object descriptor implements lttng commands:
  *	LTTNG_UST_CONTEXT
  *		Prepend a context field to each record of events of this
- *		wildcard.
+ *		enabler.
  *	LTTNG_UST_ENABLE
- *		Enable recording for these wildcard events (weak enable)
+ *		Enable recording for this enabler
  *	LTTNG_UST_DISABLE
- *		Disable recording for these wildcard events (strong disable)
+ *		Disable recording for this enabler
  *	LTTNG_UST_FILTER
- *		Attach a filter to a wildcard.
+ *		Attach a filter to an enabler.
+ *	LTTNG_UST_EXCLUSION
+ *		Attach exclusions to an enabler.
  */
 static
-long lttng_wildcard_cmd(int objd, unsigned int cmd, unsigned long arg,
+long lttng_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
 	union ust_args *uargs, void *owner)
 {
-	struct session_wildcard *wildcard = objd_private(objd);
+	struct lttng_enabler *enabler = objd_private(objd);
 
 	switch (cmd) {
 	case LTTNG_UST_CONTEXT:
-		return -ENOSYS;	/* not implemented yet */
-#if 0
-		return lttng_abi_add_context(objd,
-				(struct lttng_ust_context *) arg,
-				&wildcard->ctx, wildcard->chan->session);
-#endif
+		return lttng_enabler_attach_context(enabler,
+				(struct lttng_ust_context *) arg);
 	case LTTNG_UST_ENABLE:
-		return ltt_wildcard_enable(wildcard);
+		return lttng_enabler_enable(enabler);
 	case LTTNG_UST_DISABLE:
-		return ltt_wildcard_disable(wildcard);
+		return lttng_enabler_disable(enabler);
 	case LTTNG_UST_FILTER:
 	{
 		int ret;
 
-		ret = lttng_filter_wildcard_attach_bytecode(wildcard,
+		ret = lttng_enabler_attach_bytecode(enabler,
 				(struct lttng_ust_filter_bytecode_node *) arg);
 		if (ret)
 			return ret;
-		lttng_filter_wildcard_link_bytecode(wildcard);
 		return 0;
 	}
+	case LTTNG_UST_EXCLUSION:
+	{
+		return lttng_enabler_attach_exclusion(enabler,
+				(struct lttng_ust_excluder_node *) arg);
+	}
 	default:
 		return -EINVAL;
 	}
 }
 
 static
-int lttng_wildcard_release(int objd)
+int lttng_enabler_release(int objd)
 {
-	struct session_wildcard *wildcard = objd_private(objd);
+	struct lttng_enabler *enabler = objd_private(objd);
 
-	if (wildcard)
-		return lttng_ust_objd_unref(wildcard->chan->objd);
+	if (enabler)
+		return lttng_ust_objd_unref(enabler->chan->objd, 0);
 	return 0;
 }
 
-/* TODO: filter control ioctl */
-static const struct lttng_ust_objd_ops lttng_wildcard_ops = {
-	.release = lttng_wildcard_release,
-	.cmd = lttng_wildcard_cmd,
+static const struct lttng_ust_objd_ops lttng_enabler_ops = {
+	.release = lttng_enabler_release,
+	.cmd = lttng_enabler_cmd,
 };
 
 void lttng_ust_abi_exit(void)
 {
 	lttng_ust_abi_close_in_progress = 1;
+	ust_lock_nocheck();
 	objd_table_destroy();
+	ust_unlock();
 	lttng_ust_abi_close_in_progress = 0;
 }