Move event context to private structures

[lttng-ust.git] / liblttng-ust / lttng-events.c

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 9c1a9da1145433919434784c501247b68e7de198..bf74a1d9cfc3ec48b13d04accda4d6303cafc4b3 100644 (file)
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -236,7 +236,7 @@ void _lttng_channel_unmap(struct lttng_ust_channel_buffer *lttng_chan)
        struct lttng_ust_shm_handle *handle;
 
        cds_list_del(&lttng_chan->priv->node);
-       lttng_destroy_context(lttng_chan->ctx);
+       lttng_destroy_context(lttng_chan->priv->ctx);
        chan = lttng_chan->chan;
        handle = lttng_chan->handle;
        channel_destroy(chan, handle, 0);
@@ -577,7 +577,7 @@ int lttng_session_enable(struct lttng_ust_session *session)
                /* don't change it if session stop/restart */
                if (chan->header_type)
                        continue;
-               ctx = chan->pub->ctx;
+               ctx = chan->ctx;
                if (ctx) {
                        nr_fields = ctx->nr_fields;
                        fields = ctx->fields;
@@ -1321,7 +1321,7 @@ void _lttng_event_destroy(struct lttng_ust_event_common *event)
                /* Remove from event hash table. */
                cds_hlist_del(&event_recorder->priv->hlist);
 
-               lttng_destroy_context(event_recorder->ctx);
+               lttng_destroy_context(event_recorder->priv->ctx);
                free(event_recorder->parent);
                free(event_recorder->priv);
                free(event_recorder);
@@ -1965,13 +1965,13 @@ void lttng_ust_context_set_session_provider(const char *name,
                if (ret)
                        abort();
                cds_list_for_each_entry(chan, &session_priv->chan_head, node) {
-                       ret = lttng_ust_context_set_provider_rcu(&chan->pub->ctx,
+                       ret = lttng_ust_context_set_provider_rcu(&chan->ctx,
                                        name, get_size, record, get_value);
                        if (ret)
                                abort();
                }
                cds_list_for_each_entry(event_recorder_priv, &session_priv->events_head, node) {
-                       ret = lttng_ust_context_set_provider_rcu(&event_recorder_priv->pub->ctx,
+                       ret = lttng_ust_context_set_provider_rcu(&event_recorder_priv->ctx,
                                        name, get_size, record, get_value);
                        if (ret)
                                abort();