Refactoring: UST types public interfaces
[lttng-ust.git] / liblttng-ust / lttng-events.c
index af06d4908db52dcd2d382a6cdef4b858de6a601b..625d98af7e8a7d5549da43f0860a3a53fc97dd01 100644 (file)
@@ -70,15 +70,13 @@ struct cds_list_head *lttng_get_sessions(void)
        return &sessions;
 }
 
-static void _lttng_event_recorder_destroy(struct lttng_ust_event_recorder *event_recorder);
-static void _lttng_event_notifier_destroy(
-               struct lttng_ust_event_notifier *event_notifier);
+static void _lttng_event_destroy(struct lttng_ust_event_common *event);
 static void _lttng_enum_destroy(struct lttng_enum *_enum);
 
 static
-void lttng_session_lazy_sync_event_enablers(struct lttng_session *session);
+void lttng_session_lazy_sync_event_enablers(struct lttng_ust_session *session);
 static
-void lttng_session_sync_event_enablers(struct lttng_session *session);
+void lttng_session_sync_event_enablers(struct lttng_ust_session *session);
 static
 void lttng_event_notifier_group_sync_enablers(
                struct lttng_event_notifier_group *event_notifier_group);
@@ -129,16 +127,16 @@ int lttng_loglevel_match(int loglevel,
        }
 }
 
