Refactoring: context structures

[lttng-ust.git] / include / lttng / ust-events.h

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index de7d322a5a6d36b1206a9b236b4ef3b29cd50b65..18e4cd5541cf69985182c9006dbb58dd37ab18cf 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -343,7 +343,7 @@ struct lttng_ust_bytecode_runtime {
  * removed.
  */
 
-struct lttng_ctx;
+struct lttng_ust_ctx;
 struct lttng_ust_event_common_private;
 
 enum lttng_ust_event_type {
@@ -404,7 +404,7 @@ struct lttng_ust_event_recorder {
 
        unsigned int id;
        struct lttng_channel *chan;
-       struct lttng_ctx *ctx;
+       struct lttng_ust_ctx *ctx;
 
        /* End of base ABI. Fields below should be used after checking struct_size. */
 };
@@ -438,7 +438,7 @@ struct lttng_ust_event_notifier {
        /* End of base ABI. Fields below should be used after checking struct_size. */
 };
 
-struct channel;
+struct lttng_ust_lib_ring_buffer_channel;
 struct lttng_ust_shm_handle;
 
 /*
@@ -473,11 +473,12 @@ struct lttng_ust_channel_ops {
         * packet. Note that the size returned is only a hint, since it
         * may change due to concurrent writes.
         */
-       size_t (*packet_avail_size)(struct channel *chan,
+       size_t (*packet_avail_size)(struct lttng_ust_lib_ring_buffer_channel *chan,
                                    struct lttng_ust_shm_handle *handle);
-       int (*is_finalized)(struct channel *chan);
-       int (*is_disabled)(struct channel *chan);
-       int (*flush_buffer)(struct channel *chan, struct lttng_ust_shm_handle *handle);
+       int (*is_finalized)(struct lttng_ust_lib_ring_buffer_channel *chan);
+       int (*is_disabled)(struct lttng_ust_lib_ring_buffer_channel *chan);
+       int (*flush_buffer)(struct lttng_ust_lib_ring_buffer_channel *chan,
+                           struct lttng_ust_shm_handle *handle);
        void (*event_strcpy)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
                        const char *src, size_t len);
 
@@ -496,9 +497,9 @@ struct lttng_channel {
         * consumer process is designed to be allowed to do is to read
         * and perform subbuffer flush.
         */
-       struct channel *chan;           /* Channel buffers */
+       struct lttng_ust_lib_ring_buffer_channel *chan; /* Channel buffers */
        int enabled;
-       struct lttng_ctx *ctx;
+       struct lttng_ust_ctx *ctx;
        /* Event ID management */
        struct lttng_session *session;
        int objd;                       /* Object associated to channel */
@@ -527,8 +528,8 @@ struct lttng_ust_stack_ctx {
        uint32_t struct_size;                   /* Size of this structure */
 
        struct lttng_ust_event_recorder *event_recorder;
-       struct lttng_ctx *chan_ctx;     /* RCU dereferenced. */
-       struct lttng_ctx *event_ctx;    /* RCU dereferenced. */
+       struct lttng_ust_ctx *chan_ctx; /* RCU dereferenced. */
+       struct lttng_ust_ctx *event_ctx;        /* RCU dereferenced. */
 
        /* End of base ABI. Fields below should be used after checking struct_size. */
 };