X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_backend.c;h=6ba0d8b1d44fe4fbb4dbe8989e773a355691c4d2;hb=f1324c1158b8ad5b9dd8bcc55e2a1a26ab2113ae;hp=b50c2f3c406405000d8a830af1d19bfe48622e7d;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c
index b50c2f3c..6ba0d8b1 100644
--- 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-utils.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
@@ -30,7 +33,7 @@
 static
 int lib_ring_buffer_backend_allocate(const struct lttng_ust_lib_ring_buffer_config *config,
 				     struct lttng_ust_lib_ring_buffer_backend *bufb,
-				     size_t size, size_t num_subbuf,
+				     size_t size __attribute__((unused)), size_t num_subbuf,
 				     int extra_reader_sb,
 				     struct lttng_ust_shm_handle *handle,
 				     struct shm_object *shmobj)
@@ -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;
@@ -390,8 +395,8 @@ end:
  *
  * Destroy all channel buffers and frees the channel.
  */
-void channel_backend_free(struct channel_backend *chanb,
-			  struct lttng_ust_shm_handle *handle)
+void channel_backend_free(struct channel_backend *chanb __attribute__((unused)),
+			  struct lttng_ust_shm_handle *handle __attribute__((unused)))
 {
 	/* SHM teardown takes care of everything */
 }