Refactoring: introduce session private structure

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

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index a367168ac6f96e92a41a88ef45199516d2503783..718dfbf70d9469c17dcecb53ee401d6d8a8ff427 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -46,6 +46,7 @@
 #include "lttng-tracer.h"
 #include "string-utils.h"
 #include "ust-events-internal.h"
+#include "context-internal.h"
 
 #define OBJ_NAME_LEN   16
 
@@ -311,8 +312,8 @@ int lttng_abi_create_session(void *owner)
                ret = session_objd;
                goto objd_error;
        }
-       session->objd = session_objd;
-       session->owner = owner;
+       session->priv->objd = session_objd;
+       session->priv->owner = owner;
        return session_objd;
 
 objd_error:
@@ -421,7 +422,7 @@ long lttng_cmd(int objd, unsigned int cmd, unsigned long arg,
        case LTTNG_UST_TRACEPOINT_FIELD_LIST:
                return lttng_abi_tracepoint_field_list(owner);
        case LTTNG_UST_WAIT_QUIESCENT:
-               lttng_ust_synchronize_trace();
+               lttng_ust_urcu_synchronize_rcu();
                return 0;
        case LTTNG_UST_EVENT_NOTIFIER_GROUP_CREATE:
                return lttng_abi_event_notifier_send_fd(owner,
@@ -469,7 +470,7 @@ int lttng_abi_map_channel(int session_objd,
                goto invalid;
        }
 
-       if (session->been_active) {
+       if (session->priv->been_active) {
                ret = -EBUSY;
                goto active;    /* Refuse to add channel to active session */
        }
@@ -545,7 +546,7 @@ int lttng_abi_map_channel(int session_objd,
        memcpy(&lttng_chan->chan->backend.config,
                transport->client_config,
                sizeof(lttng_chan->chan->backend.config));
-       cds_list_add(&lttng_chan->node, &session->chan_head);
+       cds_list_add(&lttng_chan->node, &session->priv->chan_head);
        lttng_chan->header_type = 0;
        lttng_chan->handle = channel_handle;
        lttng_chan->type = type;
@@ -1238,7 +1239,7 @@ int lttng_channel_release(int objd)
        struct lttng_channel *channel = objd_private(objd);
 
        if (channel)
-               return lttng_ust_objd_unref(channel->session->objd, 0);
+               return lttng_ust_objd_unref(channel->session->priv->objd, 0);
        return 0;
 }