X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=libringbuffer%2Fring_buffer_backend.c;h=c32ba982259a2099a7aa0f8bf65a7f6ecadfc1b4;hb=a4ada9b87a62c26061c109abe0fd502e16f03db2;hp=466552debaf89c997a27a9a5679aceb52ce8f691;hpb=4cfec15c93af7e0cfe3ce769ee90486bb8ab7c37;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c
index 466552de..c32ba982 100644
--- a/libringbuffer/ring_buffer_backend.c
+++ b/libringbuffer/ring_buffer_backend.c
@@ -8,9 +8,9 @@
 
 #include <urcu/arch.h>
 
-#include "ust/core.h"
+#include "lttng/core.h"
 
-#include <ust/ringbuffer-config.h>
+#include <lttng/ringbuffer-config.h>
 #include "backend.h"
 #include "frontend.h"
 #include "smp.h"
@@ -46,7 +46,7 @@ int lib_ring_buffer_backend_allocate(const struct lttng_ust_lib_ring_buffer_conf
 	align_shm(shmobj, __alignof__(struct lttng_ust_lib_ring_buffer_backend_pages_shmp));
 	set_shmp(bufb->array, zalloc_shm(shmobj,
 			sizeof(struct lttng_ust_lib_ring_buffer_backend_pages_shmp) * num_subbuf_alloc));
-	if (unlikely(!shmp(handle, bufb->array)))
+	if (caa_unlikely(!shmp(handle, bufb->array)))
 		goto array_error;
 
 	/*
@@ -56,7 +56,7 @@ int lib_ring_buffer_backend_allocate(const struct lttng_ust_lib_ring_buffer_conf
 	align_shm(shmobj, PAGE_SIZE);
 	set_shmp(bufb->memory_map, zalloc_shm(shmobj,
 			subbuf_size * num_subbuf_alloc));
-	if (unlikely(!shmp(handle, bufb->memory_map)))
+	if (caa_unlikely(!shmp(handle, bufb->memory_map)))
 		goto memory_map_error;
 
 	/* Allocate backend pages array elements */
@@ -74,7 +74,7 @@ int lib_ring_buffer_backend_allocate(const struct lttng_ust_lib_ring_buffer_conf
 	set_shmp(bufb->buf_wsb, zalloc_shm(shmobj,
 				sizeof(struct lttng_ust_lib_ring_buffer_backend_subbuffer)
 				* num_subbuf));
-	if (unlikely(!shmp(handle, bufb->buf_wsb)))
+	if (caa_unlikely(!shmp(handle, bufb->buf_wsb)))
 		goto free_array;
 
 	for (i = 0; i < num_subbuf; i++)
@@ -190,7 +190,6 @@ void channel_backend_reset(struct channel_backend *chanb)
  * @chanb: channel backend
  * @name: channel name
  * @config: client ring buffer configuration
- * @priv: client private data
  * @parent: dentry of parent directory, %NULL for root directory
  * @subbuf_size: size of sub-buffers (> PAGE_SIZE, power of 2)
  * @num_subbuf: number of sub-buffers (power of 2)
@@ -207,7 +206,7 @@ void channel_backend_reset(struct channel_backend *chanb)
 int channel_backend_init(struct channel_backend *chanb,
 			 const char *name,
 			 const struct lttng_ust_lib_ring_buffer_config *config,
-			 void *priv, size_t subbuf_size, size_t num_subbuf,
+			 size_t subbuf_size, size_t num_subbuf,
 			 struct lttng_ust_shm_handle *handle)
 {
 	struct channel *chan = caa_container_of(chanb, struct channel, backend);
@@ -235,7 +234,6 @@ int channel_backend_init(struct channel_backend *chanb,
 	if (ret)
 		return ret;
 
-	chanb->priv = priv;
 	chanb->buf_size = num_subbuf * subbuf_size;
 	chanb->subbuf_size = subbuf_size;
 	chanb->buf_size_order = get_count_order(chanb->buf_size);
@@ -378,7 +376,7 @@ size_t lib_ring_buffer_read(struct lttng_ust_lib_ring_buffer_backend *bufb, size
 	orig_len = len;
 	offset &= chanb->buf_size - 1;
 
-	if (unlikely(!len))
+	if (caa_unlikely(!len))
 		return 0;
 	id = bufb->buf_rsb.id;
 	sb_bindex = subbuffer_id_get_index(config, id);