X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=f8936e3d0f5b7e4f1f408fa3cd35575b30d57da2;hb=115db533af4d56a1b5c8b3a5ff6a15dc58579cd8;hp=5941365ab0eb7284398c8b7774edb4706fcf7b27;hpb=621c07fc1b90c12ec997d539770da1937d11c450;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 5941365a..f8936e3d 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -1,23 +1,9 @@
 /*
- * lttng-events.c
- *
- * Holds LTTng per-session event registry.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Holds LTTng per-session event registry.
  */
 
 #define _LGPL_SOURCE
@@ -34,9 +20,9 @@
 #include <time.h>
 #include <stdbool.h>
 #include <unistd.h>
+#include <dlfcn.h>
 #include <lttng/ust-endian.h>
 
-#include <urcu-bp.h>
 #include <urcu/arch.h>
 #include <urcu/compiler.h>
 #include <urcu/hlist.h>
@@ -47,12 +33,12 @@
 #include <lttng/ust-events.h>
 
 #include <usterr-signal-safe.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/ust-ctl.h>
 #include <ust-comm.h>
 #include <ust-fd.h>
-#include <lttng/ust-dynamic-type.h>
-#include <lttng/ust-context-provider.h>
+#include <ust-dynamic-type.h>
+#include <ust-context-provider.h>
 #include "error.h"
 #include "compat.h"
 #include "lttng-ust-uuid.h"
@@ -63,9 +49,11 @@
 #include "lttng-tracer.h"
 #include "lttng-tracer-core.h"
 #include "lttng-ust-statedump.h"
+#include "context-internal.h"
 #include "ust-events-internal.h"
 #include "wait.h"
 #include "../libringbuffer/shm.h"
+#include "../libcounter/counter.h"
 #include "jhash.h"
 #include <lttng/ust-abi.h>
 
@@ -77,12 +65,12 @@
 static CDS_LIST_HEAD(sessions);
 static CDS_LIST_HEAD(event_notifier_groups);
 
-struct cds_list_head *_lttng_get_sessions(void)
+struct cds_list_head *lttng_get_sessions(void)
 {
 	return &sessions;
 }
 
-static void _lttng_event_destroy(struct lttng_event *event);
+static void _lttng_event_recorder_destroy(struct lttng_ust_event_recorder *event_recorder);
 static void _lttng_event_notifier_destroy(
 		struct lttng_event_notifier *event_notifier);
 static void _lttng_enum_destroy(struct lttng_enum *_enum);
@@ -102,10 +90,10 @@ void lttng_enabler_destroy(struct lttng_enabler *enabler);
  */
 int lttng_session_active(void)
 {
-	struct lttng_session *iter;
+	struct lttng_ust_session_private *iter;
 
 	cds_list_for_each_entry(iter, &sessions, node) {
-		if (iter->active)
+		if (iter->pub->active)
 			return 1;
 	}
 	return 0;
@@ -141,35 +129,80 @@ int lttng_loglevel_match(int loglevel,
 	}
 }
 
-void synchronize_trace(void)
-{
-	synchronize_rcu();
-}
-
 struct lttng_session *lttng_session_create(void)
 {
 	struct lttng_session *session;
+	struct lttng_ust_session_private *session_priv;
 	int i;
 
 	session = zmalloc(sizeof(struct lttng_session));
 	if (!session)
 		return NULL;
-	if (lttng_session_context_init(&session->ctx)) {
+	session->struct_size = sizeof(struct lttng_session);
+	session_priv = zmalloc(sizeof(struct lttng_ust_session_private));
+	if (!session_priv) {
+		free(session);
+		return NULL;
+	}
+	session->priv = session_priv;
+	session_priv->pub = session;
+	if (lttng_context_init_all(&session->priv->ctx)) {
+		free(session_priv);
 		free(session);
 		return NULL;
 	}
-	CDS_INIT_LIST_HEAD(&session->chan_head);
-	CDS_INIT_LIST_HEAD(&session->events_head);
-	CDS_INIT_LIST_HEAD(&session->enums_head);
-	CDS_INIT_LIST_HEAD(&session->enablers_head);
+	CDS_INIT_LIST_HEAD(&session->priv->chan_head);
+	CDS_INIT_LIST_HEAD(&session->priv->events_head);
+	CDS_INIT_LIST_HEAD(&session->priv->enums_head);
+	CDS_INIT_LIST_HEAD(&session->priv->enablers_head);
 	for (i = 0; i < LTTNG_UST_EVENT_HT_SIZE; i++)
-		CDS_INIT_HLIST_HEAD(&session->events_ht.table[i]);
+		CDS_INIT_HLIST_HEAD(&session->priv->events_ht.table[i]);
 	for (i = 0; i < LTTNG_UST_ENUM_HT_SIZE; i++)
-		CDS_INIT_HLIST_HEAD(&session->enums_ht.table[i]);
-	cds_list_add(&session->node, &sessions);
+		CDS_INIT_HLIST_HEAD(&session->priv->enums_ht.table[i]);
+	cds_list_add(&session->priv->node, &sessions);
 	return session;
 }
 
+struct lttng_counter *lttng_ust_counter_create(
+		const char *counter_transport_name,
+		size_t number_dimensions, const struct lttng_counter_dimension *dimensions)
+{
+	struct lttng_counter_transport *counter_transport = NULL;
+	struct lttng_counter *counter = NULL;
+
+	counter_transport = lttng_counter_transport_find(counter_transport_name);
+	if (!counter_transport)
+		goto notransport;
+	counter = zmalloc(sizeof(struct lttng_counter));
+	if (!counter)
+		goto nomem;
+
+	counter->ops = &counter_transport->ops;
+	counter->transport = counter_transport;
+
+	counter->counter = counter->ops->counter_create(
+			number_dimensions, dimensions, 0,
+			-1, 0, NULL, false);
+	if (!counter->counter) {
+		goto create_error;
+	}
+
+	return counter;
+
+create_error:
+	free(counter);
+nomem:
+notransport:
+	return NULL;
+}
+
+static
+void lttng_ust_counter_destroy(struct lttng_counter *counter)
+{
+	counter->ops->counter_destroy(counter->counter);
+	free(counter);
+}
+
 struct lttng_event_notifier_group *lttng_event_notifier_group_create(void)
 {
 	struct lttng_event_notifier_group *event_notifier_group;
@@ -179,6 +212,12 @@ struct lttng_event_notifier_group *lttng_event_notifier_group_create(void)
 	if (!event_notifier_group)
 		return NULL;
 
+	/* Add all contexts. */
+	if (lttng_context_init_all(&event_notifier_group->ctx)) {
+		free(event_notifier_group);
+		return NULL;
+	}
+
 	CDS_INIT_LIST_HEAD(&event_notifier_group->enablers_head);
 	CDS_INIT_LIST_HEAD(&event_notifier_group->event_notifiers_head);
 	for (i = 0; i < LTTNG_UST_EVENT_NOTIFIER_HT_SIZE; i++)
@@ -210,19 +249,19 @@ void _lttng_channel_unmap(struct lttng_channel *lttng_chan)
 }
 
 static
-void register_event(struct lttng_event *event)
+void register_event_recorder(struct lttng_ust_event_recorder *event_recorder)
 {
 	int ret;
 	const struct lttng_event_desc *desc;
 
-	assert(event->registered == 0);
-	desc = event->desc;
+	assert(event_recorder->parent->priv->registered == 0);
+	desc = event_recorder->parent->priv->desc;
 	ret = __tracepoint_probe_register_queue_release(desc->name,
 			desc->probe_callback,
-			event, desc->signature);
+			event_recorder, desc->signature);
 	WARN_ON_ONCE(ret);
 	if (!ret)
-		event->registered = 1;
+		event_recorder->parent->priv->registered = 1;
 }
 
 static
