Introduce event type field in common structure
[lttng-ust.git] / liblttng-ust / lttng-events.c
index 0971f9eb2a7cb0bb03d72d2006a983cced5af7a2..c74db4551f7db631026f38c4451d6c4a196dabd0 100644 (file)
@@ -72,7 +72,7 @@ struct cds_list_head *lttng_get_sessions(void)
 
 static void _lttng_event_recorder_destroy(struct lttng_ust_event_recorder *event_recorder);
 static void _lttng_event_notifier_destroy(
-               struct lttng_event_notifier *event_notifier);
+               struct lttng_ust_event_notifier *event_notifier);
 static void _lttng_enum_destroy(struct lttng_enum *_enum);
 
 static
@@ -102,25 +102,25 @@ int lttng_session_active(void)
 static
 int lttng_loglevel_match(int loglevel,
                unsigned int has_loglevel,
-               enum lttng_ust_loglevel_type req_type,
+               enum lttng_ust_abi_loglevel_type req_type,
                int req_loglevel)
 {
        if (!has_loglevel)
                loglevel = TRACE_DEFAULT;
        switch (req_type) {
-       case LTTNG_UST_LOGLEVEL_RANGE:
+       case LTTNG_UST_ABI_LOGLEVEL_RANGE:
                if (loglevel <= req_loglevel
                                || (req_loglevel == -1 && loglevel <= TRACE_DEBUG))
                        return 1;
                else
                        return 0;
-       case LTTNG_UST_LOGLEVEL_SINGLE:
+       case LTTNG_UST_ABI_LOGLEVEL_SINGLE:
                if (loglevel == req_loglevel
                                || (req_loglevel == -1 && loglevel <= TRACE_DEBUG))
                        return 1;
                else
                        return 0;
-       case LTTNG_UST_LOGLEVEL_ALL:
+       case LTTNG_UST_ABI_LOGLEVEL_ALL:
        default:
                if (loglevel <= TRACE_DEBUG)
                        return 1;
@@ -265,18 +265,18 @@ void register_event_recorder(struct lttng_ust_event_recorder *event_recorder)
 }
 
 static
-void register_event_notifier(struct lttng_event_notifier *event_notifier)
+void register_event_notifier(struct lttng_ust_event_notifier *event_notifier)
 {
        int ret;
        const struct lttng_event_desc *desc;
 
-       assert(event_notifier->registered == 0);
-       desc = event_notifier->desc;
+       assert(event_notifier->parent->priv->registered == 0);
+       desc = event_notifier->parent->priv->desc;
        ret = __tracepoint_probe_register_queue_release(desc->name,
                desc->u.ext.event_notifier_callback, event_notifier, desc->signature);
        WARN_ON_ONCE(ret);
        if (!ret)
-               event_notifier->registered = 1;
+               event_notifier->parent->priv->registered = 1;
 }
 
 static
@@ -296,18 +296,18 @@ void unregister_event_recorder(struct lttng_ust_event_recorder *event_recorder)
 }
 
 static
-void unregister_event_notifier(struct lttng_event_notifier *event_notifier)
+void unregister_event_notifier(struct lttng_ust_event_notifier *event_notifier)
 {
        int ret;
        const struct lttng_event_desc *desc;
 
-       assert(event_notifier->registered == 1);
-       desc = event_notifier->desc;
+       assert(event_notifier->parent->priv->registered == 1);
+       desc = event_notifier->parent->priv->desc;
        ret = __tracepoint_probe_unregister_queue_release(desc->name,
                desc->u.ext.event_notifier_callback, event_notifier);
        WARN_ON_ONCE(ret);
        if (!ret)
-               event_notifier->registered = 0;
+               event_notifier->parent->priv->registered = 0;
 }
 
 /*
@@ -324,9 +324,9 @@ void _lttng_event_recorder_unregister(struct lttng_ust_event_recorder *event_rec
  * Only used internally at session destruction.
  */
 static
