Remove handle field from ring buffer context

[lttng-ust.git] / libringbuffer / ring_buffer_backend.c

diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c
index b50c2f3c406405000d8a830af1d19bfe48622e7d..264201883862daae95f622f8f8f62193ac43ad90 100644 (file)
--- a/libringbuffer/ring_buffer_backend.c
+++ b/libringbuffer/ring_buffer_backend.c
@@ -11,13 +11,16 @@
 #include <urcu/arch.h>
 #include <limits.h>
 
-#include <lttng/align.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ust-align.h>
+#include <lttng/ringbuffer-context.h>
+
+#include "ringbuffer-config.h"
 #include "vatomic.h"
 #include "backend.h"
 #include "frontend.h"
 #include "smp.h"
 #include "shm.h"
+#include "ust-compat.h"
 
 /**
  * lib_ring_buffer_backend_allocate - allocate a channel buffer
@@ -222,7 +225,8 @@ void lib_ring_buffer_backend_reset(struct lttng_ust_lib_ring_buffer_backend *buf
  */
 void channel_backend_reset(struct channel_backend *chanb)
 {
-       struct channel *chan = caa_container_of(chanb, struct channel, backend);
+       struct lttng_ust_lib_ring_buffer_channel *chan = caa_container_of(chanb,
+                       struct lttng_ust_lib_ring_buffer_channel, backend);
        const struct lttng_ust_lib_ring_buffer_config *config = &chanb->config;
 
        /*
@@ -259,7 +263,8 @@ int channel_backend_init(struct channel_backend *chanb,
                         struct lttng_ust_shm_handle *handle,
                         const int *stream_fds)
 {
-       struct channel *chan = caa_container_of(chanb, struct channel, backend);
+       struct lttng_ust_lib_ring_buffer_channel *chan = caa_container_of(chanb,
+                       struct lttng_ust_lib_ring_buffer_channel, backend);
        unsigned int i;
        int ret;
        size_t shmsize = 0, num_subbuf_alloc;