@@ -231,29 +270,29 @@ void register_event_notifier(struct lttng_event_notifier *event_notifier)
 	int ret;
 	const struct lttng_event_desc *desc;
 
-	assert(event_notifier->registered == 0);
-	desc = event_notifier->desc;
+	assert(event_notifier->parent->priv->registered == 0);
+	desc = event_notifier->parent->priv->desc;
 	ret = __tracepoint_probe_register_queue_release(desc->name,
 		desc->u.ext.event_notifier_callback, event_notifier, desc->signature);
 	WARN_ON_ONCE(ret);
 	if (!ret)
-		event_notifier->registered = 1;
+		event_notifier->parent->priv->registered = 1;
 }
 
 static
-void unregister_event(struct lttng_event *event)
+void unregister_event_recorder(struct lttng_ust_event_recorder *event_recorder)
 {
 	int ret;
 	const struct lttng_event_desc *desc;
 
-	assert(event->registered == 1);
-	desc = event->desc;
+	assert(event_recorder->parent->priv->registered == 1);
+	desc = event_recorder->parent->priv->desc;
 	ret = __tracepoint_probe_unregister_queue_release(desc->name,
 			desc->probe_callback,
-			event);
+			event_recorder);
 	WARN_ON_ONCE(ret);
 	if (!ret)
-		event->registered = 0;
+		event_recorder->parent->priv->registered = 0;
 }
 
 static
@@ -262,23 +301,23 @@ void unregister_event_notifier(struct lttng_event_notifier *event_notifier)
 	int ret;
 	const struct lttng_event_desc *desc;
 
-	assert(event_notifier->registered == 1);
-	desc = event_notifier->desc;
+	assert(event_notifier->parent->priv->registered == 1);
+	desc = event_notifier->parent->priv->desc;
 	ret = __tracepoint_probe_unregister_queue_release(desc->name,
 		desc->u.ext.event_notifier_callback, event_notifier);
 	WARN_ON_ONCE(ret);
 	if (!ret)
-		event_notifier->registered = 0;
+		event_notifier->parent->priv->registered = 0;
 }
 
 /*
  * Only used internally at session destruction.
  */
 static
-void _lttng_event_unregister(struct lttng_event *event)
+void _lttng_event_recorder_unregister(struct lttng_ust_event_recorder *event_recorder)
 {
-	if (event->registered)
-		unregister_event(event);
+	if (event_recorder->parent->priv->registered)
+		unregister_event_recorder(event_recorder);
 }
 
 /*
@@ -287,36 +326,37 @@ void _lttng_event_unregister(struct lttng_event *event)
 static
 void _lttng_event_notifier_unregister(struct lttng_event_notifier *event_notifier)
 {
-	if (event_notifier->registered)
+	if (event_notifier->parent->priv->registered)
 		unregister_event_notifier(event_notifier);
 }
 
 void lttng_session_destroy(struct lttng_session *session)
 {
 	struct lttng_channel *chan, *tmpchan;
-	struct lttng_event *event, *tmpevent;
+	struct lttng_ust_event_recorder_private *event_recorder_priv, *tmpevent_recorder_priv;
 	struct lttng_enum *_enum, *tmp_enum;
 	struct lttng_event_enabler *event_enabler, *event_tmpenabler;
 
 	CMM_ACCESS_ONCE(session->active) = 0;
-	cds_list_for_each_entry(event, &session->events_head, node) {
-		_lttng_event_unregister(event);
+	cds_list_for_each_entry(event_recorder_priv, &session->priv->events_head, node) {
+		_lttng_event_recorder_unregister(event_recorder_priv->pub);
 	}
-	synchronize_trace();	/* Wait for in-flight events to complete */
+	lttng_ust_urcu_synchronize_rcu();	/* Wait for in-flight events to complete */
 	__tracepoint_probe_prune_release_queue();
 	cds_list_for_each_entry_safe(event_enabler, event_tmpenabler,
-			&session->enablers_head, node)
+			&session->priv->enablers_head, node)
 		lttng_event_enabler_destroy(event_enabler);
-	cds_list_for_each_entry_safe(event, tmpevent,
-			&session->events_head, node)
-		_lttng_event_destroy(event);
+	cds_list_for_each_entry_safe(event_recorder_priv, tmpevent_recorder_priv,
+			&session->priv->events_head, node)
+		_lttng_event_recorder_destroy(event_recorder_priv->pub);
 	cds_list_for_each_entry_safe(_enum, tmp_enum,
-			&session->enums_head, node)
+			&session->priv->enums_head, node)
 		_lttng_enum_destroy(_enum);
-	cds_list_for_each_entry_safe(chan, tmpchan, &session->chan_head, node)
+	cds_list_for_each_entry_safe(chan, tmpchan, &session->priv->chan_head, node)
 		_lttng_channel_unmap(chan);
-	cds_list_del(&session->node);
-	lttng_destroy_context(session->ctx);
+	cds_list_del(&session->priv->node);
+	lttng_destroy_context(session->priv->ctx);
+	free(session->priv);
 	free(session);
 }
 