-void _lttng_event_notifier_unregister(struct lttng_event_notifier *event_notifier)
+void _lttng_event_notifier_unregister(struct lttng_ust_event_notifier *event_notifier)
 {
-       if (event_notifier->registered)
+       if (event_notifier->parent->priv->registered)
                unregister_event_notifier(event_notifier);
 }
 
@@ -365,15 +365,15 @@ void lttng_event_notifier_group_destroy(
 {
        int close_ret;
        struct lttng_event_notifier_enabler *notifier_enabler, *tmpnotifier_enabler;
-       struct lttng_event_notifier *notifier, *tmpnotifier;
+       struct lttng_ust_event_notifier_private *notifier_priv, *tmpnotifier_priv;
 
        if (!event_notifier_group) {
                return;
        }
 
-       cds_list_for_each_entry(notifier,
+       cds_list_for_each_entry(notifier_priv,
                        &event_notifier_group->event_notifiers_head, node)
-               _lttng_event_notifier_unregister(notifier);
+               _lttng_event_notifier_unregister(notifier_priv->pub);
 
        lttng_ust_urcu_synchronize_rcu();
 
@@ -381,9 +381,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, tmpnotifier,
+       cds_list_for_each_entry_safe(notifier_priv, tmpnotifier_priv,
                        &event_notifier_group->event_notifiers_head, node)
-               _lttng_event_notifier_destroy(notifier);
+               _lttng_event_notifier_destroy(notifier_priv->pub);
 
        if (event_notifier_group->error_counter)
                lttng_ust_counter_destroy(event_notifier_group->error_counter);
@@ -774,12 +774,13 @@ int lttng_event_recorder_create(const struct lttng_event_desc *desc,
        }
        event_recorder->struct_size = sizeof(struct lttng_ust_event_recorder);
 
-       event_recorder->parent = zmalloc(sizeof(struct lttng_event_common));
+       event_recorder->parent = zmalloc(sizeof(struct lttng_ust_event_common));
        if (!event_recorder->parent) {
                ret = -ENOMEM;
                goto parent_error;
        }
-       event_recorder->parent->struct_size = sizeof(struct lttng_event_common);
+       event_recorder->parent->struct_size = sizeof(struct lttng_ust_event_common);
+       event_recorder->parent->type = LTTNG_UST_EVENT_TYPE_RECORDER;
 
        event_recorder_priv = zmalloc(sizeof(struct lttng_ust_event_recorder_private));
        if (!event_recorder_priv) {
@@ -847,7 +848,8 @@ int lttng_event_notifier_create(const struct lttng_event_desc *desc,
                uint64_t token, uint64_t error_counter_index,
                struct lttng_event_notifier_group *event_notifier_group)
 {
-       struct lttng_event_notifier *event_notifier;
+       struct lttng_ust_event_notifier *event_notifier;
+       struct lttng_ust_event_notifier_private *event_notifier_priv;
        struct cds_hlist_head *head;
        int ret = 0;
 
@@ -859,52 +861,77 @@ int lttng_event_notifier_create(const struct lttng_event_desc *desc,
                event_notifier_group->event_notifiers_ht.table,
                LTTNG_UST_EVENT_NOTIFIER_HT_SIZE, desc);
 
-       event_notifier = zmalloc(sizeof(struct lttng_event_notifier));
+       event_notifier = zmalloc(sizeof(struct lttng_ust_event_notifier));
        if (!event_notifier) {
                ret = -ENOMEM;
                goto error;
        }
+       event_notifier->struct_size = sizeof(struct lttng_ust_event_notifier);
 
-       event_notifier->group = event_notifier_group;
-       event_notifier->user_token = token;
-       event_notifier->error_counter_index = error_counter_index;
+       event_notifier->parent = zmalloc(sizeof(struct lttng_ust_event_common));
+       if (!event_notifier->parent) {
+               ret = -ENOMEM;
+               goto parent_error;
+       }
+       event_notifier->parent->struct_size = sizeof(struct lttng_ust_event_common);
+       event_notifier->parent->type = LTTNG_UST_EVENT_TYPE_NOTIFIER;
+
+       event_notifier_priv = zmalloc(sizeof(struct lttng_ust_event_notifier_private));
+       if (!event_notifier_priv) {
+               ret = -ENOMEM;
+               goto priv_error;
+       }
+       event_notifier->priv = event_notifier_priv;
+       event_notifier_priv->pub = event_notifier;
+       event_notifier->parent->priv = &event_notifier_priv->parent;
+       event_notifier_priv->parent.pub = event_notifier->parent;
+
+       event_notifier_priv->group = event_notifier_group;
+       event_notifier_priv->parent.user_token = token;
+       event_notifier_priv->error_counter_index = error_counter_index;
 
        /* Event notifier will be enabled by enabler sync. */
-       event_notifier->enabled = 0;
-       event_notifier->registered = 0;
+       event_notifier->parent->enabled = 0;
+       event_notifier_priv->parent.registered = 0;
 
-       CDS_INIT_LIST_HEAD(&event_notifier->filter_bytecode_runtime_head);
+       CDS_INIT_LIST_HEAD(&event_notifier->parent->filter_bytecode_runtime_head);
        CDS_INIT_LIST_HEAD(&event_notifier->capture_bytecode_runtime_head);
-       CDS_INIT_LIST_HEAD(&event_notifier->enablers_ref_head);
-       event_notifier->desc = desc;
+       CDS_INIT_LIST_HEAD(&event_notifier_priv->parent.enablers_ref_head);
+       event_notifier_priv->parent.desc = desc;
        event_notifier->notification_send = lttng_event_notifier_notification_send;
 
-       cds_list_add(&event_notifier->node,
+       cds_list_add(&event_notifier_priv->node,
                        &event_notifier_group->event_notifiers_head);
-       cds_hlist_add_head(&event_notifier->hlist, head);
+       cds_hlist_add_head(&event_notifier_priv->hlist, head);
 
        return 0;
 
+priv_error:
+       free(event_notifier->parent);
+parent_error:
+       free(event_notifier);
 error:
        return ret;
 }
 
 static
-void _lttng_event_notifier_destroy(struct lttng_event_notifier *event_notifier)
+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->node);
+       cds_list_del(&event_notifier->priv->node);
        /* Remove from event_notifier hash table. */
-       cds_hlist_del(&event_notifier->hlist);
+       cds_hlist_del(&event_notifier->priv->hlist);
 
-       lttng_free_event_notifier_filter_runtime(event_notifier);
+       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->enablers_ref_head, node)
+                       &event_notifier->priv->parent.enablers_ref_head, node)
                free(enabler_ref);
+       free(event_notifier->priv);
+       free(event_notifier->parent);
        free(event_notifier);
 }
 
@@ -978,8 +1005,8 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
                                char *excluder_name;
 
                                excluder_name = (char *) (excluder->excluder.names)
-                                               + count * LTTNG_UST_SYM_NAME_LEN;
-                               len = strnlen(excluder_name, LTTNG_UST_SYM_NAME_LEN);
+                                               + count * LTTNG_UST_ABI_SYM_NAME_LEN;
+                               len = strnlen(excluder_name, LTTNG_UST_ABI_SYM_NAME_LEN);
                                if (len > 0 && strutils_star_glob_match(excluder_name, len, desc->name, SIZE_MAX))
                                        return 0;
                        }