-struct lttng_session *lttng_session_create(void)
+struct lttng_ust_session *lttng_session_create(void)
 {
-       struct lttng_session *session;
+       struct lttng_ust_session *session;
        struct lttng_ust_session_private *session_priv;
        int i;
 
-       session = zmalloc(sizeof(struct lttng_session));
+       session = zmalloc(sizeof(struct lttng_ust_session));
        if (!session)
                return NULL;
-       session->struct_size = sizeof(struct lttng_session);
+       session->struct_size = sizeof(struct lttng_ust_session);
        session_priv = zmalloc(sizeof(struct lttng_ust_session_private));
        if (!session_priv) {
                free(session);
@@ -234,7 +232,7 @@ struct lttng_event_notifier_group *lttng_event_notifier_group_create(void)
 static
 void _lttng_channel_unmap(struct lttng_channel *lttng_chan)
 {
-       struct channel *chan;
+       struct lttng_ust_lib_ring_buffer_channel *chan;
        struct lttng_ust_shm_handle *handle;
 
        cds_list_del(&lttng_chan->node);
@@ -249,88 +247,45 @@ void _lttng_channel_unmap(struct lttng_channel *lttng_chan)
 }
 
 static
-void register_event_recorder(struct lttng_ust_event_recorder *event_recorder)
+void register_event(struct lttng_ust_event_common *event)
 {
        int ret;
-       const struct lttng_event_desc *desc;
+       struct lttng_ust_event_desc *desc;
 
-       assert(event_recorder->parent->priv->registered == 0);
-       desc = event_recorder->parent->priv->desc;
-       ret = __tracepoint_probe_register_queue_release(desc->name,
+       assert(event->priv->registered == 0);
+       desc = event->priv->desc;
+       ret = lttng_ust_tp_probe_register_queue_release(desc->name,
                        desc->probe_callback,
-                       event_recorder, desc->signature);
+                       event, desc->signature);
        WARN_ON_ONCE(ret);
        if (!ret)
-               event_recorder->parent->priv->registered = 1;
+               event->priv->registered = 1;
 }
 
 static
-void register_event_notifier(struct lttng_ust_event_notifier *event_notifier)
+void unregister_event(struct lttng_ust_event_common *event)
 {
        int ret;
-       const struct lttng_event_desc *desc;
+       struct lttng_ust_event_desc *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->parent->priv->registered = 1;
-}
-
-static
-void unregister_event_recorder(struct lttng_ust_event_recorder *event_recorder)
-{
-       int ret;
-       const struct lttng_event_desc *desc;
-
-       assert(event_recorder->parent->priv->registered == 1);
-       desc = event_recorder->parent->priv->desc;
-       ret = __tracepoint_probe_unregister_queue_release(desc->name,
+       assert(event->priv->registered == 1);
+       desc = event->priv->desc;
+       ret = lttng_ust_tp_probe_unregister_queue_release(desc->name,
                        desc->probe_callback,
-                       event_recorder);
-       WARN_ON_ONCE(ret);
-       if (!ret)
-               event_recorder->parent->priv->registered = 0;
-}
-
-static
-void unregister_event_notifier(struct lttng_ust_event_notifier *event_notifier)
-{
-       int ret;
-       const struct lttng_event_desc *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);
+                       event);
        WARN_ON_ONCE(ret);
        if (!ret)
-               event_notifier->parent->priv->registered = 0;
-}
-
-/*
- * Only used internally at session destruction.
- */
-static
-void _lttng_event_recorder_unregister(struct lttng_ust_event_recorder *event_recorder)
-{
-       if (event_recorder->parent->priv->registered)
-               unregister_event_recorder(event_recorder);
+               event->priv->registered = 0;
 }
 
-/*
- * Only used internally at session destruction.
- */
 static
-void _lttng_event_notifier_unregister(struct lttng_ust_event_notifier *event_notifier)
+void _lttng_event_unregister(struct lttng_ust_event_common *event)
 {
-       if (event_notifier->parent->priv->registered)
-               unregister_event_notifier(event_notifier);
+       if (event->priv->registered)
+               unregister_event(event);
 }
 
-void lttng_session_destroy(struct lttng_session *session)
+void lttng_session_destroy(struct lttng_ust_session *session)
 {
        struct lttng_channel *chan, *tmpchan;
        struct lttng_ust_event_recorder_private *event_recorder_priv, *tmpevent_recorder_priv;
@@ -339,16 +294,16 @@ void lttng_session_destroy(struct lttng_session *session)
 
        CMM_ACCESS_ONCE(session->active) = 0;
        cds_list_for_each_entry(event_recorder_priv, &session->priv->events_head, node) {
-               _lttng_event_recorder_unregister(event_recorder_priv->pub);
+               _lttng_event_unregister(event_recorder_priv->parent.pub);
        }
        lttng_ust_urcu_synchronize_rcu();       /* Wait for in-flight events to complete */
-       __tracepoint_probe_prune_release_queue();
+       lttng_ust_tp_probe_prune_release_queue();
        cds_list_for_each_entry_safe(event_enabler, event_tmpenabler,
                        &session->priv->enablers_head, node)
                lttng_event_enabler_destroy(event_enabler);
        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);
+               _lttng_event_destroy(event_recorder_priv->parent.pub);
        cds_list_for_each_entry_safe(_enum, tmp_enum,
                        &session->priv->enums_head, node)
                _lttng_enum_destroy(_enum);
@@ -365,15 +320,15 @@ void lttng_event_notifier_group_destroy(
 {
        int close_ret;
        struct lttng_event_notifier_enabler *notifier_enabler, *tmpnotifier_enabler;
-       struct lttng_ust_event_notifier_private *notifier_priv, *tmpnotifier_priv;
+       struct lttng_ust_event_notifier_private *event_notifier_priv, *tmpevent_notifier_priv;
 
        if (!event_notifier_group) {
                return;
        }
 
-       cds_list_for_each_entry(notifier_priv,
+       cds_list_for_each_entry(event_notifier_priv,
                        &event_notifier_group->event_notifiers_head, node)
-               _lttng_event_notifier_unregister(notifier_priv->pub);
+               _lttng_event_unregister(event_notifier_priv->parent.pub);
 
        lttng_ust_urcu_synchronize_rcu();
 
@@ -381,9 +336,9 @@ void lttng_event_notifier_group_destroy(
                        &event_notifier_group->enablers_head, node)
                lttng_event_notifier_enabler_destroy(notifier_enabler);
 
-       cds_list_for_each_entry_safe(notifier_priv, tmpnotifier_priv,
+       cds_list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv,
                        &event_notifier_group->event_notifiers_head, node)
-               _lttng_event_notifier_destroy(notifier_priv->pub);
+               _lttng_event_destroy(event_notifier_priv->parent.pub);
 
        if (event_notifier_group->error_counter)
                lttng_ust_counter_destroy(event_notifier_group->error_counter);
@@ -443,8 +398,8 @@ void lttng_enabler_destroy(struct lttng_enabler *enabler)
 }
 
 static
-int lttng_enum_create(const struct lttng_enum_desc *desc,
-               struct lttng_session *session)
+int lttng_enum_create(struct lttng_ust_enum_desc *desc,
+               struct lttng_ust_session *session)
 {
        const char *enum_name = desc->name;
        struct lttng_enum *_enum;
@@ -501,16 +456,16 @@ exist:
 }
 
 static
-int lttng_create_enum_check(const struct lttng_type *type,
-               struct lttng_session *session)
+int lttng_create_enum_check(struct lttng_ust_type_common *type,
+               struct lttng_ust_session *session)
 {
-       switch (type->atype) {
-       case atype_enum_nestable:
+       switch (type->type) {
+       case lttng_ust_type_enum:
        {
-               const struct lttng_enum_desc *enum_desc;
+               struct lttng_ust_enum_desc *enum_desc;
                int ret;
 
-               enum_desc = type->u.enum_nestable.desc;
+               enum_desc = lttng_ust_get_type_enum(type)->desc;
                ret = lttng_enum_create(enum_desc, session);
                if (ret && ret != -EEXIST) {
                        DBG("Unable to create enum error: (%d)", ret);
@@ -518,14 +473,14 @@ int lttng_create_enum_check(const struct lttng_type *type,
                }
                break;
        }
-       case atype_dynamic:
+       case lttng_ust_type_dynamic:
        {
-               const struct lttng_event_field *tag_field_generic;
-               const struct lttng_enum_desc *enum_desc;
+               struct lttng_ust_event_field *tag_field_generic;
+               struct lttng_ust_enum_desc *enum_desc;
                int ret;
 
                tag_field_generic = lttng_ust_dynamic_type_tag_field();
-               enum_desc = tag_field_generic->type.u.enum_nestable.desc;
+               enum_desc = lttng_ust_get_type_enum(tag_field_generic->type)->desc;
                ret = lttng_enum_create(enum_desc, session);
                if (ret && ret != -EEXIST) {
                        DBG("Unable to create enum error: (%d)", ret);
@@ -542,15 +497,15 @@ int lttng_create_enum_check(const struct lttng_type *type,
 
 static
 int lttng_create_all_event_enums(size_t nr_fields,
-               const struct lttng_event_field *event_fields,
-               struct lttng_session *session)
+               struct lttng_ust_event_field **event_fields,
+               struct lttng_ust_session *session)
 {
        size_t i;
        int ret;
 
        /* 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;
+               struct lttng_ust_type_common *type = event_fields[i]->type;
 
                ret = lttng_create_enum_check(type, session);
                if (ret)
@@ -561,15 +516,15 @@ int lttng_create_all_event_enums(size_t nr_fields,
 
 static
 int lttng_create_all_ctx_enums(size_t nr_fields,
-               const struct lttng_ctx_field *ctx_fields,
-               struct lttng_session *session)
+               struct lttng_ust_ctx_field **ctx_fields,
+               struct lttng_ust_session *session)
 {
        size_t i;
        int 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;
+               struct lttng_ust_type_common *type = ctx_fields[i]->event_field->type;
 
                ret = lttng_create_enum_check(type, session);
                if (ret)
@@ -582,14 +537,14 @@ int lttng_create_all_ctx_enums(size_t nr_fields,
  * 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)
+int lttng_session_statedump(struct lttng_ust_session *session)
 {
        session->priv->statedump_pending = 1;
        lttng_ust_sockinfo_session_enabled(session->priv->owner);
        return 0;
 }
 
-int lttng_session_enable(struct lttng_session *session)
+int lttng_session_enable(struct lttng_ust_session *session)
 {
        int ret = 0;
        struct lttng_channel *chan;
@@ -615,8 +570,8 @@ int lttng_session_enable(struct lttng_session *session)
         * we need to use.
         */
        cds_list_for_each_entry(chan, &session->priv->chan_head, node) {
-               const struct lttng_ctx *ctx;
-               const struct lttng_ctx_field *fields = NULL;
+               struct lttng_ust_ctx *ctx;
+               struct lttng_ust_ctx_field **fields = NULL;
                size_t nr_fields = 0;
                uint32_t chan_id;
 
@@ -664,7 +619,7 @@ end:
        return ret;
 }
 
-int lttng_session_disable(struct lttng_session *session)
+int lttng_session_disable(struct lttng_ust_session *session)
 {
        int ret = 0;
 
@@ -720,7 +675,7 @@ static inline
 struct cds_hlist_head *borrow_hash_table_bucket(
                struct cds_hlist_head *hash_table,
                unsigned int hash_table_size,
-               const struct lttng_event_desc *desc)
+               struct lttng_ust_event_desc *desc)
 {
        const char *event_name;
        size_t name_len;
@@ -737,12 +692,12 @@ struct cds_hlist_head *borrow_hash_table_bucket(
  * Supports event creation while tracing session is active.
  */
 static
-int lttng_event_recorder_create(const struct lttng_event_desc *desc,
+int lttng_event_recorder_create(struct lttng_ust_event_desc *desc,
                struct lttng_channel *chan)
 {
        struct lttng_ust_event_recorder *event_recorder;
        struct lttng_ust_event_recorder_private *event_recorder_priv;
-       struct lttng_session *session = chan->session;
+       struct lttng_ust_session *session = chan->session;
        struct cds_hlist_head *head;
        int ret = 0;
        int notify_socket, loglevel;
@@ -780,6 +735,8 @@ int lttng_event_recorder_create(const struct lttng_event_desc *desc,
                goto parent_error;
        }
        event_recorder->parent->struct_size = sizeof(struct lttng_ust_event_common);
+       event_recorder->parent->type = LTTNG_UST_EVENT_TYPE_RECORDER;
+       event_recorder->parent->child = event_recorder;
 
        event_recorder_priv = zmalloc(sizeof(struct lttng_ust_event_recorder_private));
        if (!event_recorder_priv) {
@@ -804,8 +761,8 @@ int lttng_event_recorder_create(const struct lttng_event_desc *desc,
                loglevel = *(*event_recorder->parent->priv->desc->loglevel);
        else
                loglevel = TRACE_DEFAULT;
-       if (desc->u.ext.model_emf_uri)
-               uri = *(desc->u.ext.model_emf_uri);
+       if (desc->model_emf_uri)
+               uri = *(desc->model_emf_uri);
        else
                uri = NULL;
 
@@ -826,8 +783,8 @@ int lttng_event_recorder_create(const struct lttng_event_desc *desc,
                goto sessiond_register_error;
        }
 
-       cds_list_add(&event_recorder->priv->node, &chan->session->priv->events_head);
-       cds_hlist_add_head(&event_recorder->priv->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:
@@ -843,7 +800,7 @@ socket_error:
 }
 
 static
-int lttng_event_notifier_create(const struct lttng_event_desc *desc,
+int lttng_event_notifier_create(struct lttng_ust_event_desc *desc,
                uint64_t token, uint64_t error_counter_index,
                struct lttng_event_notifier_group *event_notifier_group)
 {
@@ -873,6 +830,8 @@ int lttng_event_notifier_create(const struct lttng_event_desc *desc,
                goto parent_error;
        }
        event_notifier->parent->struct_size = sizeof(struct lttng_ust_event_common);
+       event_notifier->parent->type = LTTNG_UST_EVENT_TYPE_NOTIFIER;
+       event_notifier->parent->child = event_notifier;
 
        event_notifier_priv = zmalloc(sizeof(struct lttng_ust_event_notifier_private));
        if (!event_notifier_priv) {
@@ -913,28 +872,7 @@ error:
 }
 
 static
-void _lttng_event_notifier_destroy(struct lttng_ust_event_notifier *event_notifier)
-{
-       struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref;
-
-       /* Remove from event_notifier list. */
-       cds_list_del(&event_notifier->priv->node);
-       /* Remove from event_notifier hash table. */
-       cds_hlist_del(&event_notifier->priv->hlist);
-
-       lttng_free_event_filter_runtime(event_notifier->parent);
-
-       /* Free event_notifier enabler refs */
-       cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref,
-                       &event_notifier->priv->parent.enablers_ref_head, node)
-               free(enabler_ref);
-       free(event_notifier->priv);
-       free(event_notifier->parent);
-       free(event_notifier);
-}
-
-static
-int lttng_desc_match_star_glob_enabler(const struct lttng_event_desc *desc,
+int lttng_desc_match_star_glob_enabler(struct lttng_ust_event_desc *desc,
                struct lttng_enabler *enabler)
 {
        int loglevel = 0;
@@ -957,7 +895,7 @@ int lttng_desc_match_star_glob_enabler(const struct lttng_event_desc *desc,
 }
 
 static
-int lttng_desc_match_event_enabler(const struct lttng_event_desc *desc,
+int lttng_desc_match_event_enabler(struct lttng_ust_event_desc *desc,
                struct lttng_enabler *enabler)
 {
        int loglevel = 0;
@@ -979,7 +917,7 @@ int lttng_desc_match_event_enabler(const struct lttng_event_desc *desc,
 }
 
 static
-int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
+int lttng_desc_match_enabler(struct lttng_ust_event_desc *desc,
                struct lttng_enabler *enabler)
 {
        switch (enabler->format_type) {
@@ -1064,11 +1002,11 @@ struct lttng_enabler_ref *lttng_enabler_ref(
  * tracepoint probes.
  */
 static
-void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler)
+void lttng_create_event_recorder_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_ust_session *session = event_enabler->chan->session;
+       struct lttng_ust_probe_desc *probe_desc;
+       struct lttng_ust_event_desc *desc;
        struct lttng_ust_event_recorder_private *event_recorder_priv;
        int i;
        struct cds_list_head *probe_list;
@@ -1120,10 +1058,8 @@ 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_ust_event_recorder *event_recorder),
-               void (*event_notifier_func)(struct lttng_ust_event_notifier *event_notifier))
+void probe_provider_event_for_each(struct lttng_ust_probe_desc *provider_desc,
+               void (*event_func)(struct lttng_ust_event_common *event))
 {
        struct cds_hlist_node *node, *tmp_node;
        struct cds_list_head *sessionsp;
@@ -1137,12 +1073,12 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
         * sessions to queue the unregistration of the events.
         */
        for (i = 0; i < provider_desc->nr_events; i++) {
-               const struct lttng_event_desc *event_desc;
+               struct lttng_ust_event_desc *event_desc;
                struct lttng_event_notifier_group *event_notifier_group;
+               struct lttng_ust_event_recorder_private *event_recorder_priv;
                struct lttng_ust_event_notifier_private *event_notifier_priv;
                struct lttng_ust_session_private *session_priv;
                struct cds_hlist_head *head;
-               struct lttng_ust_event_recorder_private *event_recorder_priv;
 
                event_desc = provider_desc->event_desc[i];
 
@@ -1161,7 +1097,7 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
 
                        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);
+                                       event_func(event_recorder_priv->parent.pub);
                                        break;
                                }
                        }
@@ -1183,7 +1119,7 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
 
                        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);
+                                       event_func(event_notifier_priv->parent.pub);
                                        break;
                                }
                        }
@@ -1192,41 +1128,45 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
 }
 
 static
-void _unregister_event_recorder(struct lttng_session *session,
-               struct lttng_ust_event_recorder *event_recorder)
-{
-       _lttng_event_recorder_unregister(event_recorder);
-}
-
-static
-void _event_enum_destroy(struct lttng_session *session,
-               struct lttng_ust_event_recorder *event_recorder)
+void _event_enum_destroy(struct lttng_ust_event_common *event)
 {
-       unsigned int i;
 
-       /* Destroy enums of the current event. */
-       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_recorder->parent->priv->desc->fields[i]);
-               switch (field->type.atype) {
-               case atype_enum_nestable:
-                       enum_desc = field->type.u.enum_nestable.desc;
-                       break;
-               default:
-                       continue;
-               }
+       switch (event->type) {
+       case LTTNG_UST_EVENT_TYPE_RECORDER:
+       {
+               struct lttng_ust_event_recorder *event_recorder = event->child;
+               struct lttng_ust_session *session = event_recorder->chan->session;
+               unsigned int i;
+
+               /* Destroy enums of the current event. */
+               for (i = 0; i < event_recorder->parent->priv->desc->nr_fields; i++) {
+                       struct lttng_ust_enum_desc *enum_desc;
+                       struct lttng_ust_event_field *field;
+                       struct lttng_enum *curr_enum;
+
+                       field = event_recorder->parent->priv->desc->fields[i];
+                       switch (field->type->type) {
+                       case lttng_ust_type_enum:
+                               enum_desc = lttng_ust_get_type_enum(field->type)->desc;
+                               break;
+                       default:
+                               continue;
+                       }
 
-               curr_enum = lttng_ust_enum_get_from_desc(session, enum_desc);
-               if (curr_enum) {
-                       _lttng_enum_destroy(curr_enum);
+                       curr_enum = lttng_ust_enum_get_from_desc(session, enum_desc);
+                       if (curr_enum) {
+                               _lttng_enum_destroy(curr_enum);
+                       }
                }
+               break;
+       }
+       case LTTNG_UST_EVENT_TYPE_NOTIFIER:
+               break;
+       default:
+               abort();
        }
-
        /* Destroy event. */
-       _lttng_event_recorder_destroy(event_recorder);
+       _lttng_event_destroy(event);
 }
 
 /*
@@ -1235,26 +1175,24 @@ void _event_enum_destroy(struct lttng_session *session,
  * ust_lock held.
  */
 void lttng_probe_provider_unregister_events(
-               struct lttng_probe_desc *provider_desc)
+               struct lttng_ust_probe_desc *provider_desc)
 {
        /*
         * 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_recorder,
-               _lttng_event_notifier_unregister);
+       probe_provider_event_for_each(provider_desc, _lttng_event_unregister);
 
        /* Wait for grace period. */
        lttng_ust_urcu_synchronize_rcu();
        /* Prune the unregistration queue. */
-       __tracepoint_probe_prune_release_queue();
+       lttng_ust_tp_probe_prune_release_queue();
 
        /*
         * It is now safe to destroy the events and remove them from the event list
         * and hashtables.
         */
-       probe_provider_event_for_each(provider_desc, _event_enum_destroy,
-               _lttng_event_notifier_destroy);
+       probe_provider_event_for_each(provider_desc, _event_enum_destroy);
 }
 
 /*
@@ -1262,16 +1200,16 @@ void lttng_probe_provider_unregister_events(
  * and add backward reference from the event to the enabler.
  */
 static
-int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
+int lttng_event_enabler_ref_event_recorders(struct lttng_event_enabler *event_enabler)
 {
-       struct lttng_session *session = event_enabler->chan->session;
+       struct lttng_ust_session *session = event_enabler->chan->session;
        struct lttng_ust_event_recorder_private *event_recorder_priv;
 
        if (!lttng_event_enabler_as_enabler(event_enabler)->enabled)
                goto end;
 
        /* First ensure that probe events are created for this enabler. */
-       lttng_create_event_if_missing(event_enabler);
+       lttng_create_event_recorder_if_missing(event_enabler);
 
        /* For each event matching enabler in session event list. */
        cds_list_for_each_entry(event_recorder_priv, &session->priv->events_head, node) {
@@ -1363,28 +1301,50 @@ end:
        return;
 }
 
-/*
- * Only used internally at session destruction.
- */
 static
-void _lttng_event_recorder_destroy(struct lttng_ust_event_recorder *event_recorder)
+void _lttng_event_destroy(struct lttng_ust_event_common *event)
 {
        struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref;
 
-       /* Remove from event list. */
-       cds_list_del(&event_recorder->priv->node);
-       /* Remove from event hash table. */
-       cds_hlist_del(&event_recorder->priv->hlist);
-
-       lttng_destroy_context(event_recorder->ctx);
-       lttng_free_event_filter_runtime(event_recorder->parent);
+       lttng_free_event_filter_runtime(event);
        /* Free event enabler refs */
        cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref,
-                       &event_recorder->parent->priv->enablers_ref_head, node)
+                       &event->priv->enablers_ref_head, node)
                free(enabler_ref);
-       free(event_recorder->priv);
-       free(event_recorder->parent);
-       free(event_recorder);
+
+       switch (event->type) {
+       case LTTNG_UST_EVENT_TYPE_RECORDER:
+       {
+               struct lttng_ust_event_recorder *event_recorder = event->child;
+
+               /* Remove from event list. */
+               cds_list_del(&event_recorder->priv->node);
+               /* Remove from event hash table. */
+               cds_hlist_del(&event_recorder->priv->hlist);
+
+               lttng_destroy_context(event_recorder->ctx);
+               free(event_recorder->parent);
+               free(event_recorder->priv);
+               free(event_recorder);
+               break;
+       }
+       case LTTNG_UST_EVENT_TYPE_NOTIFIER:
+       {
+               struct lttng_ust_event_notifier *event_notifier = event->child;
+
+               /* Remove from event list. */
+               cds_list_del(&event_notifier->priv->node);
+               /* Remove from event hash table. */
+               cds_hlist_del(&event_notifier->priv->hlist);
+
+               free(event_notifier->priv);
+               free(event_notifier->parent);
+               free(event_notifier);
+               break;
+       }
+       default:
+               abort();
+       }
 }
 
 static
@@ -1586,7 +1546,7 @@ int lttng_event_notifier_enabler_attach_exclusion(
 
 int lttng_attach_context(struct lttng_ust_abi_context *context_param,
                union lttng_ust_abi_args *uargs,
-               struct lttng_ctx **ctx, struct lttng_session *session)
+               struct lttng_ust_ctx **ctx, struct lttng_ust_session *session)
 {
        /*
         * We cannot attach a context after trace has been started for a
@@ -1680,13 +1640,13 @@ void lttng_event_enabler_destroy(struct lttng_event_enabler *event_enabler)
  * session.
  */
 static
-void lttng_session_sync_event_enablers(struct lttng_session *session)
+void lttng_session_sync_event_enablers(struct lttng_ust_session *session)
 {
        struct lttng_event_enabler *event_enabler;
        struct lttng_ust_event_recorder_private *event_recorder_priv;
 
        cds_list_for_each_entry(event_enabler, &session->priv->enablers_head, node)
-               lttng_event_enabler_ref_events(event_enabler);
+               lttng_event_enabler_ref_event_recorders(event_enabler);
        /*
         * For each event, if at least one of its enablers is enabled,
         * and its channel and session transient states are enabled, we
@@ -1694,7 +1654,7 @@ void lttng_session_sync_event_enablers(struct lttng_session *session)
         */
        cds_list_for_each_entry(event_recorder_priv, &session->priv->events_head, node) {
                struct lttng_enabler_ref *enabler_ref;
-               struct lttng_bytecode_runtime *runtime;
+               struct lttng_ust_bytecode_runtime *runtime;
                int enabled = 0, has_enablers_without_bytecode = 0;
 
                /* Enable events */
@@ -1719,10 +1679,10 @@ void lttng_session_sync_event_enablers(struct lttng_session *session)
                 */
                if (enabled) {
                        if (!event_recorder_priv->parent.registered)
-                               register_event_recorder(event_recorder_priv->pub);
+                               register_event(event_recorder_priv->parent.pub);
                } else {
                        if (event_recorder_priv->parent.registered)
-                               unregister_event_recorder(event_recorder_priv->pub);
+                               unregister_event(event_recorder_priv->parent.pub);
                }
 
                /* Check if has enablers without bytecode enabled */
@@ -1743,12 +1703,12 @@ void lttng_session_sync_event_enablers(struct lttng_session *session)
                        lttng_bytecode_filter_sync_state(runtime);
                }
        }
-       __tracepoint_probe_prune_release_queue();
+       lttng_ust_tp_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)
+bool lttng_ust_probe_supports_event_notifier(struct lttng_ust_probe_desc *probe_desc)
 {
        return probe_desc->major >= 2;
 }
@@ -1758,7 +1718,7 @@ void lttng_create_event_notifier_if_missing(
                struct lttng_event_notifier_enabler *event_notifier_enabler)
 {
        struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group;
-       struct lttng_probe_desc *probe_desc;
+       struct lttng_ust_probe_desc *probe_desc;
        struct cds_list_head *probe_list;
        int i;
 
@@ -1768,7 +1728,7 @@ void lttng_create_event_notifier_if_missing(
                for (i = 0; i < probe_desc->nr_events; i++) {
                        int ret;
                        bool found = false;
-                       const struct lttng_event_desc *desc;
+                       struct lttng_ust_event_desc *desc;
                        struct lttng_ust_event_notifier_private *event_notifier_priv;
                        struct cds_hlist_head *head;
                        struct cds_hlist_node *node;
@@ -1912,7 +1872,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
         */
        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;
+               struct lttng_ust_bytecode_runtime *runtime;
                int enabled = 0, has_enablers_without_bytecode = 0;
 
                /* Enable event_notifiers */
@@ -1931,10 +1891,10 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
                 */
                if (enabled) {
                        if (!event_notifier_priv->parent.registered)
-                               register_event_notifier(event_notifier_priv->pub);
+                               register_event(event_notifier_priv->parent.pub);
                } else {
                        if (event_notifier_priv->parent.registered)
-                               unregister_event_notifier(event_notifier_priv->pub);
+                               unregister_event(event_notifier_priv->parent.pub);
                }
 
                /* Check if has enablers without bytecode enabled */
@@ -1961,7 +1921,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
                        lttng_bytecode_capture_sync_state(runtime);
                }
        }
-       __tracepoint_probe_prune_release_queue();
+       lttng_ust_tp_probe_prune_release_queue();
 }
 
 /*
@@ -1971,7 +1931,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
  * "lazy" sync means we only sync if required.
  */
 static
-void lttng_session_lazy_sync_event_enablers(struct lttng_session *session)
+void lttng_session_lazy_sync_event_enablers(struct lttng_ust_session *session)
 {
        /* We can skip if session is not active */
        if (!session->active)
@@ -1987,12 +1947,12 @@ void lttng_session_lazy_sync_event_enablers(struct lttng_session *session)
  * 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,
+               size_t (*get_size)(struct lttng_ust_ctx_field *field, size_t offset),
+               void (*record)(struct lttng_ust_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))
+               void (*get_value)(struct lttng_ust_ctx_field *field,
+                       struct lttng_ust_ctx_value *value))
 {
        struct lttng_ust_session_private *session_priv;
 
@@ -2028,12 +1988,12 @@ void lttng_ust_context_set_session_provider(const char *name,
  * context (either app context callbacks, or dummy callbacks).
  */
 void lttng_ust_context_set_event_notifier_group_provider(const char *name,
-               size_t (*get_size)(struct lttng_ctx_field *field, size_t offset),
-               void (*record)(struct lttng_ctx_field *field,
+               size_t (*get_size)(struct lttng_ust_ctx_field *field, size_t offset),
+               void (*record)(struct lttng_ust_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))
+               void (*get_value)(struct lttng_ust_ctx_field *field,
+                       struct lttng_ust_ctx_value *value))
 {
        struct lttng_event_notifier_group *event_notifier_group;
 
This page took 0.036867 seconds and 4 git commands to generate.