@@ -325,27 +365,30 @@ void lttng_event_notifier_group_destroy(
 {
 	int close_ret;
 	struct lttng_event_notifier_enabler *notifier_enabler, *tmpnotifier_enabler;
-	struct lttng_event_notifier *notifier, *tmpnotifier;
+	struct lttng_ust_event_notifier_private *notifier_priv, *tmpnotifier_priv;
 
 	if (!event_notifier_group) {
 		return;
 	}
 
-	cds_list_for_each_entry(notifier,
+	cds_list_for_each_entry(notifier_priv,
 			&event_notifier_group->event_notifiers_head, node)
-		_lttng_event_notifier_unregister(notifier);
+		_lttng_event_notifier_unregister(notifier_priv->pub);
 
-	synchronize_trace();
+	lttng_ust_urcu_synchronize_rcu();
 
 	cds_list_for_each_entry_safe(notifier_enabler, tmpnotifier_enabler,
 			&event_notifier_group->enablers_head, node)
 		lttng_event_notifier_enabler_destroy(notifier_enabler);
 
-	cds_list_for_each_entry_safe(notifier, tmpnotifier,
+	cds_list_for_each_entry_safe(notifier_priv, tmpnotifier_priv,
 			&event_notifier_group->event_notifiers_head, node)
-		_lttng_event_notifier_destroy(notifier);
+		_lttng_event_notifier_destroy(notifier_priv->pub);
+
+	if (event_notifier_group->error_counter)
+		lttng_ust_counter_destroy(event_notifier_group->error_counter);
 
-	/* Close the notification fd to the listener of event notifiers. */
+	/* Close the notification fd to the listener of event_notifiers. */
 
 	lttng_ust_lock_fd_tracker();
 	close_ret = close(event_notifier_group->notification_fd);
@@ -413,7 +456,7 @@ int lttng_enum_create(const struct lttng_enum_desc *desc,
 
 	/* Check if this enum is already registered for this session. */
 	hash = jhash(enum_name, name_len, 0);
-	head = &session->enums_ht.table[hash & (LTTNG_UST_ENUM_HT_SIZE - 1)];
+	head = &session->priv->enums_ht.table[hash & (LTTNG_UST_ENUM_HT_SIZE - 1)];
 
 	_enum = lttng_ust_enum_get_from_desc(session, desc);
 	if (_enum) {
@@ -421,7 +464,7 @@ int lttng_enum_create(const struct lttng_enum_desc *desc,
 		goto exist;
 	}
 
-	notify_socket = lttng_get_notify_socket(session->owner);
+	notify_socket = lttng_get_notify_socket(session->priv->owner);
 	if (notify_socket < 0) {
 		ret = notify_socket;
 		goto socket_error;
@@ -436,7 +479,7 @@ int lttng_enum_create(const struct lttng_enum_desc *desc,
 	_enum->desc = desc;
 
 	ret = ustcomm_register_enum(notify_socket,
-		session->objd,
+		session->priv->objd,
 		enum_name,
 		desc->nr_entries,
 		desc->entries,
@@ -445,7 +488,7 @@ int lttng_enum_create(const struct lttng_enum_desc *desc,
 		DBG("Error (%d) registering enumeration to sessiond", ret);
 		goto sessiond_register_error;
 	}
-	cds_list_add(&_enum->node, &session->enums_head);
+	cds_list_add(&_enum->node, &session->priv->enums_head);
 	cds_hlist_add_head(&_enum->hlist, head);
 	return 0;
 
@@ -462,19 +505,6 @@ int lttng_create_enum_check(const struct lttng_type *type,
 		struct lttng_session *session)
 {
 	switch (type->atype) {
-	case atype_enum:
-	{
-		const struct lttng_enum_desc *enum_desc;
-		int ret;
-
-		enum_desc = type->u.legacy.basic.enumeration.desc;
-		ret = lttng_enum_create(enum_desc, session);
-		if (ret && ret != -EEXIST) {
-			DBG("Unable to create enum error: (%d)", ret);
-			return ret;
-		}
-		break;
-	}
 	case atype_enum_nestable:
 	{
 		const struct lttng_enum_desc *enum_desc;
@@ -554,8 +584,8 @@ int lttng_create_all_ctx_enums(size_t nr_fields,
  */
 int lttng_session_statedump(struct lttng_session *session)
 {
-	session->statedump_pending = 1;
-	lttng_ust_sockinfo_session_enabled(session->owner);
+	session->priv->statedump_pending = 1;
+	lttng_ust_sockinfo_session_enabled(session->priv->owner);
 	return 0;
 }
 
@@ -570,12 +600,12 @@ int lttng_session_enable(struct lttng_session *session)
 		goto end;
 	}
 
-	notify_socket = lttng_get_notify_socket(session->owner);
+	notify_socket = lttng_get_notify_socket(session->priv->owner);
 	if (notify_socket < 0)
 		return notify_socket;
 
 	/* Set transient enabler state to "enabled" */
-	session->tstate = 1;
+	session->priv->tstate = 1;
 
 	/* We need to sync enablers with session before activation. */
 	lttng_session_sync_event_enablers(session);
@@ -584,7 +614,7 @@ int lttng_session_enable(struct lttng_session *session)
 	 * Snapshot the number of events per channel to know the type of header
 	 * we need to use.
 	 */
-	cds_list_for_each_entry(chan, &session->chan_head, node) {
+	cds_list_for_each_entry(chan, &session->priv->chan_head, node) {
 		const struct lttng_ctx *ctx;
 		const struct lttng_ctx_field *fields = NULL;
 		size_t nr_fields = 0;
@@ -606,7 +636,7 @@ int lttng_session_enable(struct lttng_session *session)
 		}
 		ret = ustcomm_register_channel(notify_socket,
 			session,
-			session->objd,
+			session->priv->objd,
 			chan->objd,
 			nr_fields,
 			fields,
@@ -625,7 +655,7 @@ int lttng_session_enable(struct lttng_session *session)
 
 	/* Set atomically the state to "active" */
 	CMM_ACCESS_ONCE(session->active) = 1;
-	CMM_ACCESS_ONCE(session->been_active) = 1;
+	CMM_ACCESS_ONCE(session->priv->been_active) = 1;
 
 	ret = lttng_session_statedump(session);
 	if (ret)
@@ -646,7 +676,7 @@ int lttng_session_disable(struct lttng_session *session)
 	CMM_ACCESS_ONCE(session->active) = 0;
 
 	/* Set transient enabler state to "disabled" */
-	session->tstate = 0;
+	session->priv->tstate = 0;
 	lttng_session_sync_event_enablers(session);
 end:
 	return ret;
@@ -707,20 +737,21 @@ struct cds_hlist_head *borrow_hash_table_bucket(
  * Supports event creation while tracing session is active.
  */
 static
-int lttng_event_create(const struct lttng_event_desc *desc,
+int lttng_event_recorder_create(const struct lttng_event_desc *desc,
 		struct lttng_channel *chan)
 {
-	struct lttng_event *event;
+	struct lttng_ust_event_recorder *event_recorder;
+	struct lttng_ust_event_recorder_private *event_recorder_priv;
 	struct lttng_session *session = chan->session;
 	struct cds_hlist_head *head;
 	int ret = 0;
 	int notify_socket, loglevel;
 	const char *uri;
 
-	head = borrow_hash_table_bucket(chan->session->events_ht.table,
+	head = borrow_hash_table_bucket(chan->session->priv->events_ht.table,
 		LTTNG_UST_EVENT_HT_SIZE, desc);
 
-	notify_socket = lttng_get_notify_socket(session->owner);
+	notify_socket = lttng_get_notify_socket(session->priv->owner);
 	if (notify_socket < 0) {
 		ret = notify_socket;
 		goto socket_error;
@@ -736,22 +767,41 @@ int lttng_event_create(const struct lttng_event_desc *desc,
 	/*
 	 * Check if loglevel match. Refuse to connect event if not.
 	 */
-	event = zmalloc(sizeof(struct lttng_event));
-	if (!event) {
+	event_recorder = zmalloc(sizeof(struct lttng_ust_event_recorder));
+	if (!event_recorder) {
 		ret = -ENOMEM;
 		goto cache_error;
 	}
-	event->chan = chan;
+	event_recorder->struct_size = sizeof(struct lttng_ust_event_recorder);
+
+	event_recorder->parent = zmalloc(sizeof(struct lttng_ust_event_common));
+	if (!event_recorder->parent) {
+		ret = -ENOMEM;
+		goto parent_error;
+	}
+	event_recorder->parent->struct_size = sizeof(struct lttng_ust_event_common);
+
+	event_recorder_priv = zmalloc(sizeof(struct lttng_ust_event_recorder_private));
+	if (!event_recorder_priv) {
+		ret = -ENOMEM;
+		goto priv_error;
+	}
+	event_recorder->priv = event_recorder_priv;
+	event_recorder_priv->pub = event_recorder;
+	event_recorder->parent->priv = &event_recorder_priv->parent;
+	event_recorder_priv->parent.pub = event_recorder->parent;
+
+	event_recorder->chan = chan;
 
 	/* Event will be enabled by enabler sync. */
-	event->enabled = 0;
-	event->registered = 0;
-	CDS_INIT_LIST_HEAD(&event->filter_bytecode_runtime_head);
-	CDS_INIT_LIST_HEAD(&event->enablers_ref_head);
-	event->desc = desc;
+	event_recorder->parent->enabled = 0;
+	event_recorder->parent->priv->registered = 0;
+	CDS_INIT_LIST_HEAD(&event_recorder->parent->filter_bytecode_runtime_head);
+	CDS_INIT_LIST_HEAD(&event_recorder->parent->priv->enablers_ref_head);
+	event_recorder->parent->priv->desc = desc;
 
 	if (desc->loglevel)
-		loglevel = *(*event->desc->loglevel);
+		loglevel = *(*event_recorder->parent->priv->desc->loglevel);
 	else
 		loglevel = TRACE_DEFAULT;
 	if (desc->u.ext.model_emf_uri)
@@ -762,7 +812,7 @@ int lttng_event_create(const struct lttng_event_desc *desc,
 	/* Fetch event ID from sessiond */
 	ret = ustcomm_register_event(notify_socket,
 		session,
-		session->objd,
+		session->priv->objd,
 		chan->objd,
 		desc->name,
 		loglevel,
@@ -770,18 +820,22 @@ int lttng_event_create(const struct lttng_event_desc *desc,
 		desc->nr_fields,
 		desc->fields,
 		uri,
-		&event->id);
+		&event_recorder->id);
 	if (ret < 0) {
 		DBG("Error (%d) registering event to sessiond", ret);
 		goto sessiond_register_error;
 	}
 
-	cds_list_add(&event->node, &chan->session->events_head);
-	cds_hlist_add_head(&event->hlist, head);
+	cds_list_add(&event_recorder->priv->node, &chan->session->priv->events_head);
+	cds_hlist_add_head(&event_recorder->priv->hlist, head);
 	return 0;
 
 sessiond_register_error:
-	free(event);
+	free(event_recorder_priv);
+priv_error:
+	free(event_recorder->parent);
+parent_error:
+	free(event_recorder);
 cache_error:
 create_enum_error:
 socket_error:
@@ -790,10 +844,11 @@ socket_error:
 
 static
 int lttng_event_notifier_create(const struct lttng_event_desc *desc,
-		uint64_t token,
+		uint64_t token, uint64_t error_counter_index,
 		struct lttng_event_notifier_group *event_notifier_group)
 {
 	struct lttng_event_notifier *event_notifier;
+	struct lttng_ust_event_notifier_private *event_notifier_priv;
 	struct cds_hlist_head *head;
 	int ret = 0;
 
@@ -810,24 +865,49 @@ int lttng_event_notifier_create(const struct lttng_event_desc *desc,
 		ret = -ENOMEM;
 		goto error;
 	}
+	event_notifier->struct_size = sizeof(struct lttng_event_notifier);
+
+	event_notifier->parent = zmalloc(sizeof(struct lttng_ust_event_common));
+	if (!event_notifier->parent) {
+		ret = -ENOMEM;
+		goto parent_error;
+	}
+	event_notifier->parent->struct_size = sizeof(struct lttng_ust_event_common);
+
+	event_notifier_priv = zmalloc(sizeof(struct lttng_ust_event_notifier_private));
+	if (!event_notifier_priv) {
+		ret = -ENOMEM;
+		goto priv_error;
+	}
+	event_notifier->priv = event_notifier_priv;
+	event_notifier_priv->pub = event_notifier;
+	event_notifier->parent->priv = &event_notifier_priv->parent;
+	event_notifier_priv->parent.pub = event_notifier->parent;
 
-	event_notifier->group = event_notifier_group;
-	event_notifier->user_token = token;
+	event_notifier_priv->group = event_notifier_group;
+	event_notifier_priv->parent.user_token = token;
+	event_notifier_priv->error_counter_index = error_counter_index;
 
 	/* Event notifier will be enabled by enabler sync. */
-	event_notifier->enabled = 0;
-	event_notifier->registered = 0;
+	event_notifier->parent->enabled = 0;
+	event_notifier_priv->parent.registered = 0;
 
-	CDS_INIT_LIST_HEAD(&event_notifier->filter_bytecode_runtime_head);
-	CDS_INIT_LIST_HEAD(&event_notifier->enablers_ref_head);
-	event_notifier->desc = desc;
+	CDS_INIT_LIST_HEAD(&event_notifier->parent->filter_bytecode_runtime_head);
+	CDS_INIT_LIST_HEAD(&event_notifier->capture_bytecode_runtime_head);
+	CDS_INIT_LIST_HEAD(&event_notifier_priv->parent.enablers_ref_head);
+	event_notifier_priv->parent.desc = desc;
+	event_notifier->notification_send = lttng_event_notifier_notification_send;
 
-	cds_list_add(&event_notifier->node,
+	cds_list_add(&event_notifier_priv->node,
 			&event_notifier_group->event_notifiers_head);
-	cds_hlist_add_head(&event_notifier->hlist, head);
+	cds_hlist_add_head(&event_notifier_priv->hlist, head);
 
 	return 0;
 
+priv_error:
+	free(event_notifier->parent);
+parent_error:
+	free(event_notifier);
 error:
 	return ret;
 }
@@ -838,16 +918,18 @@ void _lttng_event_notifier_destroy(struct lttng_event_notifier *event_notifier)
 	struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref;
 
 	/* Remove from event_notifier list. */
-	cds_list_del(&event_notifier->node);
+	cds_list_del(&event_notifier->priv->node);
 	/* Remove from event_notifier hash table. */
-	cds_hlist_del(&event_notifier->hlist);
+	cds_hlist_del(&event_notifier->priv->hlist);
 
 	lttng_free_event_notifier_filter_runtime(event_notifier);
 
 	/* Free event_notifier enabler refs */
 	cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref,
-			&event_notifier->enablers_ref_head, node)
+			&event_notifier->priv->parent.enablers_ref_head, node)
 		free(enabler_ref);
+	free(event_notifier->priv);
+	free(event_notifier->parent);
 	free(event_notifier);
 }
 
@@ -938,11 +1020,11 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
 
 static
 int lttng_event_enabler_match_event(struct lttng_event_enabler *event_enabler,
-		struct lttng_event *event)
+		struct lttng_ust_event_recorder *event_recorder)
 {
-	if (lttng_desc_match_enabler(event->desc,
+	if (lttng_desc_match_enabler(event_recorder->parent->priv->desc,
 			lttng_event_enabler_as_enabler(event_enabler))
-			&& event->chan == event_enabler->chan)
+			&& event_recorder->chan == event_enabler->chan)
 		return 1;
 	else
 		return 0;
@@ -953,11 +1035,11 @@ int lttng_event_notifier_enabler_match_event_notifier(
 		struct lttng_event_notifier_enabler *event_notifier_enabler,
 		struct lttng_event_notifier *event_notifier)
 {
-	int desc_matches = lttng_desc_match_enabler(event_notifier->desc,
+	int desc_matches = lttng_desc_match_enabler(event_notifier->priv->parent.desc,
 		lttng_event_notifier_enabler_as_enabler(event_notifier_enabler));
 
-	if (desc_matches && event_notifier->group == event_notifier_enabler->group &&
-			event_notifier->user_token == event_notifier_enabler->user_token)
+	if (desc_matches && event_notifier->priv->group == event_notifier_enabler->group &&
+			event_notifier->priv->parent.user_token == event_notifier_enabler->user_token)
 		return 1;
 	else
 		return 0;
@@ -987,7 +1069,7 @@ void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler)
 	struct lttng_session *session = event_enabler->chan->session;
 	struct lttng_probe_desc *probe_desc;
 	const struct lttng_event_desc *desc;
-	struct lttng_event *event;
+	struct lttng_ust_event_recorder_private *event_recorder_priv;
 	int i;
 	struct cds_list_head *probe_list;
 
@@ -1010,12 +1092,12 @@ void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler)
 				continue;
 
 			head = borrow_hash_table_bucket(
-				session->events_ht.table,
+				session->priv->events_ht.table,
 				LTTNG_UST_EVENT_HT_SIZE, desc);
 
-			cds_hlist_for_each_entry(event, node, head, hlist) {
-				if (event->desc == desc
-						&& event->chan == event_enabler->chan) {
+			cds_hlist_for_each_entry(event_recorder_priv, node, head, hlist) {
+				if (event_recorder_priv->parent.desc == desc
+						&& event_recorder_priv->pub->chan == event_enabler->chan) {
 					found = true;
 					break;
 				}
@@ -1027,7 +1109,7 @@ void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler)
 			 * We need to create an event for this
 			 * event probe.
 			 */
-			ret = lttng_event_create(probe_desc->event_desc[i],
+			ret = lttng_event_recorder_create(probe_desc->event_desc[i],
 					event_enabler->chan);
 			if (ret) {
 				DBG("Unable to create event %s, error %d\n",
@@ -1040,7 +1122,7 @@ void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler)
 static
 void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
 		void (*event_func)(struct lttng_session *session,
-			struct lttng_event *event),
+			struct lttng_ust_event_recorder *event_recorder),
 		void (*event_notifier_func)(struct lttng_event_notifier *event_notifier))
 {
 	struct cds_hlist_node *node, *tmp_node;
@@ -1048,7 +1130,7 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
 	unsigned int i;
 
 	/* Get handle on list of sessions. */
-	sessionsp = _lttng_get_sessions();
+	sessionsp = lttng_get_sessions();
 
 	/*
 	 * Iterate over all events in the probe provider descriptions and
@@ -1057,10 +1139,10 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
 	for (i = 0; i < provider_desc->nr_events; i++) {
 		const struct lttng_event_desc *event_desc;
 		struct lttng_event_notifier_group *event_notifier_group;
-		struct lttng_event_notifier *event_notifier;
-		struct lttng_session *session;
+		struct lttng_ust_event_notifier_private *event_notifier_priv;
+		struct lttng_ust_session_private *session_priv;
 		struct cds_hlist_head *head;
-		struct lttng_event *event;
+		struct lttng_ust_event_recorder_private *event_recorder_priv;
 
 		event_desc = provider_desc->event_desc[i];
 
@@ -1068,18 +1150,18 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
 		 * Iterate over all session to find the current event
 		 * description.
 		 */
-		cds_list_for_each_entry(session, sessionsp, node) {
+		cds_list_for_each_entry(session_priv, sessionsp, node) {
 			/*
 			 * Get the list of events in the hashtable bucket and
 			 * iterate to find the event matching this descriptor.
 			 */
 			head = borrow_hash_table_bucket(
-				session->events_ht.table,
+				session_priv->events_ht.table,
 				LTTNG_UST_EVENT_HT_SIZE, event_desc);
 
-			cds_hlist_for_each_entry_safe(event, node, tmp_node, head, hlist) {
-				if (event_desc == event->desc) {
-					event_func(session, event);
+			cds_hlist_for_each_entry_safe(event_recorder_priv, node, tmp_node, head, hlist) {
+				if (event_desc == event_recorder_priv->parent.desc) {
+					event_func(session_priv->pub, event_recorder_priv->pub);
 					break;
 				}
 			}
@@ -1099,9 +1181,9 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
 				event_notifier_group->event_notifiers_ht.table,
 				LTTNG_UST_EVENT_NOTIFIER_HT_SIZE, event_desc);
 
-			cds_hlist_for_each_entry_safe(event_notifier, node, tmp_node, head, hlist) {
-				if (event_desc == event_notifier->desc) {
-					event_notifier_func(event_notifier);
+			cds_hlist_for_each_entry_safe(event_notifier_priv, node, tmp_node, head, hlist) {
+				if (event_desc == event_notifier_priv->parent.desc) {
+					event_notifier_func(event_notifier_priv->pub);
 					break;
 				}
 			}
@@ -1110,29 +1192,26 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
 }
 
 static
-void _unregister_event(struct lttng_session *session,
-		struct lttng_event *event)
+void _unregister_event_recorder(struct lttng_session *session,
+		struct lttng_ust_event_recorder *event_recorder)
 {
-	_lttng_event_unregister(event);
+	_lttng_event_recorder_unregister(event_recorder);
 }
 
 static
 void _event_enum_destroy(struct lttng_session *session,
-		struct lttng_event *event)
+		struct lttng_ust_event_recorder *event_recorder)
 {
 	unsigned int i;
 
 	/* Destroy enums of the current event. */
-	for (i = 0; i < event->desc->nr_fields; i++) {
+	for (i = 0; i < event_recorder->parent->priv->desc->nr_fields; i++) {
 		const struct lttng_enum_desc *enum_desc;
 		const struct lttng_event_field *field;
 		struct lttng_enum *curr_enum;
 
-		field = &(event->desc->fields[i]);
+		field = &(event_recorder->parent->priv->desc->fields[i]);
 		switch (field->type.atype) {
-		case atype_enum:
-			enum_desc = field->type.u.legacy.basic.enumeration.desc;
-			break;
 		case atype_enum_nestable:
 			enum_desc = field->type.u.enum_nestable.desc;
 			break;
@@ -1147,7 +1226,7 @@ void _event_enum_destroy(struct lttng_session *session,
 	}
 
 	/* Destroy event. */
-	_lttng_event_destroy(event);
+	_lttng_event_recorder_destroy(event_recorder);
 }
 
 /*
@@ -1162,11 +1241,11 @@ void lttng_probe_provider_unregister_events(
 	 * Iterate over all events in the probe provider descriptions and sessions
 	 * to queue the unregistration of the events.
 	 */
-	probe_provider_event_for_each(provider_desc, _unregister_event,
+	probe_provider_event_for_each(provider_desc, _unregister_event_recorder,
 		_lttng_event_notifier_unregister);
 
 	/* Wait for grace period. */
-	synchronize_trace();
+	lttng_ust_urcu_synchronize_rcu();
 	/* Prune the unregistration queue. */
 	__tracepoint_probe_prune_release_queue();
 
@@ -1186,7 +1265,7 @@ static
 int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
 {
 	struct lttng_session *session = event_enabler->chan->session;
-	struct lttng_event *event;
+	struct lttng_ust_event_recorder_private *event_recorder_priv;
 
 	if (!lttng_event_enabler_as_enabler(event_enabler)->enabled)
 		goto end;
@@ -1195,13 +1274,13 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
 	lttng_create_event_if_missing(event_enabler);
 
 	/* For each event matching enabler in session event list. */
-	cds_list_for_each_entry(event, &session->events_head, node) {
+	cds_list_for_each_entry(event_recorder_priv, &session->priv->events_head, node) {
 		struct lttng_enabler_ref *enabler_ref;
 
-		if (!lttng_event_enabler_match_event(event_enabler, event))
+		if (!lttng_event_enabler_match_event(event_enabler, event_recorder_priv->pub))
 			continue;
 
-		enabler_ref = lttng_enabler_ref(&event->enablers_ref_head,
+		enabler_ref = lttng_enabler_ref(&event_recorder_priv->parent.enablers_ref_head,
 			lttng_event_enabler_as_enabler(event_enabler));
 		if (!enabler_ref) {
 			/*
@@ -1214,15 +1293,15 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
 			enabler_ref->ref = lttng_event_enabler_as_enabler(
 				event_enabler);
 			cds_list_add(&enabler_ref->node,
-				&event->enablers_ref_head);
+				&event_recorder_priv->parent.enablers_ref_head);
 		}
 
 		/*
 		 * Link filter bytecodes if not linked yet.
 		 */
-		lttng_enabler_link_bytecode(event->desc,
-			&session->ctx,
-			&event->filter_bytecode_runtime_head,
+		lttng_enabler_link_bytecode(event_recorder_priv->parent.desc,
+			&session->priv->ctx,
+			&event_recorder_priv->pub->parent->filter_bytecode_runtime_head,
 			&lttng_event_enabler_as_enabler(event_enabler)->filter_bytecode_head);
 
 		/* TODO: merge event context. */
@@ -1238,10 +1317,10 @@ end:
  */
 int lttng_fix_pending_events(void)
 {
-	struct lttng_session *session;
+	struct lttng_ust_session_private *session_priv;
 
-	cds_list_for_each_entry(session, &sessions, node) {
-		lttng_session_lazy_sync_event_enablers(session);
+	cds_list_for_each_entry(session_priv, &sessions, node) {
+		lttng_session_lazy_sync_event_enablers(session_priv->pub);
 	}
 	return 0;
 }
@@ -1263,7 +1342,7 @@ int lttng_fix_pending_event_notifiers(void)
  */
 void lttng_handle_pending_statedump(void *owner)
 {
-	struct lttng_session *session;
+	struct lttng_ust_session_private *session_priv;
 
 	/* Execute state dump */
 	do_lttng_ust_statedump(owner);
@@ -1272,12 +1351,12 @@ void lttng_handle_pending_statedump(void *owner)
 	if (ust_lock()) {
 		goto end;
 	}
-	cds_list_for_each_entry(session, &sessions, node) {
-		if (session->owner != owner)
+	cds_list_for_each_entry(session_priv, &sessions, node) {
+		if (session_priv->owner != owner)
 			continue;
-		if (!session->statedump_pending)
+		if (!session_priv->statedump_pending)
 			continue;
-		session->statedump_pending = 0;
+		session_priv->statedump_pending = 0;
 	}
 end:
 	ust_unlock();
@@ -1288,22 +1367,24 @@ end:
  * Only used internally at session destruction.
  */
 static
-void _lttng_event_destroy(struct lttng_event *event)
+void _lttng_event_recorder_destroy(struct lttng_ust_event_recorder *event_recorder)
 {
 	struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref;
 
 	/* Remove from event list. */
-	cds_list_del(&event->node);
+	cds_list_del(&event_recorder->priv->node);
 	/* Remove from event hash table. */
-	cds_hlist_del(&event->hlist);
+	cds_hlist_del(&event_recorder->priv->hlist);
 
-	lttng_destroy_context(event->ctx);
-	lttng_free_event_filter_runtime(event);
+	lttng_destroy_context(event_recorder->ctx);
+	lttng_free_event_recorder_filter_runtime(event_recorder);
 	/* Free event enabler refs */
 	cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref,
-			&event->enablers_ref_head, node)
+			&event_recorder->parent->priv->enablers_ref_head, node)
 		free(enabler_ref);
-	free(event);
+	free(event_recorder->priv);
+	free(event_recorder->parent);
+	free(event_recorder);
 }
 
 static
@@ -1316,10 +1397,10 @@ void _lttng_enum_destroy(struct lttng_enum *_enum)
 
 void lttng_ust_events_exit(void)
 {
-	struct lttng_session *session, *tmpsession;
+	struct lttng_ust_session_private *session_priv, *tmpsession_priv;
 
-	cds_list_for_each_entry_safe(session, tmpsession, &sessions, node)
-		lttng_session_destroy(session);
+	cds_list_for_each_entry_safe(session_priv, tmpsession_priv, &sessions, node)
+		lttng_session_destroy(session_priv->pub);
 }
 
 /*
@@ -1343,7 +1424,7 @@ struct lttng_event_enabler *lttng_event_enabler_create(
 	event_enabler->chan = chan;
 	/* ctx left NULL */
 	event_enabler->base.enabled = 0;
-	cds_list_add(&event_enabler->node, &event_enabler->chan->session->enablers_head);
+	cds_list_add(&event_enabler->node, &event_enabler->chan->session->priv->enablers_head);
 	lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
 
 	return event_enabler;
@@ -1361,9 +1442,12 @@ struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create(
 		return NULL;
 	event_notifier_enabler->base.format_type = format_type;
 	CDS_INIT_LIST_HEAD(&event_notifier_enabler->base.filter_bytecode_head);
+	CDS_INIT_LIST_HEAD(&event_notifier_enabler->capture_bytecode_head);
 	CDS_INIT_LIST_HEAD(&event_notifier_enabler->base.excluder_head);
 
 	event_notifier_enabler->user_token = event_notifier_param->event.token;
+	event_notifier_enabler->error_counter_index = event_notifier_param->error_counter_index;
+	event_notifier_enabler->num_captures = 0;
 
 	memcpy(&event_notifier_enabler->base.event_param.name,
 		event_notifier_param->event.name,
@@ -1404,14 +1488,16 @@ int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler)
 
 static
 void _lttng_enabler_attach_filter_bytecode(struct lttng_enabler *enabler,
-		struct lttng_ust_bytecode_node *bytecode)
+		struct lttng_ust_bytecode_node **bytecode)
 {
-	bytecode->enabler = enabler;
-	cds_list_add_tail(&bytecode->node, &enabler->filter_bytecode_head);
+	(*bytecode)->enabler = enabler;
+	cds_list_add_tail(&(*bytecode)->node, &enabler->filter_bytecode_head);
+	/* Take ownership of bytecode */
+	*bytecode = NULL;
 }
 
 int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event_enabler,
-		struct lttng_ust_bytecode_node *bytecode)
+		struct lttng_ust_bytecode_node **bytecode)
 {
 	_lttng_enabler_attach_filter_bytecode(
 		lttng_event_enabler_as_enabler(event_enabler), bytecode);
@@ -1422,14 +1508,16 @@ int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event
 
 static
 void _lttng_enabler_attach_exclusion(struct lttng_enabler *enabler,
-		struct lttng_ust_excluder_node *excluder)
+		struct lttng_ust_excluder_node **excluder)
 {
-	excluder->enabler = enabler;
-	cds_list_add_tail(&excluder->node, &enabler->excluder_head);
+	(*excluder)->enabler = enabler;
+	cds_list_add_tail(&(*excluder)->node, &enabler->excluder_head);
+	/* Take ownership of excluder */
+	*excluder = NULL;
 }
 
 int lttng_event_enabler_attach_exclusion(struct lttng_event_enabler *event_enabler,
-		struct lttng_ust_excluder_node *excluder)
+		struct lttng_ust_excluder_node **excluder)
 {
 	_lttng_enabler_attach_exclusion(
 		lttng_event_enabler_as_enabler(event_enabler), excluder);
@@ -1458,7 +1546,7 @@ int lttng_event_notifier_enabler_disable(
 
 int lttng_event_notifier_enabler_attach_filter_bytecode(
 		struct lttng_event_notifier_enabler *event_notifier_enabler,
-		struct lttng_ust_bytecode_node *bytecode)
+		struct lttng_ust_bytecode_node **bytecode)
 {
 	_lttng_enabler_attach_filter_bytecode(
 		lttng_event_notifier_enabler_as_enabler(event_notifier_enabler),
@@ -1468,9 +1556,25 @@ int lttng_event_notifier_enabler_attach_filter_bytecode(
 	return 0;
 }
 
+int lttng_event_notifier_enabler_attach_capture_bytecode(
+		struct lttng_event_notifier_enabler *event_notifier_enabler,
+		struct lttng_ust_bytecode_node **bytecode)
+{
+	(*bytecode)->enabler = lttng_event_notifier_enabler_as_enabler(
+			event_notifier_enabler);
+	cds_list_add_tail(&(*bytecode)->node,
+			&event_notifier_enabler->capture_bytecode_head);
+	/* Take ownership of bytecode */
+	*bytecode = NULL;
+	event_notifier_enabler->num_captures++;
+
+	lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
+	return 0;
+}
+
 int lttng_event_notifier_enabler_attach_exclusion(
 		struct lttng_event_notifier_enabler *event_notifier_enabler,
-		struct lttng_ust_excluder_node *excluder)
+		struct lttng_ust_excluder_node **excluder)
 {
 	_lttng_enabler_attach_exclusion(
 		lttng_event_notifier_enabler_as_enabler(event_notifier_enabler),
@@ -1489,7 +1593,7 @@ int lttng_attach_context(struct lttng_ust_context *context_param,
 	 * session because the metadata does not allow expressing this
 	 * information outside of the original channel scope.
 	 */
-	if (session->been_active)
+	if (session->priv->been_active)
 		return -EPERM;
 
 	switch (context_param->ctx) {
@@ -1579,23 +1683,23 @@ static
 void lttng_session_sync_event_enablers(struct lttng_session *session)
 {
 	struct lttng_event_enabler *event_enabler;
-	struct lttng_event *event;
+	struct lttng_ust_event_recorder_private *event_recorder_priv;
 
-	cds_list_for_each_entry(event_enabler, &session->enablers_head, node)
+	cds_list_for_each_entry(event_enabler, &session->priv->enablers_head, node)
 		lttng_event_enabler_ref_events(event_enabler);
 	/*
 	 * For each event, if at least one of its enablers is enabled,
 	 * and its channel and session transient states are enabled, we
 	 * enable the event, else we disable it.
 	 */
-	cds_list_for_each_entry(event, &session->events_head, node) {
+	cds_list_for_each_entry(event_recorder_priv, &session->priv->events_head, node) {
 		struct lttng_enabler_ref *enabler_ref;
 		struct lttng_bytecode_runtime *runtime;
 		int enabled = 0, has_enablers_without_bytecode = 0;
 
 		/* Enable events */
 		cds_list_for_each_entry(enabler_ref,
-				&event->enablers_ref_head, node) {
+				&event_recorder_priv->parent.enablers_ref_head, node) {
 			if (enabler_ref->ref->enabled) {
 				enabled = 1;
 				break;
@@ -1606,42 +1710,49 @@ void lttng_session_sync_event_enablers(struct lttng_session *session)
 		 * intesection of session and channel transient enable
 		 * states.
 		 */
-		enabled = enabled && session->tstate && event->chan->tstate;
+		enabled = enabled && session->priv->tstate && event_recorder_priv->pub->chan->tstate;
 
-		CMM_STORE_SHARED(event->enabled, enabled);
+		CMM_STORE_SHARED(event_recorder_priv->pub->parent->enabled, enabled);
 		/*
 		 * Sync tracepoint registration with event enabled
 		 * state.
 		 */
 		if (enabled) {
-			if (!event->registered)
-				register_event(event);
+			if (!event_recorder_priv->parent.registered)
+				register_event_recorder(event_recorder_priv->pub);
 		} else {
-			if (event->registered)
-				unregister_event(event);
+			if (event_recorder_priv->parent.registered)
+				unregister_event_recorder(event_recorder_priv->pub);
 		}
 
 		/* Check if has enablers without bytecode enabled */
 		cds_list_for_each_entry(enabler_ref,
-				&event->enablers_ref_head, node) {
+				&event_recorder_priv->parent.enablers_ref_head, node) {
 			if (enabler_ref->ref->enabled
 					&& cds_list_empty(&enabler_ref->ref->filter_bytecode_head)) {
 				has_enablers_without_bytecode = 1;
 				break;
 			}
 		}
-		event->has_enablers_without_bytecode =
+		event_recorder_priv->pub->parent->has_enablers_without_bytecode =
 			has_enablers_without_bytecode;
 
 		/* Enable filters */
 		cds_list_for_each_entry(runtime,
-				&event->filter_bytecode_runtime_head, node) {
+				&event_recorder_priv->pub->parent->filter_bytecode_runtime_head, node) {
 			lttng_bytecode_filter_sync_state(runtime);
 		}
 	}
 	__tracepoint_probe_prune_release_queue();
 }
 
+/* Support for event notifier is introduced by probe provider major version 2. */
+static
+bool lttng_ust_probe_supports_event_notifier(struct lttng_probe_desc *probe_desc)
+{
+	return probe_desc->major >= 2;
+}
+
 static
 void lttng_create_event_notifier_if_missing(
 		struct lttng_event_notifier_enabler *event_notifier_enabler)
@@ -1658,11 +1769,12 @@ void lttng_create_event_notifier_if_missing(
 			int ret;
 			bool found = false;
 			const struct lttng_event_desc *desc;
-			struct lttng_event_notifier *event_notifier;
+			struct lttng_ust_event_notifier_private *event_notifier_priv;
 			struct cds_hlist_head *head;
 			struct cds_hlist_node *node;
 
 			desc = probe_desc->event_desc[i];
+
 			if (!lttng_desc_match_enabler(desc,
 					lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)))
 				continue;
@@ -1676,14 +1788,14 @@ void lttng_create_event_notifier_if_missing(
 				event_notifier_group->event_notifiers_ht.table,
 				LTTNG_UST_EVENT_NOTIFIER_HT_SIZE, desc);
 
-			cds_hlist_for_each_entry(event_notifier, node, head, hlist) {
+			cds_hlist_for_each_entry(event_notifier_priv, node, head, hlist) {
 				/*
 				 * Check if event_notifier already exists by checking
 				 * if the event_notifier and enabler share the same
 				 * description and id.
 				 */
-				if (event_notifier->desc == desc &&
-						event_notifier->user_token == event_notifier_enabler->user_token) {
+				if (event_notifier_priv->parent.desc == desc &&
+						event_notifier_priv->parent.user_token == event_notifier_enabler->user_token) {
 					found = true;
 					break;
 				}
@@ -1692,11 +1804,24 @@ void lttng_create_event_notifier_if_missing(
 			if (found)
 				continue;
 
+			/* Check that the probe supports event notifiers, else report the error. */
+			if (!lttng_ust_probe_supports_event_notifier(probe_desc)) {
+				ERR("Probe \"%s\" contains event \"%s\" which matches an enabled event notifier, "
+					"but its version (%u.%u) is too old and does not implement event notifiers. "
+					"It needs to be recompiled against a newer version of LTTng-UST, otherwise "
+					"this event will not generate any notification.",
+					probe_desc->provider,
+					desc->name,
+					probe_desc->major,
+					probe_desc->minor);
+				continue;
+			}
 			/*
 			 * We need to create a event_notifier for this event probe.
 			 */
 			ret = lttng_event_notifier_create(desc,
 				event_notifier_enabler->user_token,
+				event_notifier_enabler->error_counter_index,
 				event_notifier_group);
 			if (ret) {
 				DBG("Unable to create event_notifier %s, error %d\n",
@@ -1714,7 +1839,7 @@ int lttng_event_notifier_enabler_ref_event_notifiers(
 		struct lttng_event_notifier_enabler *event_notifier_enabler)
 {
 	struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group;
-	struct lttng_event_notifier *event_notifier;
+	struct lttng_ust_event_notifier_private *event_notifier_priv;
 
 	 /*
 	  * Only try to create event_notifiers for enablers that are enabled, the user
@@ -1728,13 +1853,13 @@ int lttng_event_notifier_enabler_ref_event_notifiers(
 	lttng_create_event_notifier_if_missing(event_notifier_enabler);
 
 	/* Link the created event_notifier with its associated enabler. */
-	cds_list_for_each_entry(event_notifier, &event_notifier_group->event_notifiers_head, node) {
+	cds_list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, node) {
 		struct lttng_enabler_ref *enabler_ref;
 
-		if (!lttng_event_notifier_enabler_match_event_notifier(event_notifier_enabler, event_notifier))
+		if (!lttng_event_notifier_enabler_match_event_notifier(event_notifier_enabler, event_notifier_priv->pub))
 			continue;
 
-		enabler_ref = lttng_enabler_ref(&event_notifier->enablers_ref_head,
+		enabler_ref = lttng_enabler_ref(&event_notifier_priv->parent.enablers_ref_head,
 			lttng_event_notifier_enabler_as_enabler(event_notifier_enabler));
 		if (!enabler_ref) {
 			/*
@@ -1748,16 +1873,25 @@ int lttng_event_notifier_enabler_ref_event_notifiers(
 			enabler_ref->ref = lttng_event_notifier_enabler_as_enabler(
 				event_notifier_enabler);
 			cds_list_add(&enabler_ref->node,
-				&event_notifier->enablers_ref_head);
+				&event_notifier_priv->parent.enablers_ref_head);
 		}
 
 		/*
 		 * Link filter bytecodes if not linked yet.
 		 */
-		lttng_enabler_link_bytecode(event_notifier->desc,
+		lttng_enabler_link_bytecode(event_notifier_priv->parent.desc,
 			&event_notifier_group->ctx,
-			&event_notifier->filter_bytecode_runtime_head,
+			&event_notifier_priv->pub->parent->filter_bytecode_runtime_head,
 			&lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)->filter_bytecode_head);
+
+		/*
+		 * Link capture bytecodes if not linked yet.
+		 */
+		lttng_enabler_link_bytecode(event_notifier_priv->parent.desc,
+			&event_notifier_group->ctx, &event_notifier_priv->pub->capture_bytecode_runtime_head,
+			&event_notifier_enabler->capture_bytecode_head);
+
+		event_notifier_priv->num_captures = event_notifier_enabler->num_captures;
 	}
 end:
 	return 0;
@@ -1767,7 +1901,7 @@ static
 void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group *event_notifier_group)
 {
 	struct lttng_event_notifier_enabler *event_notifier_enabler;
-	struct lttng_event_notifier *event_notifier;
+	struct lttng_ust_event_notifier_private *event_notifier_priv;
 
 	cds_list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head, node)
 		lttng_event_notifier_enabler_ref_event_notifiers(event_notifier_enabler);
@@ -1776,50 +1910,56 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
 	 * For each event_notifier, if at least one of its enablers is enabled,
 	 * we enable the event_notifier, else we disable it.
 	 */
-	cds_list_for_each_entry(event_notifier, &event_notifier_group->event_notifiers_head, node) {
+	cds_list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, node) {
 		struct lttng_enabler_ref *enabler_ref;
 		struct lttng_bytecode_runtime *runtime;
 		int enabled = 0, has_enablers_without_bytecode = 0;
 
 		/* Enable event_notifiers */
 		cds_list_for_each_entry(enabler_ref,
-				&event_notifier->enablers_ref_head, node) {
+				&event_notifier_priv->parent.enablers_ref_head, node) {
 			if (enabler_ref->ref->enabled) {
 				enabled = 1;
 				break;
 			}
 		}
 
-		CMM_STORE_SHARED(event_notifier->enabled, enabled);
+		CMM_STORE_SHARED(event_notifier_priv->pub->parent->enabled, enabled);
 		/*
 		 * Sync tracepoint registration with event_notifier enabled
 		 * state.
 		 */
 		if (enabled) {
-			if (!event_notifier->registered)
-				register_event_notifier(event_notifier);
+			if (!event_notifier_priv->parent.registered)
+				register_event_notifier(event_notifier_priv->pub);
 		} else {
-			if (event_notifier->registered)
-				unregister_event_notifier(event_notifier);
+			if (event_notifier_priv->parent.registered)
+				unregister_event_notifier(event_notifier_priv->pub);
 		}
 
 		/* Check if has enablers without bytecode enabled */
 		cds_list_for_each_entry(enabler_ref,
-				&event_notifier->enablers_ref_head, node) {
+				&event_notifier_priv->parent.enablers_ref_head, node) {
 			if (enabler_ref->ref->enabled
 					&& cds_list_empty(&enabler_ref->ref->filter_bytecode_head)) {
 				has_enablers_without_bytecode = 1;
 				break;
 			}
 		}
-		event_notifier->has_enablers_without_bytecode =
+		event_notifier_priv->pub->parent->has_enablers_without_bytecode =
 			has_enablers_without_bytecode;
 
 		/* Enable filters */
 		cds_list_for_each_entry(runtime,
-				&event_notifier->filter_bytecode_runtime_head, node) {
+				&event_notifier_priv->pub->parent->filter_bytecode_runtime_head, node) {
 			lttng_bytecode_filter_sync_state(runtime);
 		}
+
+		/* Enable captures. */
+		cds_list_for_each_entry(runtime,
+				&event_notifier_priv->pub->capture_bytecode_runtime_head, node) {
+			lttng_bytecode_capture_sync_state(runtime);
+		}
 	}
 	__tracepoint_probe_prune_release_queue();
 }
@@ -1854,25 +1994,25 @@ void lttng_ust_context_set_session_provider(const char *name,
 		void (*get_value)(struct lttng_ctx_field *field,
 			struct lttng_ctx_value *value))
 {
-	struct lttng_session *session;
+	struct lttng_ust_session_private *session_priv;
 
-	cds_list_for_each_entry(session, &sessions, node) {
+	cds_list_for_each_entry(session_priv, &sessions, node) {
 		struct lttng_channel *chan;
-		struct lttng_event *event;
+		struct lttng_ust_event_recorder_private *event_recorder_priv;
 		int ret;
 
-		ret = lttng_ust_context_set_provider_rcu(&session->ctx,
+		ret = lttng_ust_context_set_provider_rcu(&session_priv->ctx,
 				name, get_size, record, get_value);
 		if (ret)
 			abort();
-		cds_list_for_each_entry(chan, &session->chan_head, node) {
+		cds_list_for_each_entry(chan, &session_priv->chan_head, node) {
 			ret = lttng_ust_context_set_provider_rcu(&chan->ctx,
 					name, get_size, record, get_value);
 			if (ret)
 				abort();
 		}
-		cds_list_for_each_entry(event, &session->events_head, node) {
-			ret = lttng_ust_context_set_provider_rcu(&event->ctx,
+		cds_list_for_each_entry(event_recorder_priv, &session_priv->events_head, node) {
+			ret = lttng_ust_context_set_provider_rcu(&event_recorder_priv->pub->ctx,
 					name, get_size, record, get_value);
 			if (ret)
 				abort();