@@ -1008,13 +1035,13 @@ int lttng_event_enabler_match_event(struct lttng_event_enabler *event_enabler,
 static
 int lttng_event_notifier_enabler_match_event_notifier(
                struct lttng_event_notifier_enabler *event_notifier_enabler,
-               struct lttng_event_notifier *event_notifier)
+               struct lttng_ust_event_notifier *event_notifier)
 {
-       int desc_matches = lttng_desc_match_enabler(event_notifier->desc,
+       int desc_matches = lttng_desc_match_enabler(event_notifier->priv->parent.desc,
                lttng_event_notifier_enabler_as_enabler(event_notifier_enabler));
 
-       if (desc_matches && event_notifier->group == event_notifier_enabler->group &&
-                       event_notifier->user_token == event_notifier_enabler->user_token)
+       if (desc_matches && event_notifier->priv->group == event_notifier_enabler->group &&
+                       event_notifier->priv->parent.user_token == event_notifier_enabler->user_token)
                return 1;
        else
                return 0;
@@ -1098,7 +1125,7 @@ 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_event_notifier *event_notifier))
+               void (*event_notifier_func)(struct lttng_ust_event_notifier *event_notifier))
 {
        struct cds_hlist_node *node, *tmp_node;
        struct cds_list_head *sessionsp;
@@ -1114,7 +1141,7 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
        for (i = 0; i < provider_desc->nr_events; i++) {
                const struct lttng_event_desc *event_desc;
                struct lttng_event_notifier_group *event_notifier_group;
-               struct lttng_event_notifier *event_notifier;
+               struct lttng_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;
@@ -1156,9 +1183,9 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
                                event_notifier_group->event_notifiers_ht.table,
                                LTTNG_UST_EVENT_NOTIFIER_HT_SIZE, event_desc);
 
-                       cds_hlist_for_each_entry_safe(event_notifier, node, tmp_node, head, hlist) {
-                               if (event_desc == event_notifier->desc) {
-                                       event_notifier_func(event_notifier);
+                       cds_hlist_for_each_entry_safe(event_notifier_priv, node, tmp_node, head, hlist) {
+                               if (event_desc == event_notifier_priv->parent.desc) {
+                                       event_notifier_func(event_notifier_priv->pub);
                                        break;
                                }
                        }
@@ -1352,7 +1379,7 @@ void _lttng_event_recorder_destroy(struct lttng_ust_event_recorder *event_record
        cds_hlist_del(&event_recorder->priv->hlist);
 
        lttng_destroy_context(event_recorder->ctx);
-       lttng_free_event_recorder_filter_runtime(event_recorder);
+       lttng_free_event_filter_runtime(event_recorder->parent);
        /* Free event enabler refs */
        cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref,
                        &event_recorder->parent->priv->enablers_ref_head, node)
@@ -1370,7 +1397,7 @@ void _lttng_enum_destroy(struct lttng_enum *_enum)
        free(_enum);
 }
 
-void lttng_ust_events_exit(void)
+void lttng_ust_abi_events_exit(void)
 {
        struct lttng_ust_session_private *session_priv, *tmpsession_priv;
 
@@ -1383,7 +1410,7 @@ void lttng_ust_events_exit(void)
  */
 struct lttng_event_enabler *lttng_event_enabler_create(
                enum lttng_enabler_format_type format_type,
-               struct lttng_ust_event *event_param,
+               struct lttng_ust_abi_event *event_param,
                struct lttng_channel *chan)
 {
        struct lttng_event_enabler *event_enabler;
@@ -1408,7 +1435,7 @@ struct lttng_event_enabler *lttng_event_enabler_create(
 struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create(
                struct lttng_event_notifier_group *event_notifier_group,
                enum lttng_enabler_format_type format_type,
-               struct lttng_ust_event_notifier *event_notifier_param)
+               struct lttng_ust_abi_event_notifier *event_notifier_param)
 {
        struct lttng_event_notifier_enabler *event_notifier_enabler;
 
@@ -1559,8 +1586,8 @@ int lttng_event_notifier_enabler_attach_exclusion(
        return 0;
 }
 
-int lttng_attach_context(struct lttng_ust_context *context_param,
-               union ust_args *uargs,
+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)
 {
        /*
@@ -1572,11 +1599,11 @@ int lttng_attach_context(struct lttng_ust_context *context_param,
                return -EPERM;
 
        switch (context_param->ctx) {
-       case LTTNG_UST_CONTEXT_PTHREAD_ID:
+       case LTTNG_UST_ABI_CONTEXT_PTHREAD_ID:
                return lttng_add_pthread_id_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
+       case LTTNG_UST_ABI_CONTEXT_PERF_THREAD_COUNTER:
        {
-               struct lttng_ust_perf_counter_ctx *perf_ctx_param;
+               struct lttng_ust_abi_perf_counter_ctx *perf_ctx_param;
 
                perf_ctx_param = &context_param->u.perf_counter;
                return lttng_add_perf_counter_to_ctx(
@@ -1585,46 +1612,46 @@ int lttng_attach_context(struct lttng_ust_context *context_param,
                        perf_ctx_param->name,
                        ctx);
        }
-       case LTTNG_UST_CONTEXT_VTID:
+       case LTTNG_UST_ABI_CONTEXT_VTID:
                return lttng_add_vtid_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_VPID:
+       case LTTNG_UST_ABI_CONTEXT_VPID:
                return lttng_add_vpid_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_PROCNAME:
+       case LTTNG_UST_ABI_CONTEXT_PROCNAME:
                return lttng_add_procname_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_IP:
+       case LTTNG_UST_ABI_CONTEXT_IP:
                return lttng_add_ip_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_CPU_ID:
+       case LTTNG_UST_ABI_CONTEXT_CPU_ID:
                return lttng_add_cpu_id_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_APP_CONTEXT:
+       case LTTNG_UST_ABI_CONTEXT_APP_CONTEXT:
                return lttng_ust_add_app_context_to_ctx_rcu(uargs->app_context.ctxname,
                        ctx);
-       case LTTNG_UST_CONTEXT_CGROUP_NS:
+       case LTTNG_UST_ABI_CONTEXT_CGROUP_NS:
                return lttng_add_cgroup_ns_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_IPC_NS:
+       case LTTNG_UST_ABI_CONTEXT_IPC_NS:
                return lttng_add_ipc_ns_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_MNT_NS:
+       case LTTNG_UST_ABI_CONTEXT_MNT_NS:
                return lttng_add_mnt_ns_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_NET_NS:
+       case LTTNG_UST_ABI_CONTEXT_NET_NS:
                return lttng_add_net_ns_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_PID_NS:
+       case LTTNG_UST_ABI_CONTEXT_PID_NS:
                return lttng_add_pid_ns_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_TIME_NS:
+       case LTTNG_UST_ABI_CONTEXT_TIME_NS:
                return lttng_add_time_ns_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_USER_NS:
+       case LTTNG_UST_ABI_CONTEXT_USER_NS:
                return lttng_add_user_ns_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_UTS_NS:
+       case LTTNG_UST_ABI_CONTEXT_UTS_NS:
                return lttng_add_uts_ns_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_VUID:
+       case LTTNG_UST_ABI_CONTEXT_VUID:
                return lttng_add_vuid_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_VEUID:
+       case LTTNG_UST_ABI_CONTEXT_VEUID:
                return lttng_add_veuid_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_VSUID:
+       case LTTNG_UST_ABI_CONTEXT_VSUID:
                return lttng_add_vsuid_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_VGID:
+       case LTTNG_UST_ABI_CONTEXT_VGID:
                return lttng_add_vgid_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_VEGID:
+       case LTTNG_UST_ABI_CONTEXT_VEGID:
                return lttng_add_vegid_to_ctx(ctx);
-       case LTTNG_UST_CONTEXT_VSGID:
+       case LTTNG_UST_ABI_CONTEXT_VSGID:
                return lttng_add_vsgid_to_ctx(ctx);
        default:
                return -EINVAL;
@@ -1632,7 +1659,7 @@ int lttng_attach_context(struct lttng_ust_context *context_param,
 }
 
 int lttng_event_enabler_attach_context(struct lttng_event_enabler *enabler,
-               struct lttng_ust_context *context_param)
+               struct lttng_ust_abi_context *context_param)
 {
        return -ENOSYS;
 }
@@ -1744,7 +1771,7 @@ void lttng_create_event_notifier_if_missing(
                        int ret;
                        bool found = false;
                        const struct lttng_event_desc *desc;
-                       struct lttng_event_notifier *event_notifier;
+                       struct lttng_ust_event_notifier_private *event_notifier_priv;
                        struct cds_hlist_head *head;
                        struct cds_hlist_node *node;
 
@@ -1763,14 +1790,14 @@ void lttng_create_event_notifier_if_missing(
                                event_notifier_group->event_notifiers_ht.table,
                                LTTNG_UST_EVENT_NOTIFIER_HT_SIZE, desc);
 
-                       cds_hlist_for_each_entry(event_notifier, node, head, hlist) {
+                       cds_hlist_for_each_entry(event_notifier_priv, node, head, hlist) {
                                /*
                                 * Check if event_notifier already exists by checking
                                 * if the event_notifier and enabler share the same
                                 * description and id.
                                 */
-                               if (event_notifier->desc == desc &&
-                                               event_notifier->user_token == event_notifier_enabler->user_token) {
+                               if (event_notifier_priv->parent.desc == desc &&
+                                               event_notifier_priv->parent.user_token == event_notifier_enabler->user_token) {
                                        found = true;
                                        break;
                                }
@@ -1814,7 +1841,7 @@ int lttng_event_notifier_enabler_ref_event_notifiers(
                struct lttng_event_notifier_enabler *event_notifier_enabler)
 {
        struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group;
-       struct lttng_event_notifier *event_notifier;
+       struct lttng_ust_event_notifier_private *event_notifier_priv;
 
         /*
          * Only try to create event_notifiers for enablers that are enabled, the user
@@ -1828,13 +1855,13 @@ int lttng_event_notifier_enabler_ref_event_notifiers(
        lttng_create_event_notifier_if_missing(event_notifier_enabler);
 
        /* Link the created event_notifier with its associated enabler. */
-       cds_list_for_each_entry(event_notifier, &event_notifier_group->event_notifiers_head, node) {
+       cds_list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, node) {
                struct lttng_enabler_ref *enabler_ref;
 
-               if (!lttng_event_notifier_enabler_match_event_notifier(event_notifier_enabler, event_notifier))
+               if (!lttng_event_notifier_enabler_match_event_notifier(event_notifier_enabler, event_notifier_priv->pub))
                        continue;
 
-               enabler_ref = lttng_enabler_ref(&event_notifier->enablers_ref_head,
+               enabler_ref = lttng_enabler_ref(&event_notifier_priv->parent.enablers_ref_head,
                        lttng_event_notifier_enabler_as_enabler(event_notifier_enabler));
                if (!enabler_ref) {
                        /*
@@ -1848,25 +1875,25 @@ int lttng_event_notifier_enabler_ref_event_notifiers(
                        enabler_ref->ref = lttng_event_notifier_enabler_as_enabler(
                                event_notifier_enabler);
                        cds_list_add(&enabler_ref->node,
-                               &event_notifier->enablers_ref_head);
+                               &event_notifier_priv->parent.enablers_ref_head);
                }
 
                /*
                 * Link filter bytecodes if not linked yet.
                 */
-               lttng_enabler_link_bytecode(event_notifier->desc,
+               lttng_enabler_link_bytecode(event_notifier_priv->parent.desc,
                        &event_notifier_group->ctx,
-                       &event_notifier->filter_bytecode_runtime_head,
+                       &event_notifier_priv->pub->parent->filter_bytecode_runtime_head,
                        &lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)->filter_bytecode_head);
 
                /*
                 * Link capture bytecodes if not linked yet.
                 */
-               lttng_enabler_link_bytecode(event_notifier->desc,
-                       &event_notifier_group->ctx, &event_notifier->capture_bytecode_runtime_head,
+               lttng_enabler_link_bytecode(event_notifier_priv->parent.desc,
+                       &event_notifier_group->ctx, &event_notifier_priv->pub->capture_bytecode_runtime_head,
                        &event_notifier_enabler->capture_bytecode_head);
 
-               event_notifier->num_captures = event_notifier_enabler->num_captures;
+               event_notifier_priv->num_captures = event_notifier_enabler->num_captures;
        }
 end:
        return 0;
@@ -1876,7 +1903,7 @@ static
 void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group *event_notifier_group)
 {
        struct lttng_event_notifier_enabler *event_notifier_enabler;
-       struct lttng_event_notifier *event_notifier;
+       struct lttng_ust_event_notifier_private *event_notifier_priv;
 
        cds_list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head, node)
                lttng_event_notifier_enabler_ref_event_notifiers(event_notifier_enabler);
@@ -1885,54 +1912,54 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
         * For each event_notifier, if at least one of its enablers is enabled,
         * we enable the event_notifier, else we disable it.
         */
-       cds_list_for_each_entry(event_notifier, &event_notifier_group->event_notifiers_head, node) {
+       cds_list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, node) {
                struct lttng_enabler_ref *enabler_ref;
                struct lttng_bytecode_runtime *runtime;
                int enabled = 0, has_enablers_without_bytecode = 0;
 
                /* Enable event_notifiers */
                cds_list_for_each_entry(enabler_ref,
-                               &event_notifier->enablers_ref_head, node) {
+                               &event_notifier_priv->parent.enablers_ref_head, node) {
                        if (enabler_ref->ref->enabled) {
                                enabled = 1;
                                break;
                        }
                }
 
-               CMM_STORE_SHARED(event_notifier->enabled, enabled);
+               CMM_STORE_SHARED(event_notifier_priv->pub->parent->enabled, enabled);
                /*
                 * Sync tracepoint registration with event_notifier enabled
                 * state.
                 */
                if (enabled) {
-                       if (!event_notifier->registered)
-                               register_event_notifier(event_notifier);
+                       if (!event_notifier_priv->parent.registered)
+                               register_event_notifier(event_notifier_priv->pub);
                } else {
-                       if (event_notifier->registered)
-                               unregister_event_notifier(event_notifier);
+                       if (event_notifier_priv->parent.registered)
+                               unregister_event_notifier(event_notifier_priv->pub);
                }
 
                /* Check if has enablers without bytecode enabled */
                cds_list_for_each_entry(enabler_ref,
-                               &event_notifier->enablers_ref_head, node) {
+                               &event_notifier_priv->parent.enablers_ref_head, node) {
                        if (enabler_ref->ref->enabled
                                        && cds_list_empty(&enabler_ref->ref->filter_bytecode_head)) {
                                has_enablers_without_bytecode = 1;
                                break;
                        }
                }
-               event_notifier->has_enablers_without_bytecode =
+               event_notifier_priv->pub->parent->has_enablers_without_bytecode =
                        has_enablers_without_bytecode;
 
                /* Enable filters */
                cds_list_for_each_entry(runtime,
-                               &event_notifier->filter_bytecode_runtime_head, node) {
+                               &event_notifier_priv->pub->parent->filter_bytecode_runtime_head, node) {
                        lttng_bytecode_filter_sync_state(runtime);
                }
 
                /* Enable captures. */
                cds_list_for_each_entry(runtime,
-                               &event_notifier->capture_bytecode_runtime_head, node) {
+                               &event_notifier_priv->pub->capture_bytecode_runtime_head, node) {
                        lttng_bytecode_capture_sync_state(runtime);
                }
        }
This page took 0.034687 seconds and 4 git commands to generate.