Add probe provider unregister function
[lttng-ust.git] / liblttng-ust / lttng-events.c
index 24b5c666fd8628557ce77f8f04afa1c296e78752..57eb6f7f3a2c745e77191f7ba9b00d1234383f71 100644 (file)
@@ -21,6 +21,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdio.h>
 #include <urcu/list.h>
 #include <urcu/hlist.h>
@@ -32,6 +33,7 @@
 #include <stddef.h>
 #include <inttypes.h>
 #include <time.h>
+#include <stdbool.h>
 #include <lttng/ust-endian.h>
 #include "clock.h"
 
 
 #include <usterr-signal-safe.h>
 #include <helper.h>
+#include <lttng/ust-ctl.h>
+#include <ust-comm.h>
+#include <lttng/ust-dynamic-type.h>
+#include <lttng/ust-context-provider.h>
 #include "error.h"
 #include "compat.h"
 #include "lttng-ust-uuid.h"
 
 #include "tracepoint-internal.h"
+#include "string-utils.h"
 #include "lttng-tracer.h"
 #include "lttng-tracer-core.h"
+#include "lttng-ust-statedump.h"
 #include "wait.h"
 #include "../libringbuffer/shm.h"
 #include "jhash.h"
 
 /*
- * The sessions mutex is the centralized mutex across UST tracing
- * control and probe registration. All operations within this file are
- * called by the communication thread, under ust_lock protection.
+ * All operations within this file are called by the communication
+ * thread, under ust_lock protection.
  */
-static pthread_mutex_t sessions_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-void ust_lock(void)
-{
-       pthread_mutex_lock(&sessions_mutex);
-}
+static CDS_LIST_HEAD(sessions);
 
-void ust_unlock(void)
+struct cds_list_head *_lttng_get_sessions(void)
 {
-       pthread_mutex_unlock(&sessions_mutex);
+       return &sessions;
 }
 
-static CDS_LIST_HEAD(sessions);
+static void _lttng_event_destroy(struct lttng_event *event);
+static void _lttng_enum_destroy(struct lttng_enum *_enum);
 
-/*
- * Wildcard list, containing the active wildcards.
- * Protected by ust lock.
- */
-static CDS_LIST_HEAD(wildcard_list);
+static
+void lttng_session_lazy_sync_enablers(struct lttng_session *session);
+static
+void lttng_session_sync_enablers(struct lttng_session *session);
+static
+void lttng_enabler_destroy(struct lttng_enabler *enabler);
 
 /*
- * Pending probes hash table, containing the registered ltt events for
- * which tracepoint probes are still missing. Protected by the sessions
- * mutex.
+ * Called with ust lock held.
  */
-#define PENDING_PROBE_HASH_BITS                6
-#define PENDING_PROBE_HASH_SIZE                (1 << PENDING_PROBE_HASH_BITS)
-static struct cds_hlist_head pending_probe_table[PENDING_PROBE_HASH_SIZE];
+int lttng_session_active(void)
+{
+       struct lttng_session *iter;
 
-struct ust_pending_probe {
-       struct lttng_event *event;
-       struct cds_hlist_node node;
-       enum lttng_ust_loglevel_type loglevel_type;
-       int loglevel;
-       char name[];
-};
+       cds_list_for_each_entry(iter, &sessions, node) {
+               if (iter->active)
+                       return 1;
+       }
+       return 0;
+}
 
-static void _lttng_event_destroy(struct lttng_event *event);
-static void _lttng_wildcard_destroy(struct session_wildcard *sw);
-static void _lttng_channel_destroy(struct lttng_channel *chan);
-static int _lttng_event_unregister(struct lttng_event *event);
-static
-int _lttng_event_metadata_statedump(struct lttng_session *session,
-                                 struct lttng_channel *chan,
-                                 struct lttng_event *event);
 static
-int _lttng_session_metadata_statedump(struct lttng_session *session);
-
-int lttng_loglevel_match(const struct lttng_event_desc *desc,
+int lttng_loglevel_match(int loglevel,
+               unsigned int has_loglevel,
                enum lttng_ust_loglevel_type req_type,
                int req_loglevel)
 {
-       int ev_loglevel;
-
-       if (req_type == LTTNG_UST_LOGLEVEL_ALL)
-               return 1;
-       if (!desc->loglevel)
-               ev_loglevel = TRACE_DEFAULT;
-       else
-               ev_loglevel = *(*desc->loglevel);
+       if (!has_loglevel)
+               loglevel = TRACE_DEFAULT;
        switch (req_type) {
        case LTTNG_UST_LOGLEVEL_RANGE:
-               if (ev_loglevel <= req_loglevel || req_loglevel == -1)
+               if (loglevel <= req_loglevel
+                               || (req_loglevel == -1 && loglevel <= TRACE_DEBUG))
                        return 1;
                else
                        return 0;
        case LTTNG_UST_LOGLEVEL_SINGLE:
-               if (ev_loglevel == req_loglevel || req_loglevel == -1)
+               if (loglevel == req_loglevel
+                               || (req_loglevel == -1 && loglevel <= TRACE_DEBUG))
                        return 1;
                else
                        return 0;
        case LTTNG_UST_LOGLEVEL_ALL:
        default:
-               return 1;
+               if (loglevel <= TRACE_DEBUG)
+                       return 1;
+               else
+                       return 0;
        }
 }
 
-/*
- * Return wildcard for a given event name if the event name match the
- * one of the wildcards.
- * Must be called with ust lock held.
- * Returns NULL if not present.
- */
-static
-struct wildcard_entry *match_wildcard(const struct lttng_event_desc *desc)
+void synchronize_trace(void)
 {
-       struct wildcard_entry *e;
-
-       cds_list_for_each_entry(e, &wildcard_list, list) {
-               /* If only contain '*' */
-               if (strlen(e->name) == 1)
-                       goto possible_match;
-               /* Compare excluding final '*' */
-               if (!strncmp(desc->name, e->name, strlen(e->name) - 1))
-                       goto possible_match;
-               continue;       /* goto next, no match */
-       possible_match:
-               if (lttng_loglevel_match(desc,
-                               e->loglevel_type,
-                               e->loglevel)) {
-                       return e;
-               }
-               /* no match, loop to next */
+       synchronize_rcu();
+}
+
+struct lttng_session *lttng_session_create(void)
+{
+       struct lttng_session *session;
+       int i;
+
+       session = zmalloc(sizeof(struct lttng_session));
+       if (!session)
+               return NULL;
+       if (lttng_session_context_init(&session->ctx)) {
+               free(session);
+               return NULL;
        }
-       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);
+       for (i = 0; i < LTTNG_UST_EVENT_HT_SIZE; i++)
+               CDS_INIT_HLIST_HEAD(&session->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);
+       return session;
 }
 
 /*
- * called at event creation if probe is missing.
- * called with session mutex held.
+ * Only used internally at session destruction.
  */
 static
-int add_pending_probe(struct lttng_event *event, const char *name,
-               enum lttng_ust_loglevel_type loglevel_type,
-               int loglevel)
+void _lttng_channel_unmap(struct lttng_channel *lttng_chan)
 {
-       struct cds_hlist_head *head;
-       struct ust_pending_probe *e;
-       size_t name_len = strlen(name) + 1;
-       uint32_t hash;
+       struct channel *chan;
+       struct lttng_ust_shm_handle *handle;
 
-       if (name_len > LTTNG_UST_SYM_NAME_LEN) {
-               WARN("Truncating tracepoint name %s which exceeds size limits of %u chars", name, LTTNG_UST_SYM_NAME_LEN);
-               name_len = LTTNG_UST_SYM_NAME_LEN;
-       }
-       hash = jhash(name, name_len - 1, 0);
-       head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
-       e = zmalloc(sizeof(struct ust_pending_probe) + name_len);
-       if (!e)
-               return -ENOMEM;
-       memcpy(&e->name[0], name, name_len);
-       e->name[name_len - 1] = '\0';
-       e->loglevel_type = loglevel_type;
-       e->loglevel = loglevel;
-       cds_hlist_add_head(&e->node, head);
-       e->event = event;
-       event->pending_probe = e;
-       return 0;
+       cds_list_del(&lttng_chan->node);
+       lttng_destroy_context(lttng_chan->ctx);
+       chan = lttng_chan->chan;
+       handle = lttng_chan->handle;
+       /*
+        * note: lttng_chan is private data contained within handle. It
+        * will be freed along with the handle.
+        */
+       channel_destroy(chan, handle, 0);
 }
 
-/*
- * remove a pending probe. called when at event teardown and when an
- * event is fixed (probe is loaded).
- * called with session mutex held.
- */
 static
-void remove_pending_probe(struct ust_pending_probe *e)
+void register_event(struct lttng_event *event)
 {
-       if (!e)
-               return;
-       cds_hlist_del(&e->node);
-       free(e);
+       int ret;
+       const struct lttng_event_desc *desc;
+
+       assert(event->registered == 0);
+       desc = event->desc;
+       ret = __tracepoint_probe_register_queue_release(desc->name,
+                       desc->probe_callback,
+                       event, desc->signature);
+       WARN_ON_ONCE(ret);
+       if (!ret)
+               event->registered = 1;
+}
+
+static
+void unregister_event(struct lttng_event *event)
+{
+       int ret;
+       const struct lttng_event_desc *desc;
+
+       assert(event->registered == 1);
+       desc = event->desc;
+       ret = __tracepoint_probe_unregister_queue_release(desc->name,
+                       desc->probe_callback,
+                       event);
+       WARN_ON_ONCE(ret);
+       if (!ret)
+               event->registered = 0;
 }
 
 /*
- * Called at library load: connect the probe on the events pending on
- * probe load.
- * called with session mutex held.
+ * Only used internally at session destruction.
  */
-int pending_probe_fix_events(const struct lttng_event_desc *desc)
+static
+void _lttng_event_unregister(struct lttng_event *event)
+{
+       if (event->registered)
+               unregister_event(event);
+}
+
+void lttng_session_destroy(struct lttng_session *session)
+{
+       struct lttng_channel *chan, *tmpchan;
+       struct lttng_event *event, *tmpevent;
+       struct lttng_enum *_enum, *tmp_enum;
+       struct lttng_enabler *enabler, *tmpenabler;
+
+       CMM_ACCESS_ONCE(session->active) = 0;
+       cds_list_for_each_entry(event, &session->events_head, node) {
+               _lttng_event_unregister(event);
+       }
+       synchronize_trace();    /* Wait for in-flight events to complete */
+       __tracepoint_probe_prune_release_queue();
+       cds_list_for_each_entry_safe(enabler, tmpenabler,
+                       &session->enablers_head, node)
+               lttng_enabler_destroy(enabler);
+       cds_list_for_each_entry_safe(event, tmpevent,
+                       &session->events_head, node)
+               _lttng_event_destroy(event);
+       cds_list_for_each_entry_safe(_enum, tmp_enum,
+                       &session->enums_head, node)
+               _lttng_enum_destroy(_enum);
+       cds_list_for_each_entry_safe(chan, tmpchan, &session->chan_head, node)
+               _lttng_channel_unmap(chan);
+       cds_list_del(&session->node);
+       lttng_destroy_context(session->ctx);
+       free(session);
+}
+
+static
+int lttng_enum_create(const struct lttng_enum_desc *desc,
+               struct lttng_session *session)
 {
+       const char *enum_name = desc->name;
+       struct lttng_enum *_enum;
        struct cds_hlist_head *head;
-       struct cds_hlist_node *node, *p;
-       struct ust_pending_probe *e;
-       const char *name = desc->name;
+       struct cds_hlist_node *node;
        int ret = 0;
-       struct lttng_ust_event event_param;
-       size_t name_len = strlen(name) + 1;
+       size_t name_len = strlen(enum_name);
        uint32_t hash;
+       int notify_socket;
 
-       /* Wildcard */
-       {
-               struct wildcard_entry *wildcard;
-
-               //FIXME: should iterate on all match for filter.
-               //FIXME: should re-use pending event if present rather
-               //than create duplicate.
-               wildcard = match_wildcard(desc);
-               if (strcmp(desc->name, "lttng_ust:metadata") && wildcard) {
-                       struct session_wildcard *sw;
-
-                       cds_list_for_each_entry(sw, &wildcard->session_list,
-                                       session_list) {
-                               struct lttng_event *ev;
-                               int ret;
-
-                               memcpy(&event_param, &sw->event_param,
-                                               sizeof(event_param));
-                               strncpy(event_param.name,
-                                       desc->name,
-                                       sizeof(event_param.name));
-                               event_param.name[sizeof(event_param.name) - 1] = '\0';
-                               /* create event */
-                               ret = lttng_event_create(sw->chan,
-                                       &event_param, &ev);
-                               if (ret) {
-                                       DBG("Error creating event");
-                                       continue;
-                               }
-                               cds_list_add(&ev->wildcard_list,
-                                       &sw->events);
-                               lttng_filter_event_link_wildcard_bytecode(ev,
-                                       sw);
-                       }
+       hash = jhash(enum_name, name_len, 0);
+       head = &session->enums_ht.table[hash & (LTTNG_UST_ENUM_HT_SIZE - 1)];
+       cds_hlist_for_each_entry(_enum, node, head, hlist) {
+               assert(_enum->desc);
+               if (!strncmp(_enum->desc->name, desc->name,
+                               LTTNG_UST_SYM_NAME_LEN - 1)) {
+                       ret = -EEXIST;
+                       goto exist;
                }
        }
 
-       if (name_len > LTTNG_UST_SYM_NAME_LEN) {
-               WARN("Truncating tracepoint name %s which exceeds size limits of %u chars", name, LTTNG_UST_SYM_NAME_LEN);
-               name_len = LTTNG_UST_SYM_NAME_LEN;
+       notify_socket = lttng_get_notify_socket(session->owner);
+       if (notify_socket < 0) {
+               ret = notify_socket;
+               goto socket_error;
        }
-       hash = jhash(name, name_len - 1, 0);
-       head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
-       cds_hlist_for_each_entry_safe(e, node, p, head, node) {
-               struct lttng_event *event;
-               struct lttng_channel *chan;
 
-               if (!lttng_loglevel_match(desc,
-                               e->loglevel_type,
-                               e->loglevel)) {
-                       continue;
-               }
-               if (strncmp(name, e->name, LTTNG_UST_SYM_NAME_LEN - 1)) {
-                       continue;
-               }
-               /* TODO: wildcard same as pending event: duplicate */
-               /* TODO: Should apply filter though */
-               event = e->event;
-               chan = event->chan;
-               assert(!event->desc);
-               event->desc = desc;
-               event->pending_probe = NULL;
-               remove_pending_probe(e);
-               ret |= __tracepoint_probe_register(name,
-                               event->desc->probe_callback,
-                               event, event->desc->signature);
-               if (ret)
-                       continue;
-               event->id = chan->free_event_id++;
-               ret |= _lttng_event_metadata_statedump(chan->session, chan,
-                               event);
-               lttng_filter_event_link_bytecode(event);
+       _enum = zmalloc(sizeof(*_enum));
+       if (!_enum) {
+               ret = -ENOMEM;
+               goto cache_error;
+       }
+       _enum->session = session;
+       _enum->desc = desc;
+
+       ret = ustcomm_register_enum(notify_socket,
+               session->objd,
+               enum_name,
+               desc->nr_entries,
+               desc->entries,
+               &_enum->id);
+       if (ret < 0) {
+               DBG("Error (%d) registering enumeration to sessiond", ret);
+               goto sessiond_register_error;
        }
+       cds_list_add(&_enum->node, &session->enums_head);
+       cds_hlist_add_head(&_enum->hlist, head);
+       return 0;
+
+sessiond_register_error:
+       free(_enum);
+cache_error:
+socket_error:
+exist:
        return ret;
 }
 
-void synchronize_trace(void)
+static
+int lttng_create_enum_check(const struct lttng_type *type,
+               struct lttng_session *session)
 {
-       synchronize_rcu();
+       switch (type->atype) {
+       case atype_enum:
+       {
+               const struct lttng_enum_desc *enum_desc;
+               int ret;
+
+               enum_desc = type->u.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_dynamic:
+       {
+               const struct lttng_event_field *tag_field_generic;
+               const struct lttng_enum_desc *enum_desc;
+               int ret;
+
+               tag_field_generic = lttng_ust_dynamic_type_tag_field();
+               enum_desc = tag_field_generic->type.u.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;
+       }
+       default:
+               /* TODO: nested types when they become supported. */
+               break;
+       }
+       return 0;
 }
 
-struct lttng_session *lttng_session_create(void)
+static
+int lttng_create_all_event_enums(size_t nr_fields,
+               const struct lttng_event_field *event_fields,
+               struct lttng_session *session)
 {
-       struct lttng_session *session;
+       size_t i;
        int ret;
 
-       session = zmalloc(sizeof(struct lttng_session));
-       if (!session)
-               return NULL;
-       CDS_INIT_LIST_HEAD(&session->chan);
-       CDS_INIT_LIST_HEAD(&session->events);
-       CDS_INIT_LIST_HEAD(&session->wildcards);
-       ret = lttng_ust_uuid_generate(session->uuid);
-       if (ret != 0) {
-               session->uuid[0] = '\0';
+       /* For each field, ensure enum is part of the session. */
+       for (i = 0; i < nr_fields; i++) {
+               const struct lttng_type *type = &event_fields[i].type;
+
+               ret = lttng_create_enum_check(type, session);
+               if (ret)
+                       return ret;
        }
-       cds_list_add(&session->list, &sessions);
-       return session;
+       return 0;
 }
 
-void lttng_session_destroy(struct lttng_session *session)
+static
+int lttng_create_all_ctx_enums(size_t nr_fields,
+               const struct lttng_ctx_field *ctx_fields,
+               struct lttng_session *session)
 {
-       struct lttng_channel *chan, *tmpchan;
-       struct lttng_event *event, *tmpevent;
-       struct session_wildcard *wildcard, *tmpwildcard;
+       size_t i;
        int ret;
 
-       CMM_ACCESS_ONCE(session->active) = 0;
-       cds_list_for_each_entry(event, &session->events, list) {
-               ret = _lttng_event_unregister(event);
-               WARN_ON(ret);
+       /* For each field, ensure enum is part of the session. */
+       for (i = 0; i < nr_fields; i++) {
+               const struct lttng_type *type = &ctx_fields[i].event_field.type;
+
+               ret = lttng_create_enum_check(type, session);
+               if (ret)
+                       return ret;
        }
-       synchronize_trace();    /* Wait for in-flight events to complete */
-       cds_list_for_each_entry_safe(wildcard, tmpwildcard, &session->wildcards, list)
-               _lttng_wildcard_destroy(wildcard);
-       cds_list_for_each_entry_safe(event, tmpevent, &session->events, list)
-               _lttng_event_destroy(event);
-       cds_list_for_each_entry_safe(chan, tmpchan, &session->chan, list)
-               _lttng_channel_destroy(chan);
-       cds_list_del(&session->list);
-       free(session);
+       return 0;
+}
+
+/*
+ * Ensure that a state-dump will be performed for this session at the end
+ * of the current handle_message().
+ */
+int lttng_session_statedump(struct lttng_session *session)
+{
+       session->statedump_pending = 1;
+       lttng_ust_sockinfo_session_enabled(session->owner);
+       return 0;
 }
 
 int lttng_session_enable(struct lttng_session *session)
 {
        int ret = 0;
        struct lttng_channel *chan;
+       int notify_socket;
 
        if (session->active) {
                ret = -EBUSY;
                goto end;
        }
 
+       notify_socket = lttng_get_notify_socket(session->owner);
+       if (notify_socket < 0)
+               return notify_socket;
+
+       /* Set transient enabler state to "enabled" */
+       session->tstate = 1;
+
        /*
         * 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, list) {
+       cds_list_for_each_entry(chan, &session->chan_head, node) {
+               const struct lttng_ctx *ctx;
+               const struct lttng_ctx_field *fields = NULL;
+               size_t nr_fields = 0;
+               uint32_t chan_id;
+
+               /* don't change it if session stop/restart */
                if (chan->header_type)
-                       continue;               /* don't change it if session stop/restart */
-               if (chan->free_event_id < 31)
-                       chan->header_type = 1;  /* compact */
-               else
-                       chan->header_type = 2;  /* large */
+                       continue;
+               ctx = chan->ctx;
+               if (ctx) {
+                       nr_fields = ctx->nr_fields;
+                       fields = ctx->fields;
+                       ret = lttng_create_all_ctx_enums(nr_fields, fields,
+                               session);
+                       if (ret < 0) {
+                               DBG("Error (%d) adding enum to session", ret);
+                               return ret;
+                       }
+               }
+               ret = ustcomm_register_channel(notify_socket,
+                       session,
+                       session->objd,
+                       chan->objd,
+                       nr_fields,
+                       fields,
+                       &chan_id,
+                       &chan->header_type);
+               if (ret) {
+                       DBG("Error (%d) registering channel to sessiond", ret);
+                       return ret;
+               }
+               if (chan_id != chan->id) {
+                       DBG("Error: channel registration id (%u) does not match id assigned at creation (%u)",
+                               chan_id, chan->id);
+                       return -EINVAL;
+               }
        }
 
+       /* We need to sync enablers with session before activation. */
+       lttng_session_sync_enablers(session);
+
+       /* Set atomically the state to "active" */
        CMM_ACCESS_ONCE(session->active) = 1;
        CMM_ACCESS_ONCE(session->been_active) = 1;
-       ret = _lttng_session_metadata_statedump(session);
+
+       ret = lttng_session_statedump(session);
        if (ret)
-               CMM_ACCESS_ONCE(session->active) = 0;
+               return ret;
 end:
        return ret;
 }
@@ -394,1133 +482,807 @@ int lttng_session_disable(struct lttng_session *session)
                ret = -EBUSY;
                goto end;
        }
+       /* Set atomically the state to "inactive" */
        CMM_ACCESS_ONCE(session->active) = 0;
+
+       /* Set transient enabler state to "disabled" */
+       session->tstate = 0;
+       lttng_session_sync_enablers(session);
 end:
        return ret;
 }
 
 int lttng_channel_enable(struct lttng_channel *channel)
 {
-       int old;
+       int ret = 0;
 
-       if (channel == channel->session->metadata)
-               return -EPERM;
-       old = uatomic_xchg(&channel->enabled, 1);
-       if (old)
-               return -EEXIST;
-       return 0;
+       if (channel->enabled) {
+               ret = -EBUSY;
+               goto end;
+       }
+       /* Set transient enabler state to "enabled" */
+       channel->tstate = 1;
+       lttng_session_sync_enablers(channel->session);
+       /* Set atomically the state to "enabled" */
+       CMM_ACCESS_ONCE(channel->enabled) = 1;
+end:
+       return ret;
 }
 
 int lttng_channel_disable(struct lttng_channel *channel)
 {
-       int old;
-
-       if (channel == channel->session->metadata)
-               return -EPERM;
-       old = uatomic_xchg(&channel->enabled, 0);
-       if (!old)
-               return -EEXIST;
-       return 0;
-}
-
-int lttng_event_enable(struct lttng_event *event)
-{
-       int old;
-
-       if (event->chan == event->chan->session->metadata)
-               return -EPERM;
-       old = uatomic_xchg(&event->enabled, 1);
-       if (old)
-               return -EEXIST;
-       return 0;
-}
-
-int lttng_event_disable(struct lttng_event *event)
-{
-       int old;
-
-       if (event->chan == event->chan->session->metadata)
-               return -EPERM;
-       old = uatomic_xchg(&event->enabled, 0);
-       if (!old)
-               return -EEXIST;
-       return 0;
-}
-
-struct lttng_channel *lttng_channel_create(struct lttng_session *session,
-                                      const char *transport_name,
-                                      void *buf_addr,
-                                      size_t subbuf_size, size_t num_subbuf,
-                                      unsigned int switch_timer_interval,
-                                      unsigned int read_timer_interval,
-                                      int **shm_fd, int **wait_fd,
-                                      uint64_t **memory_map_size,
-                                      struct lttng_channel *chan_priv_init)
-{
-       struct lttng_channel *chan = NULL;
-       struct lttng_transport *transport;
+       int ret = 0;
 
-       if (session->been_active)
-               goto active;    /* Refuse to add channel to active session */
-       transport = lttng_transport_find(transport_name);
-       if (!transport) {
-               DBG("LTTng transport %s not found\n",
-                      transport_name);
-               goto notransport;
+       if (!channel->enabled) {
+               ret = -EBUSY;
+               goto end;
        }
-       chan_priv_init->id = session->free_chan_id++;
-       chan_priv_init->session = session;
-       /*
-        * Note: the channel creation op already writes into the packet
-        * headers. Therefore the "chan" information used as input
-        * should be already accessible.
-        */
-       chan = transport->ops.channel_create(transport_name, buf_addr,
-                       subbuf_size, num_subbuf, switch_timer_interval,
-                       read_timer_interval, shm_fd, wait_fd,
-                       memory_map_size, chan_priv_init);
-       if (!chan)
-               goto create_error;
-       chan->enabled = 1;
-       chan->ops = &transport->ops;
-       cds_list_add(&chan->list, &session->chan);
-       return chan;
-
-create_error:
-notransport:
-active:
-       return NULL;
-}
-
-/*
- * Only used internally at session destruction.
- */
-static
-void _lttng_channel_destroy(struct lttng_channel *chan)
-{
-       cds_list_del(&chan->list);
-       lttng_destroy_context(chan->ctx);
-       chan->ops->channel_destroy(chan);
+       /* Set atomically the state to "disabled" */
+       CMM_ACCESS_ONCE(channel->enabled) = 0;
+       /* Set transient enabler state to "enabled" */
+       channel->tstate = 0;
+       lttng_session_sync_enablers(channel->session);
+end:
+       return ret;
 }
 
 /*
  * Supports event creation while tracing session is active.
  */
-int lttng_event_create(struct lttng_channel *chan,
-               struct lttng_ust_event *event_param,
-               struct lttng_event **_event)
+static
+int lttng_event_create(const struct lttng_event_desc *desc,
+               struct lttng_channel *chan)
 {
-       const struct lttng_event_desc *desc = NULL;     /* silence gcc */
+       const char *event_name = desc->name;
        struct lttng_event *event;
+       struct lttng_session *session = chan->session;
+       struct cds_hlist_head *head;
        int ret = 0;
+       size_t name_len = strlen(event_name);
+       uint32_t hash;
+       int notify_socket, loglevel;
+       const char *uri;
 
-       if (chan->used_event_id == -1U) {
-               ret = -ENOMEM;
-               goto full;
+       hash = jhash(event_name, name_len, 0);
+       head = &chan->session->events_ht.table[hash & (LTTNG_UST_EVENT_HT_SIZE - 1)];
+
+       notify_socket = lttng_get_notify_socket(session->owner);
+       if (notify_socket < 0) {
+               ret = notify_socket;
+               goto socket_error;
        }
-       //FIXME: re-use event if already registered by wildcard or
-       //if we have a pending probe.... (CHECK)
-       /*
-        * This is O(n^2) (for each event, the loop is called at event
-        * creation). Might require a hash if we have lots of events.
-        */
-       cds_list_for_each_entry(event, &chan->session->events, list) {
-               if (event->desc && !strncmp(event->desc->name,
-                               event_param->name,
-                               LTTNG_UST_SYM_NAME_LEN - 1)) {
-                       ret = -EEXIST;
-                       goto exist;
-               }
+
+       ret = lttng_create_all_event_enums(desc->nr_fields, desc->fields,
+                       session);
+       if (ret < 0) {
+               DBG("Error (%d) adding enum to session", ret);
+               goto create_enum_error;
        }
 
        /*
         * Check if loglevel match. Refuse to connect event if not.
         */
-       if (event_param->instrumentation == LTTNG_UST_TRACEPOINT) {
-               desc = lttng_event_get(event_param->name);
-               if (desc) {
-                       if (!lttng_loglevel_match(desc,
-                                       event_param->loglevel_type,
-                                       event_param->loglevel)) {
-                               ret = -EPERM;
-                               goto no_loglevel_match;
-                       }
-               }
-               /*
-                * If descriptor is not there, it will be added to
-                * pending probes.
-                */
-       }
        event = zmalloc(sizeof(struct lttng_event));
        if (!event) {
                ret = -ENOMEM;
                goto cache_error;
        }
        event->chan = chan;
-       /*
-        * used_event_id counts the maximum number of event IDs that can
-        * register if all probes register.
-        */
-       chan->used_event_id++;
-       event->enabled = 1;
-       CDS_INIT_LIST_HEAD(&event->filter_bytecode);
-       CDS_INIT_LIST_HEAD(&event->bytecode_runtime);
-       event->instrumentation = event_param->instrumentation;
+
+       /* Event will be enabled by enabler sync. */
+       event->enabled = 0;
+       event->registered = 0;
+       CDS_INIT_LIST_HEAD(&event->bytecode_runtime_head);
+       CDS_INIT_LIST_HEAD(&event->enablers_ref_head);
+       event->desc = desc;
+
+       if (desc->loglevel)
+               loglevel = *(*event->desc->loglevel);
+       else
+               loglevel = TRACE_DEFAULT;
+       if (desc->u.ext.model_emf_uri)
+               uri = *(desc->u.ext.model_emf_uri);
+       else
+               uri = NULL;
+
+       /* Fetch event ID from sessiond */
+       ret = ustcomm_register_event(notify_socket,
+               session,
+               session->objd,
+               chan->objd,
+               event_name,
+               loglevel,
+               desc->signature,
+               desc->nr_fields,
+               desc->fields,
+               uri,
+               &event->id);
+       if (ret < 0) {
+               DBG("Error (%d) registering event to sessiond", ret);
+               goto sessiond_register_error;
+       }
+
        /* Populate lttng_event structure before tracepoint registration. */
        cmm_smp_wmb();
-       switch (event_param->instrumentation) {
-       case LTTNG_UST_TRACEPOINT:
-               event->desc = desc;
-               if (event->desc) {
-                       ret = __tracepoint_probe_register(event_param->name,
-                                       event->desc->probe_callback,
-                                       event, event->desc->signature);
-                       if (ret)
-                               goto register_error;
-                       event->id = chan->free_event_id++;
-               } else {
-                       /*
-                        * If the probe is not present, event->desc stays NULL,
-                        * waiting for the probe to register, and the event->id
-                        * stays unallocated.
-                        */
-                       ret = add_pending_probe(event, event_param->name,
-                                       event_param->loglevel_type,
-                                       event_param->loglevel);
-                       if (ret)
-                               goto add_pending_error;
-               }
-               break;
-       default:
-               WARN_ON_ONCE(1);
-       }
-       if (event->desc) {
-               ret = _lttng_event_metadata_statedump(chan->session, chan, event);
-               if (ret)
-                       goto statedump_error;
-       }
-       cds_list_add(&event->list, &chan->session->events);
-       *_event = event;
+       cds_list_add(&event->node, &chan->session->events_head);
+       cds_hlist_add_head(&event->hlist, head);
        return 0;
 
-statedump_error:
-       if (event->desc) {
-               WARN_ON_ONCE(__tracepoint_probe_unregister(event_param->name,
-                                       event->desc->probe_callback,
-                                       event));
-               lttng_event_put(event->desc);
-       }
-add_pending_error:
-register_error:
+sessiond_register_error:
        free(event);
 cache_error:
-no_loglevel_match:
-exist:
-full:
+create_enum_error:
+socket_error:
        return ret;
 }
 
-/*
- * Only used internally at session destruction.
- */
-int _lttng_event_unregister(struct lttng_event *event)
+static
+int lttng_desc_match_star_glob_enabler(const struct lttng_event_desc *desc,
+               struct lttng_enabler *enabler)
 {
-       int ret = -EINVAL;
-
-       switch (event->instrumentation) {
-       case LTTNG_UST_TRACEPOINT:
-               if (event->desc) {
-                       ret = __tracepoint_probe_unregister(event->desc->name,
-                                                         event->desc->probe_callback,
-                                                         event);
-                       if (ret)
-                               return ret;
-               } else {
-                       remove_pending_probe(event->pending_probe);
-                       ret = 0;
-               }
-               break;
-       default:
-               WARN_ON_ONCE(1);
-       }
-       return ret;
-}
+       int loglevel = 0;
+       unsigned int has_loglevel = 0;
 
-/*
- * Only used internally at session destruction.
- */
-static
-void _lttng_event_destroy(struct lttng_event *event)
-{
-       switch (event->instrumentation) {
-       case LTTNG_UST_TRACEPOINT:
-               if (event->desc) {
-                       lttng_event_put(event->desc);
-               }
-               break;
-       default:
-               WARN_ON_ONCE(1);
+       assert(enabler->type == LTTNG_ENABLER_STAR_GLOB);
+       if (!strutils_star_glob_match(enabler->event_param.name, SIZE_MAX,
+                       desc->name, SIZE_MAX))
+               return 0;
+       if (desc->loglevel) {
+               loglevel = *(*desc->loglevel);
+               has_loglevel = 1;
        }
-       cds_list_del(&event->list);
-       lttng_destroy_context(event->ctx);
-       lttng_free_event_filter_runtime(event);
-       lttng_free_event_filter_bytecode(event);
-       free(event);
+       if (!lttng_loglevel_match(loglevel,
+                       has_loglevel,
+                       enabler->event_param.loglevel_type,
+                       enabler->event_param.loglevel))
+               return 0;
+       return 1;
 }
 
-/*
- * We have exclusive access to our metadata buffer (protected by the
- * ust_lock), so we can do racy operations such as looking for
- * remaining space left in packet and write, since mutual exclusion
- * protects us from concurrent writes.
- */
-int lttng_metadata_printf(struct lttng_session *session,
-                         const char *fmt, ...)
+static
+int lttng_desc_match_event_enabler(const struct lttng_event_desc *desc,
+               struct lttng_enabler *enabler)
 {
-       struct lttng_ust_lib_ring_buffer_ctx ctx;
-       struct lttng_channel *chan = session->metadata;
-       char *str = NULL;
-       int ret = 0, waitret;
-       size_t len, reserve_len, pos;
-       va_list ap;
-
-       WARN_ON_ONCE(!CMM_ACCESS_ONCE(session->active));
-
-       va_start(ap, fmt);
-       ret = vasprintf(&str, fmt, ap);
-       va_end(ap);
-       if (ret < 0)
-               return -ENOMEM;
-
-       len = strlen(str);
-       pos = 0;
-
-       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);
-               /*
-                * 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);
+       int loglevel = 0;
+       unsigned int has_loglevel = 0;
+
+       assert(enabler->type == LTTNG_ENABLER_EVENT);
+       if (strcmp(desc->name, enabler->event_param.name))
+               return 0;
+       if (desc->loglevel) {
+               loglevel = *(*desc->loglevel);
+               has_loglevel = 1;
        }
-end:
-       free(str);
-       return ret;
+       if (!lttng_loglevel_match(loglevel,
+                       has_loglevel,
+                       enabler->event_param.loglevel_type,
+                       enabler->event_param.loglevel))
+               return 0;
+       return 1;
 }
 
 static
-int _lttng_field_statedump(struct lttng_session *session,
-                        const struct lttng_event_field *field)
+int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
+               struct lttng_enabler *enabler)
 {
-       int ret = 0;
-
-       if (field->nowrite)
-               return 0;
-
-       switch (field->type.atype) {
-       case atype_integer:
-               ret = lttng_metadata_printf(session,
-                       "               integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } _%s;\n",
-                       field->type.u.basic.integer.size,
-                       field->type.u.basic.integer.alignment,
-                       field->type.u.basic.integer.signedness,
-                       (field->type.u.basic.integer.encoding == lttng_encode_none)
-                               ? "none"
-                               : (field->type.u.basic.integer.encoding == lttng_encode_UTF8)
-                                       ? "UTF8"
-                                       : "ASCII",
-                       field->type.u.basic.integer.base,
-#if (BYTE_ORDER == BIG_ENDIAN)
-                       field->type.u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
-#else
-                       field->type.u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
-#endif
-                       field->name);
-               break;
-       case atype_float:
-               ret = lttng_metadata_printf(session,
-                       "               floating_point { exp_dig = %u; mant_dig = %u; align = %u;%s } _%s;\n",
-                       field->type.u.basic._float.exp_dig,
-                       field->type.u.basic._float.mant_dig,
-                       field->type.u.basic._float.alignment,
-#if (BYTE_ORDER == BIG_ENDIAN)
-                       field->type.u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
-#else
-                       field->type.u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
-#endif
-                       field->name);
-               break;
-       case atype_enum:
-               ret = lttng_metadata_printf(session,
-                       "               %s %s;\n",
-                       field->type.u.basic.enumeration.name,
-                       field->name);
-               break;
-       case atype_array:
-       {
-               const struct lttng_basic_type *elem_type;
-
-               elem_type = &field->type.u.array.elem_type;
-               ret = lttng_metadata_printf(session,
-                       "               integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } _%s[%u];\n",
-                       elem_type->u.basic.integer.size,
-                       elem_type->u.basic.integer.alignment,
-                       elem_type->u.basic.integer.signedness,
-                       (elem_type->u.basic.integer.encoding == lttng_encode_none)
-                               ? "none"
-                               : (elem_type->u.basic.integer.encoding == lttng_encode_UTF8)
-                                       ? "UTF8"
-                                       : "ASCII",
-                       elem_type->u.basic.integer.base,
-#if (BYTE_ORDER == BIG_ENDIAN)
-                       elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
-#else
-                       elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
-#endif
-                       field->name, field->type.u.array.length);
-               break;
-       }
-       case atype_sequence:
+       switch (enabler->type) {
+       case LTTNG_ENABLER_STAR_GLOB:
        {
-               const struct lttng_basic_type *elem_type;
-               const struct lttng_basic_type *length_type;
-
-               elem_type = &field->type.u.sequence.elem_type;
-               length_type = &field->type.u.sequence.length_type;
-               ret = lttng_metadata_printf(session,
-                       "               integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } __%s_length;\n",
-                       length_type->u.basic.integer.size,
-                       (unsigned int) length_type->u.basic.integer.alignment,
-                       length_type->u.basic.integer.signedness,
-                       (length_type->u.basic.integer.encoding == lttng_encode_none)
-                               ? "none"
-                               : ((length_type->u.basic.integer.encoding == lttng_encode_UTF8)
-                                       ? "UTF8"
-                                       : "ASCII"),
-                       length_type->u.basic.integer.base,
-#if (BYTE_ORDER == BIG_ENDIAN)
-                       length_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
-#else
-                       length_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
-#endif
-                       field->name);
-               if (ret)
-                       return ret;
+               struct lttng_ust_excluder_node *excluder;
 
-               ret = lttng_metadata_printf(session,
-                       "               integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s } _%s[ __%s_length ];\n",
-                       elem_type->u.basic.integer.size,
-                       (unsigned int) elem_type->u.basic.integer.alignment,
-                       elem_type->u.basic.integer.signedness,
-                       (elem_type->u.basic.integer.encoding == lttng_encode_none)
-                               ? "none"
-                               : ((elem_type->u.basic.integer.encoding == lttng_encode_UTF8)
-                                       ? "UTF8"
-                                       : "ASCII"),
-                       elem_type->u.basic.integer.base,
-#if (BYTE_ORDER == BIG_ENDIAN)
-                       elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
-#else
-                       elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
-#endif
-                       field->name,
-                       field->name);
-               break;
-       }
+               if (!lttng_desc_match_star_glob_enabler(desc, enabler)) {
+                       return 0;
+               }
 
-       case atype_string:
-               /* Default encoding is UTF8 */
-               ret = lttng_metadata_printf(session,
-                       "               string%s _%s;\n",
-                       field->type.u.basic.string.encoding == lttng_encode_ASCII ?
-                               " { encoding = ASCII; }" : "",
-                       field->name);
-               break;
+               /*
+                * If the matching event matches with an excluder,
+                * return 'does not match'
+                */
+               cds_list_for_each_entry(excluder, &enabler->excluder_head, node) {
+                       int count;
+
+                       for (count = 0; count < excluder->excluder.count; count++) {
+                               int len;
+                               char *excluder_name;
+
+                               excluder_name = (char *) (excluder->excluder.names)
+                                               + count * LTTNG_UST_SYM_NAME_LEN;
+                               len = strnlen(excluder_name, LTTNG_UST_SYM_NAME_LEN);
+                               if (len > 0 && strutils_star_glob_match(excluder_name, len, desc->name, SIZE_MAX))
+                                       return 0;
+                       }
+               }
+               return 1;
+       }
+       case LTTNG_ENABLER_EVENT:
+               return lttng_desc_match_event_enabler(desc, enabler);
        default:
-               WARN_ON_ONCE(1);
                return -EINVAL;
        }
-       return ret;
 }
 
 static
-int _lttng_context_metadata_statedump(struct lttng_session *session,
-                                   struct lttng_ctx *ctx)
+int lttng_event_match_enabler(struct lttng_event *event,
+               struct lttng_enabler *enabler)
 {
-       int ret = 0;
-       int i;
-
-       if (!ctx)
+       if (lttng_desc_match_enabler(event->desc, enabler)
+                       && event->chan == enabler->chan)
+               return 1;
+       else
                return 0;
-       for (i = 0; i < ctx->nr_fields; i++) {
-               const struct lttng_ctx_field *field = &ctx->fields[i];
-
-               ret = _lttng_field_statedump(session, &field->event_field);
-               if (ret)
-                       return ret;
-       }
-       return ret;
 }
 
 static
-int _lttng_fields_metadata_statedump(struct lttng_session *session,
-                                  struct lttng_event *event)
+struct lttng_enabler_ref * lttng_event_enabler_ref(struct lttng_event *event,
+               struct lttng_enabler *enabler)
 {
-       const struct lttng_event_desc *desc = event->desc;
-       int ret = 0;
-       int i;
-
-       for (i = 0; i < desc->nr_fields; i++) {
-               const struct lttng_event_field *field = &desc->fields[i];
+       struct lttng_enabler_ref *enabler_ref;
 
-               ret = _lttng_field_statedump(session, field);
-               if (ret)
-                       return ret;
+       cds_list_for_each_entry(enabler_ref,
+                       &event->enablers_ref_head, node) {
+               if (enabler_ref->ref == enabler)
+                       return enabler_ref;
        }
-       return ret;
+       return NULL;
 }
 
+/*
+ * Create struct lttng_event if it is missing and present in the list of
+ * tracepoint probes.
+ */
 static
-int _lttng_event_metadata_statedump(struct lttng_session *session,
-                                 struct lttng_channel *chan,
-                                 struct lttng_event *event)
+void lttng_create_event_if_missing(struct lttng_enabler *enabler)
 {
-       int ret = 0;
-       int loglevel = TRACE_DEFAULT;
+       struct lttng_session *session = enabler->chan->session;
+       struct lttng_probe_desc *probe_desc;
+       const struct lttng_event_desc *desc;
+       struct lttng_event *event;
+       int i;
+       struct cds_list_head *probe_list;
 
-       if (event->metadata_dumped || !CMM_ACCESS_ONCE(session->active))
-               return 0;
-       if (chan == session->metadata)
-               return 0;
+       probe_list = lttng_get_probe_list_head();
        /*
-        * Don't print events for which probe load is pending.
+        * For each probe event, if we find that a probe event matches
+        * our enabler, create an associated lttng_event if not
+        * already present.
         */
-       if (!event->desc)
-               return 0;
+       cds_list_for_each_entry(probe_desc, probe_list, head) {
+               for (i = 0; i < probe_desc->nr_events; i++) {
+                       int found = 0, ret;
+                       struct cds_hlist_head *head;
+                       struct cds_hlist_node *node;
+                       const char *event_name;
+                       size_t name_len;
+                       uint32_t hash;
+
+                       desc = probe_desc->event_desc[i];
+                       if (!lttng_desc_match_enabler(desc, enabler))
+                               continue;
+                       event_name = desc->name;
+                       name_len = strlen(event_name);
 
-       ret = lttng_metadata_printf(session,
-               "event {\n"
-               "       name = \"%s\";\n"
-               "       id = %u;\n"
-               "       stream_id = %u;\n",
-               event->desc->name,
-               event->id,
-               event->chan->id);
-       if (ret)
-               goto end;
-
-       if (event->desc->loglevel)
-               loglevel = *(*event->desc->loglevel);
-
-       ret = lttng_metadata_printf(session,
-               "       loglevel = %d;\n",
-               loglevel);
-       if (ret)
-               goto end;
-
-       if (event->desc->u.ext.model_emf_uri) {
-               ret = lttng_metadata_printf(session,
-                       "       model.emf.uri = \"%s\";\n",
-                       *(event->desc->u.ext.model_emf_uri));
-               if (ret)
-                       goto end;
-       }
+                       /*
+                        * Check if already created.
+                        */
+                       hash = jhash(event_name, name_len, 0);
+                       head = &session->events_ht.table[hash & (LTTNG_UST_EVENT_HT_SIZE - 1)];
+                       cds_hlist_for_each_entry(event, node, head, hlist) {
+                               if (event->desc == desc
+                                               && event->chan == enabler->chan)
+                                       found = 1;
+                       }
+                       if (found)
+                               continue;
 
-       if (event->ctx) {
-               ret = lttng_metadata_printf(session,
-                       "       context := struct {\n");
-               if (ret)
-                       goto end;
-       }
-       ret = _lttng_context_metadata_statedump(session, event->ctx);
-       if (ret)
-               goto end;
-       if (event->ctx) {
-               ret = lttng_metadata_printf(session,
-                       "       };\n");
-               if (ret)
-                       goto end;
+                       /*
+                        * We need to create an event for this
+                        * event probe.
+                        */
+                       ret = lttng_event_create(probe_desc->event_desc[i],
+                                       enabler->chan);
+                       if (ret) {
+                               DBG("Unable to create event %s, error %d\n",
+                                       probe_desc->event_desc[i]->name, ret);
+                       }
+               }
        }
+}
 
-       ret = lttng_metadata_printf(session,
-               "       fields := struct {\n"
-               );
-       if (ret)
-               goto end;
+/*
+ * Iterate over all the UST sessions to unregister and destroy all probes from
+ * the probe provider descriptor received as argument. Must me called with the
+ * ust_lock held.
+ */
+void lttng_probe_provider_unregister_events(struct lttng_probe_desc *provider_desc)
+{
+       struct cds_hlist_node *node, *tmp_node;
+       struct cds_list_head *sessionsp;
+       struct lttng_session *session;
+       struct cds_hlist_head *head;
+       struct lttng_event *event;
+       int i;
 
-       ret = _lttng_fields_metadata_statedump(session, event);
-       if (ret)
-               goto end;
+       /* Get handle on list of sessions. */
+       sessionsp = _lttng_get_sessions();
 
        /*
-        * LTTng space reservation can only reserve multiples of the
-        * byte size.
+        * Iterate over all events in the probe provider descriptions and sessions
+        * to queue the unregistration of the events.
         */
-       ret = lttng_metadata_printf(session,
-               "       };\n"
-               "};\n\n");
-       if (ret)
-               goto end;
+       for (i = 0; i < provider_desc->nr_events; i++) {
+               const struct lttng_event_desc *event_desc;
+               const char *event_name;
+               size_t name_len;
+               uint32_t hash;
+
+               event_desc = provider_desc->event_desc[i];
+               event_name = event_desc->name;
+               name_len = strlen(event_name);
+               hash = jhash(event_name, name_len, 0);
+
+               /* Iterate over all session to find the current event description. */
+               cds_list_for_each_entry(session, sessionsp, node) {
+                       /*
+                        * Get the list of events in the hashtable bucket and iterate to
+                        * find the event matching this descriptor.
+                        */
+                       head = &session->events_ht.table[hash & (LTTNG_UST_EVENT_HT_SIZE - 1)];
+                       cds_hlist_for_each_entry(event, node, head, hlist) {
+                               if (event_desc == event->desc) {
+                                       /* Queue the unregistration of this event. */
+                                       _lttng_event_unregister(event);
+                                       break;
+                               }
+                       }
+               }
+       }
 
-       event->metadata_dumped = 1;
-end:
-       return ret;
+       /* Wait for grace period. */
+       synchronize_trace();
+       /* Prune the unregistration queue. */
+       __tracepoint_probe_prune_release_queue();
 
+       /*
+        * It is now safe to destroy the events and remove them from the event list
+        * and hashtables.
+        */
+       for (i = 0; i < provider_desc->nr_events; i++) {
+               const struct lttng_event_desc *event_desc;
+               const char *event_name;
+               size_t name_len;
+               uint32_t hash;
+
+               event_desc = provider_desc->event_desc[i];
+               event_name = event_desc->name;
+               name_len = strlen(event_name);
+               hash = jhash(event_name, name_len, 0);
+
+               /* Iterate over all sessions to find the current event description. */
+               cds_list_for_each_entry(session, sessionsp, node) {
+                       /*
+                        * Get the list of events in the hashtable bucket and iterate to
+                        * find the event matching this descriptor.
+                        */
+                       head = &session->events_ht.table[hash & (LTTNG_UST_EVENT_HT_SIZE - 1)];
+                       cds_hlist_for_each_entry_safe(event, node, tmp_node, head, hlist) {
+                               if (event_desc == event->desc) {
+                                       /* Destroy enums of the current event. */
+                                       for (j = 0; j < event->desc->nr_fields; j++) {
+                                               const struct lttng_enum_desc *enum_desc;
+                                               const struct lttng_event_field *field;
+                                               struct lttng_enum *curr_enum;
+
+                                               field = &(event->desc->fields[j]);
+                                               if (field->type.atype != atype_enum) {
+                                                       continue;
+                                               }
+
+                                               enum_desc = field->type.u.basic.enumeration.desc;
+                                               curr_enum = lttng_ust_enum_get_from_desc(session, enum_desc);
+                                               if (curr_enum) {
+                                                       _lttng_enum_destroy(curr_enum);
+                                               }
+                                       }
+
+                                       /* Destroy event. */
+                                       _lttng_event_destroy(event);
+                                       break;
+                               }
+                       }
+               }
+       }
 }
 
+/*
+ * Create events associated with an enabler (if not already present),
+ * and add backward reference from the event to the enabler.
+ */
 static
-int _lttng_channel_metadata_statedump(struct lttng_session *session,
-                                   struct lttng_channel *chan)
+int lttng_enabler_ref_events(struct lttng_enabler *enabler)
 {
-       int ret = 0;
+       struct lttng_session *session = enabler->chan->session;
+       struct lttng_event *event;
 
-       if (chan->metadata_dumped || !CMM_ACCESS_ONCE(session->active))
-               return 0;
-       if (chan == session->metadata)
-               return 0;
+       /* First ensure that probe events are created for this enabler. */
+       lttng_create_event_if_missing(enabler);
 
-       WARN_ON_ONCE(!chan->header_type);
-       ret = lttng_metadata_printf(session,
-               "stream {\n"
-               "       id = %u;\n"
-               "       event.header := %s;\n"
-               "       packet.context := struct packet_context;\n",
-               chan->id,
-               chan->header_type == 1 ? "struct event_header_compact" :
-                       "struct event_header_large");
-       if (ret)
-               goto end;
+       /* For each event matching enabler in session event list. */
+       cds_list_for_each_entry(event, &session->events_head, node) {
+               struct lttng_enabler_ref *enabler_ref;
 
-       if (chan->ctx) {
-               ret = lttng_metadata_printf(session,
-                       "       event.context := struct {\n");
-               if (ret)
-                       goto end;
-       }
-       ret = _lttng_context_metadata_statedump(session, chan->ctx);
-       if (ret)
-               goto end;
-       if (chan->ctx) {
-               ret = lttng_metadata_printf(session,
-                       "       };\n");
-               if (ret)
-                       goto end;
-       }
+               if (!lttng_event_match_enabler(event, enabler))
+                       continue;
 
-       ret = lttng_metadata_printf(session,
-               "};\n\n");
+               enabler_ref = lttng_event_enabler_ref(event, enabler);
+               if (!enabler_ref) {
+                       /*
+                        * If no backward ref, create it.
+                        * Add backward ref from event to enabler.
+                        */
+                       enabler_ref = zmalloc(sizeof(*enabler_ref));
+                       if (!enabler_ref)
+                               return -ENOMEM;
+                       enabler_ref->ref = enabler;
+                       cds_list_add(&enabler_ref->node,
+                               &event->enablers_ref_head);
+               }
 
-       chan->metadata_dumped = 1;
-end:
-       return ret;
-}
+               /*
+                * Link filter bytecodes if not linked yet.
+                */
+               lttng_enabler_event_link_bytecode(event, enabler);
 
-static
-int _lttng_stream_packet_context_declare(struct lttng_session *session)
-{
-       return lttng_metadata_printf(session,
-               "struct packet_context {\n"
-               "       uint64_clock_monotonic_t timestamp_begin;\n"
-               "       uint64_clock_monotonic_t timestamp_end;\n"
-               "       uint64_t content_size;\n"
-               "       uint64_t packet_size;\n"
-               "       unsigned long events_discarded;\n"
-               "       uint32_t cpu_id;\n"
-               "};\n\n"
-               );
+               /* TODO: merge event context. */
+       }
+       return 0;
 }
 
 /*
- * Compact header:
- * id: range: 0 - 30.
- * id 31 is reserved to indicate an extended header.
- *
- * Large header:
- * id: range: 0 - 65534.
- * id 65535 is reserved to indicate an extended header.
+ * Called at library load: connect the probe on all enablers matching
+ * this event.
+ * Called with session mutex held.
  */
-static
-int _lttng_event_header_declare(struct lttng_session *session)
+int lttng_fix_pending_events(void)
 {
-       return lttng_metadata_printf(session,
-       "struct event_header_compact {\n"
-       "       enum : uint5_t { compact = 0 ... 30, extended = 31 } id;\n"
-       "       variant <id> {\n"
-       "               struct {\n"
-       "                       uint27_clock_monotonic_t timestamp;\n"
-       "               } compact;\n"
-       "               struct {\n"
-       "                       uint32_t id;\n"
-       "                       uint64_clock_monotonic_t timestamp;\n"
-       "               } extended;\n"
-       "       } v;\n"
-       "} align(%u);\n"
-       "\n"
-       "struct event_header_large {\n"
-       "       enum : uint16_t { compact = 0 ... 65534, extended = 65535 } id;\n"
-       "       variant <id> {\n"
-       "               struct {\n"
-       "                       uint32_clock_monotonic_t timestamp;\n"
-       "               } compact;\n"
-       "               struct {\n"
-       "                       uint32_t id;\n"
-       "                       uint64_clock_monotonic_t timestamp;\n"
-       "               } extended;\n"
-       "       } v;\n"
-       "} align(%u);\n\n",
-       lttng_alignof(uint32_t) * CHAR_BIT,
-       lttng_alignof(uint16_t) * CHAR_BIT
-       );
+       struct lttng_session *session;
+
+       cds_list_for_each_entry(session, &sessions, node) {
+               lttng_session_lazy_sync_enablers(session);
+       }
+       return 0;
 }
 
 /*
- * Approximation of NTP time of day to clock monotonic correlation,
- * taken at start of trace.
- * Yes, this is only an approximation. Yes, we can (and will) do better
- * in future versions.
+ * For each session of the owner thread, execute pending statedump.
+ * Only dump state for the sessions owned by the caller thread, because
+ * we don't keep ust_lock across the entire iteration.
  */
-static
-uint64_t measure_clock_offset(void)
+void lttng_handle_pending_statedump(void *owner)
 {
-       uint64_t offset, monotonic[2], realtime;
-       struct timespec rts = { 0, 0 };
-       int ret;
+       struct lttng_session *session;
 
-       monotonic[0] = trace_clock_read64();
-       ret = clock_gettime(CLOCK_REALTIME, &rts);      
-       if (ret < 0)
-               return 0;
-       monotonic[1] = trace_clock_read64();
-       offset = (monotonic[0] + monotonic[1]) >> 1;
-       realtime = (uint64_t) rts.tv_sec * 1000000000ULL;
-       realtime += rts.tv_nsec;
-       offset = realtime - offset;
-       return offset;
+       /* Execute state dump */
+       do_lttng_ust_statedump(owner);
+
+       /* Clear pending state dump */
+       if (ust_lock()) {
+               goto end;
+       }
+       cds_list_for_each_entry(session, &sessions, node) {
+               if (session->owner != owner)
+                       continue;
+               if (!session->statedump_pending)
+                       continue;
+               session->statedump_pending = 0;
+       }
+end:
+       ust_unlock();
+       return;
 }
 
 /*
- * Output metadata into this session's metadata buffers.
+ * Only used internally at session destruction.
  */
 static
-int _lttng_session_metadata_statedump(struct lttng_session *session)
+void _lttng_event_destroy(struct lttng_event *event)
 {
-       unsigned char *uuid_c = session->uuid;
-       char uuid_s[LTTNG_UST_UUID_STR_LEN],
-               clock_uuid_s[LTTNG_UST_UUID_STR_LEN];
-       struct lttng_channel *chan;
-       struct lttng_event *event;
-       int ret = 0;
-       char procname[LTTNG_UST_PROCNAME_LEN] = "";
-       char hostname[HOST_NAME_MAX];
+       struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref;
 
-       if (!CMM_ACCESS_ONCE(session->active))
-               return 0;
-       if (session->metadata_dumped)
-               goto skip_session;
-       if (!session->metadata) {
-               DBG("LTTng: attempt to start tracing, but metadata channel is not found. Operation abort.\n");
-               return -EPERM;
-       }
+       /* Remove from event list. */
+       cds_list_del(&event->node);
+       /* Remove from event hash table. */
+       cds_hlist_del(&event->hlist);
 
-       snprintf(uuid_s, sizeof(uuid_s),
-               "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-               uuid_c[0], uuid_c[1], uuid_c[2], uuid_c[3],
-               uuid_c[4], uuid_c[5], uuid_c[6], uuid_c[7],
-               uuid_c[8], uuid_c[9], uuid_c[10], uuid_c[11],
-               uuid_c[12], uuid_c[13], uuid_c[14], uuid_c[15]);
-
-       ret = lttng_metadata_printf(session,
-               "typealias integer { size = 8; align = %u; signed = false; } := uint8_t;\n"
-               "typealias integer { size = 16; align = %u; signed = false; } := uint16_t;\n"
-               "typealias integer { size = 32; align = %u; signed = false; } := uint32_t;\n"
-               "typealias integer { size = 64; align = %u; signed = false; } := uint64_t;\n"
-               "typealias integer { size = %u; align = %u; signed = false; } := unsigned long;\n"
-               "typealias integer { size = 5; align = 1; signed = false; } := uint5_t;\n"
-               "typealias integer { size = 27; align = 1; signed = false; } := uint27_t;\n"
-               "\n"
-               "trace {\n"
-               "       major = %u;\n"
-               "       minor = %u;\n"
-               "       uuid = \"%s\";\n"
-               "       byte_order = %s;\n"
-               "       packet.header := struct {\n"
-               "               uint32_t magic;\n"
-               "               uint8_t  uuid[16];\n"
-               "               uint32_t stream_id;\n"
-               "       };\n"
-               "};\n\n",
-               lttng_alignof(uint8_t) * CHAR_BIT,
-               lttng_alignof(uint16_t) * CHAR_BIT,
-               lttng_alignof(uint32_t) * CHAR_BIT,
-               lttng_alignof(uint64_t) * CHAR_BIT,
-               sizeof(unsigned long) * CHAR_BIT,
-               lttng_alignof(unsigned long) * CHAR_BIT,
-               CTF_SPEC_MAJOR,
-               CTF_SPEC_MINOR,
-               uuid_s,
-#if (BYTE_ORDER == BIG_ENDIAN)
-               "be"
-#else
-               "le"
-#endif
-               );
-       if (ret)
-               goto end;
+       lttng_destroy_context(event->ctx);
+       lttng_free_event_filter_runtime(event);
+       /* Free event enabler refs */
+       cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref,
+                       &event->enablers_ref_head, node)
+               free(enabler_ref);
+       free(event);
+}
 
-       /* ignore error, just use empty string if error. */
-       hostname[0] = '\0';
-       ret = gethostname(hostname, sizeof(hostname));
-       if (ret && errno == ENAMETOOLONG)
-               hostname[HOST_NAME_MAX - 1] = '\0';
-       lttng_ust_getprocname(procname);
-       procname[LTTNG_UST_PROCNAME_LEN - 1] = '\0';
-       ret = lttng_metadata_printf(session,
-               "env {\n"
-               "       hostname = \"%s\";\n"
-               "       vpid = %d;\n"
-               "       procname = \"%s\";\n"
-               "       domain = \"ust\";\n"
-               "       tracer_name = \"lttng-ust\";\n"
-               "       tracer_major = %u;\n"
-               "       tracer_minor = %u;\n"
-               "       tracer_patchlevel = %u;\n"
-               "};\n\n",
-               hostname,
-               (int) getpid(),
-               procname,
-               LTTNG_UST_MAJOR_VERSION,
-               LTTNG_UST_MINOR_VERSION,
-               LTTNG_UST_PATCHLEVEL_VERSION
-               );
-       if (ret)
-               goto end;
+static
+void _lttng_enum_destroy(struct lttng_enum *_enum)
+{
+       cds_list_del(&_enum->node);
+       cds_hlist_del(&_enum->hlist);
+       free(_enum);
+}
 
-       ret = lttng_metadata_printf(session,
-               "clock {\n"
-               "       name = %s;\n",
-               "monotonic"
-               );
-       if (ret)
-               goto end;
+void lttng_ust_events_exit(void)
+{
+       struct lttng_session *session, *tmpsession;
 
-       if (!trace_clock_uuid(clock_uuid_s)) {
-               ret = lttng_metadata_printf(session,
-                       "       uuid = \"%s\";\n",
-                       clock_uuid_s
-                       );
-               if (ret)
-                       goto end;
-       }
+       cds_list_for_each_entry_safe(session, tmpsession, &sessions, node)
+               lttng_session_destroy(session);
+}
 
-       ret = lttng_metadata_printf(session,
-               "       description = \"Monotonic Clock\";\n"
-               "       freq = %" PRIu64 "; /* Frequency, in Hz */\n"
-               "       /* clock value offset from Epoch is: offset * (1/freq) */\n"
-               "       offset = %" PRIu64 ";\n"
-               "};\n\n",
-               trace_clock_freq(),
-               measure_clock_offset()
-               );
-       if (ret)
-               goto end;
+/*
+ * Enabler management.
+ */
+struct lttng_enabler *lttng_enabler_create(enum lttng_enabler_type type,
+               struct lttng_ust_event *event_param,
+               struct lttng_channel *chan)
+{
+       struct lttng_enabler *enabler;
 
-       ret = lttng_metadata_printf(session,
-               "typealias integer {\n"
-               "       size = 27; align = 1; signed = false;\n"
-               "       map = clock.monotonic.value;\n"
-               "} := uint27_clock_monotonic_t;\n"
-               "\n"
-               "typealias integer {\n"
-               "       size = 32; align = %u; signed = false;\n"
-               "       map = clock.monotonic.value;\n"
-               "} := uint32_clock_monotonic_t;\n"
-               "\n"
-               "typealias integer {\n"
-               "       size = 64; align = %u; signed = false;\n"
-               "       map = clock.monotonic.value;\n"
-               "} := uint64_clock_monotonic_t;\n\n",
-               lttng_alignof(uint32_t) * CHAR_BIT,
-               lttng_alignof(uint64_t) * CHAR_BIT
-               );
-       if (ret)
-               goto end;
+       enabler = zmalloc(sizeof(*enabler));
+       if (!enabler)
+               return NULL;
+       enabler->type = type;
+       CDS_INIT_LIST_HEAD(&enabler->filter_bytecode_head);
+       CDS_INIT_LIST_HEAD(&enabler->excluder_head);
+       memcpy(&enabler->event_param, event_param,
+               sizeof(enabler->event_param));
+       enabler->chan = chan;
+       /* ctx left NULL */
+       enabler->enabled = 0;
+       cds_list_add(&enabler->node, &enabler->chan->session->enablers_head);
+       lttng_session_lazy_sync_enablers(enabler->chan->session);
+       return enabler;
+}
 
-       ret = _lttng_stream_packet_context_declare(session);
-       if (ret)
-               goto end;
+int lttng_enabler_enable(struct lttng_enabler *enabler)
+{
+       enabler->enabled = 1;
+       lttng_session_lazy_sync_enablers(enabler->chan->session);
+       return 0;
+}
 
-       ret = _lttng_event_header_declare(session);
-       if (ret)
-               goto end;
+int lttng_enabler_disable(struct lttng_enabler *enabler)
+{
+       enabler->enabled = 0;
+       lttng_session_lazy_sync_enablers(enabler->chan->session);
+       return 0;
+}
 
-skip_session:
-       cds_list_for_each_entry(chan, &session->chan, list) {
-               ret = _lttng_channel_metadata_statedump(session, chan);
-               if (ret)
-                       goto end;
-       }
+int lttng_enabler_attach_bytecode(struct lttng_enabler *enabler,
+               struct lttng_ust_filter_bytecode_node *bytecode)
+{
+       bytecode->enabler = enabler;
+       cds_list_add_tail(&bytecode->node, &enabler->filter_bytecode_head);
+       lttng_session_lazy_sync_enablers(enabler->chan->session);
+       return 0;
+}
 
-       cds_list_for_each_entry(event, &session->events, list) {
-               ret = _lttng_event_metadata_statedump(session, event->chan, event);
-               if (ret)
-                       goto end;
-       }
-       session->metadata_dumped = 1;
-end:
-       return ret;
+int lttng_enabler_attach_exclusion(struct lttng_enabler *enabler,
+               struct lttng_ust_excluder_node *excluder)
+{
+       excluder->enabler = enabler;
+       cds_list_add_tail(&excluder->node, &enabler->excluder_head);
+       lttng_session_lazy_sync_enablers(enabler->chan->session);
+       return 0;
 }
 
-void lttng_ust_events_exit(void)
+int lttng_attach_context(struct lttng_ust_context *context_param,
+               union ust_args *uargs,
+               struct lttng_ctx **ctx, struct lttng_session *session)
 {
-       struct lttng_session *session, *tmpsession;
+       /*
+        * We cannot attach a context after trace has been started for a
+        * session because the metadata does not allow expressing this
+        * information outside of the original channel scope.
+        */
+       if (session->been_active)
+               return -EPERM;
 
-       cds_list_for_each_entry_safe(session, tmpsession, &sessions, list)
-               lttng_session_destroy(session);
+       switch (context_param->ctx) {
+       case LTTNG_UST_CONTEXT_PTHREAD_ID:
+               return lttng_add_pthread_id_to_ctx(ctx);
+       case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+       {
+               struct lttng_ust_perf_counter_ctx *perf_ctx_param;
+
+               perf_ctx_param = &context_param->u.perf_counter;
+               return lttng_add_perf_counter_to_ctx(
+                       perf_ctx_param->type,
+                       perf_ctx_param->config,
+                       perf_ctx_param->name,
+                       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);
+       case LTTNG_UST_CONTEXT_IP:
+               return lttng_add_ip_to_ctx(ctx);
+       case LTTNG_UST_CONTEXT_CPU_ID:
+               return lttng_add_cpu_id_to_ctx(ctx);
+       case LTTNG_UST_CONTEXT_APP_CONTEXT:
+               return lttng_ust_add_app_context_to_ctx_rcu(uargs->app_context.ctxname,
+                       ctx);
+       default:
+               return -EINVAL;
+       }
 }
 
-/* WILDCARDS */
-
-static
-int wildcard_same_loglevel(struct wildcard_entry *e,
-       enum lttng_ust_loglevel_type loglevel_type,
-       int loglevel)
+int lttng_enabler_attach_context(struct lttng_enabler *enabler,
+               struct lttng_ust_context *context_param)
 {
-       if (e->loglevel_type == loglevel_type && e->loglevel == loglevel)
-               return 1;
-       else
-               return 0;
+#if 0  // disabled for now.
+       struct lttng_session *session = enabler->chan->session;
+       int ret;
+
+       ret = lttng_attach_context(context_param, &enabler->ctx,
+                       session);
+       if (ret)
+               return ret;
+       lttng_session_lazy_sync_enablers(enabler->chan->session);
+#endif
+       return -ENOSYS;
 }
 
-#if 0
 static
-int wildcard_is_within(struct wildcard_entry *e,
-       enum lttng_ust_loglevel_type loglevel_type,
-       int loglevel)
+void lttng_enabler_destroy(struct lttng_enabler *enabler)
 {
-       if (e->loglevel_type == LTTNG_UST_LOGLEVEL_ALL
-                       || e->loglevel == -1)
-               return 1;
-       switch (e->loglevel_type) {
-       case LTTNG_UST_LOGLEVEL_RANGE:
-               switch (loglevel_type) {
-               case LTTNG_UST_LOGLEVEL_RANGE:
-                       if (e->loglevel >= loglevel)
-                               return 1;
-                       else
-                               return 0;
-               case LTTNG_UST_LOGLEVEL_SINGLE:
-                       if (e->loglevel <= 0 && loglevel == 0)
-                               return 1;
-                       else
-                               return 0;
-               }
-       case LTTNG_UST_LOGLEVEL_SINGLE:
-               switch (loglevel_type) {
-               case LTTNG_UST_LOGLEVEL_RANGE:
-                       if (loglevel <= 0)
-                               return 1;
-                       else
-                               return 0;
-               case LTTNG_UST_LOGLEVEL_SINGLE:
-                       if (e->loglevel == loglevel)
-                               return 1;
-                       else
-                               return 0;
-               }
+       struct lttng_ust_filter_bytecode_node *filter_node, *tmp_filter_node;
+       struct lttng_ust_excluder_node *excluder_node, *tmp_excluder_node;
+
+       /* Destroy filter bytecode */
+       cds_list_for_each_entry_safe(filter_node, tmp_filter_node,
+                       &enabler->filter_bytecode_head, node) {
+               free(filter_node);
        }
+
+       /* Destroy excluders */
+       cds_list_for_each_entry_safe(excluder_node, tmp_excluder_node,
+                       &enabler->excluder_head, node) {
+               free(excluder_node);
+       }
+
+       /* Destroy contexts */
+       lttng_destroy_context(enabler->ctx);
+
+       cds_list_del(&enabler->node);
+       free(enabler);
 }
-#endif
 
 /*
- * Add the wildcard to the wildcard list. Must be called with
- * ust lock held.
+ * lttng_session_sync_enablers should be called just before starting a
+ * session.
  */
 static
-struct session_wildcard *add_wildcard(struct lttng_channel *chan,
-       struct lttng_ust_event *event_param)
+void lttng_session_sync_enablers(struct lttng_session *session)
 {
-       struct wildcard_entry *e;
-       struct session_wildcard *sw;
-       size_t name_len = strlen(event_param->name) + 1;
-       int found = 0;
-
-       //FIXME: ensure that wildcard re-use pending events, or
-       //re-use actual events, applying its filter on top.
+       struct lttng_enabler *enabler;
+       struct lttng_event *event;
 
+       cds_list_for_each_entry(enabler, &session->enablers_head, node)
+               lttng_enabler_ref_events(enabler);
        /*
-        * Try to find global wildcard entry. Given that this is shared
-        * across all sessions, we need to check for exact loglevel
-        * match, not just whether contained within the existing ones.
+        * 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(e, &wildcard_list, list) {
-               if (!strncmp(event_param->name, e->name,
-                               LTTNG_UST_SYM_NAME_LEN - 1)) {
-                       if (wildcard_same_loglevel(e,
-                                       event_param->loglevel_type,
-                                       event_param->loglevel)) {
-                               found = 1;
+       cds_list_for_each_entry(event, &session->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) {
+                       if (enabler_ref->ref->enabled) {
+                               enabled = 1;
                                break;
                        }
                }
-       }
+               /*
+                * Enabled state is based on union of enablers, with
+                * intesection of session and channel transient enable
+                * states.
+                */
+               enabled = enabled && session->tstate && event->chan->tstate;
 
-       if (!found) {
+               CMM_STORE_SHARED(event->enabled, enabled);
                /*
-                * Create global wildcard entry if not found. Using
-                * zmalloc here to allocate a variable length element.
-                * Could cause some memory fragmentation if overused.
+                * Sync tracepoint registration with event enabled
+                * state.
                 */
-               e = zmalloc(sizeof(struct wildcard_entry) + name_len);
-               if (!e)
-                       return ERR_PTR(-ENOMEM);
-               memcpy(&e->name[0], event_param->name, name_len);
-               e->loglevel_type = event_param->loglevel_type;
-               e->loglevel = event_param->loglevel;
-               CDS_INIT_LIST_HEAD(&e->filter_bytecode);
-               cds_list_add(&e->list, &wildcard_list);
-               CDS_INIT_LIST_HEAD(&e->session_list);
-       }
+               if (enabled) {
+                       if (!event->registered)
+                               register_event(event);
+               } else {
+                       if (event->registered)
+                               unregister_event(event);
+               }
+
+               /* Check if has enablers without bytecode enabled */
+               cds_list_for_each_entry(enabler_ref,
+                               &event->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 =
+                       has_enablers_without_bytecode;
 
-       /* session wildcard */
-       cds_list_for_each_entry(sw, &e->session_list, session_list) {
-               if (chan == sw->chan) {
-                       DBG("wildcard %s busy for this channel",
-                               event_param->name);
-                       return ERR_PTR(-EEXIST);        /* Already there */
+               /* Enable filters */
+               cds_list_for_each_entry(runtime,
+                               &event->bytecode_runtime_head, node) {
+                       lttng_filter_sync_state(runtime);
                }
        }
-       sw = zmalloc(sizeof(struct session_wildcard));
-       if (!sw)
-               return ERR_PTR(-ENOMEM);
-       sw->chan = chan;
-       sw->enabled = 1;
-       memcpy(&sw->event_param, event_param, sizeof(sw->event_param));
-       sw->event_param.instrumentation = LTTNG_UST_TRACEPOINT;
-       sw->event_param.loglevel_type = event_param->loglevel_type;
-       sw->event_param.loglevel = event_param->loglevel;
-       CDS_INIT_LIST_HEAD(&sw->filter_bytecode);
-       CDS_INIT_LIST_HEAD(&sw->events);
-       cds_list_add(&sw->list, &chan->session->wildcards);
-       cds_list_add(&sw->session_list, &e->session_list);
-       sw->entry = e;
-       lttng_probes_create_wildcard_events(e, sw);
-       return sw;
+       __tracepoint_probe_prune_release_queue();
 }
 
 /*
- * Remove the wildcard from the wildcard list. Must be called with
- * ust_lock held. Only called at session teardown.
+ * Apply enablers to session events, adding events to session if need
+ * be. It is required after each modification applied to an active
+ * session, and right before session "start".
+ * "lazy" sync means we only sync if required.
  */
 static
-void _remove_wildcard(struct session_wildcard *wildcard)
+void lttng_session_lazy_sync_enablers(struct lttng_session *session)
 {
-       struct lttng_event *ev, *tmp;
-
-       /*
-        * Just remove the events owned (for enable/disable) by this
-        * wildcard from the list. The session teardown will take care
-        * of freeing the event memory.
-        */
-       cds_list_for_each_entry_safe(ev, tmp, &wildcard->events,
-                       wildcard_list) {
-               cds_list_del(&ev->wildcard_list);
-       }
-       cds_list_del(&wildcard->session_list);
-       cds_list_del(&wildcard->list);
-       if (cds_list_empty(&wildcard->entry->session_list)) {
-               cds_list_del(&wildcard->entry->list);
-               free(wildcard->entry);
-       }
-       lttng_free_wildcard_filter_bytecode(wildcard);
-       free(wildcard);
-}
-
-int lttng_wildcard_create(struct lttng_channel *chan,
-       struct lttng_ust_event *event_param,
-       struct session_wildcard **_sw)
-{
-       struct session_wildcard *sw;
-
-       sw = add_wildcard(chan, event_param);
-       if (!sw || IS_ERR(sw)) {
-               return PTR_ERR(sw);
-       }
-       *_sw = sw;
-       return 0;
+       /* We can skip if session is not active */
+       if (!session->active)
+               return;
+       lttng_session_sync_enablers(session);
 }
 
-static
-void _lttng_wildcard_destroy(struct session_wildcard *sw)
+/*
+ * Update all sessions with the given app context.
+ * Called with ust lock held.
+ * This is invoked when an application context gets loaded/unloaded. It
+ * ensures the context callbacks are in sync with the application
+ * context (either app context callbacks, or dummy callbacks).
+ */
+void lttng_ust_context_set_session_provider(const char *name,
+               size_t (*get_size)(struct lttng_ctx_field *field, size_t offset),
+               void (*record)(struct lttng_ctx_field *field,
+                       struct lttng_ust_lib_ring_buffer_ctx *ctx,
+                       struct lttng_channel *chan),
+               void (*get_value)(struct lttng_ctx_field *field,
+                       struct lttng_ctx_value *value))
 {
-       _remove_wildcard(sw);
-}
+       struct lttng_session *session;
 
-int lttng_wildcard_enable(struct session_wildcard *wildcard)
-{
-       struct lttng_event *ev;
-       int ret;
+       cds_list_for_each_entry(session, &sessions, node) {
+               struct lttng_channel *chan;
+               struct lttng_event *event;
+               int ret;
 
-       if (wildcard->enabled)
-               return -EEXIST;
-       cds_list_for_each_entry(ev, &wildcard->events, wildcard_list) {
-               ret = lttng_event_enable(ev);
-               if (ret) {
-                       DBG("Error: enable error.\n");
-                       return ret;
+               ret = lttng_ust_context_set_provider_rcu(&session->ctx,
+                               name, get_size, record, get_value);
+               if (ret)
+                       abort();
+               cds_list_for_each_entry(chan, &session->chan_head, node) {
+                       ret = lttng_ust_context_set_provider_rcu(&chan->ctx,
+                                       name, get_size, record, get_value);
+                       if (ret)
+                               abort();
                }
-       }
-       wildcard->enabled = 1;
-       return 0;
-}
-
-int lttng_wildcard_disable(struct session_wildcard *wildcard)
-{
-       struct lttng_event *ev;
-       int ret;
-
-       if (!wildcard->enabled)
-               return -EEXIST;
-       cds_list_for_each_entry(ev, &wildcard->events, wildcard_list) {
-               ret = lttng_event_disable(ev);
-               if (ret) {
-                       DBG("Error: disable error.\n");
-                       return ret;
+               cds_list_for_each_entry(event, &session->events_head, node) {
+                       ret = lttng_ust_context_set_provider_rcu(&event->ctx,
+                                       name, get_size, record, get_value);
+                       if (ret)
+                               abort();
                }
        }
-       wildcard->enabled = 0;
-       return 0;
-}
-
-/*
- * Take the TLS "fault" in libuuid if dlopen'd, which can take the
- * dynamic linker mutex, outside of the UST lock, since the UST lock is
- * taken in constructors, which are called with dynamic linker mutex
- * held.
- */
-void lttng_fixup_event_tls(void)
-{
-       unsigned char uuid[LTTNG_UST_UUID_STR_LEN];
-
-       (void) lttng_ust_uuid_generate(uuid);
 }
This page took 0.048695 seconds and 4 git commands to generate.