X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_backend.c;h=769e24bffa0c35475aee4ddcec62b60b4b618d93;hb=05cbbadf100053288c7ceccb1ef4ef6763638aea;hp=3f47ebd14e1b381d66b0e133d52450d79205b09b;hpb=b728d87e617189fe9898a9492a559ecf949d2348;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c
index 3f47ebd1..769e24bf 100644
--- a/libringbuffer/ring_buffer_backend.c
+++ b/libringbuffer/ring_buffer_backend.c
@@ -6,12 +6,12 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
+#define _GNU_SOURCE
 #include <urcu/arch.h>
+#include <limits.h>
 
-#include "lttng/core.h"
-
-#include "uatomic.h"
 #include <lttng/ringbuffer-config.h>
+#include "vatomic.h"
 #include "backend.h"
 #include "frontend.h"
 #include "smp.h"
@@ -220,8 +220,10 @@ int channel_backend_init(struct channel_backend *chanb,
 	/*
 	 * Make sure the number of subbuffers and subbuffer size are power of 2.
 	 */
-	CHAN_WARN_ON(chanb, hweight32(subbuf_size) != 1);
-	CHAN_WARN_ON(chanb, hweight32(num_subbuf) != 1);
+	if (hweight32(subbuf_size) != 1)
+		return -EINVAL;
+	if (hweight32(num_subbuf) != 1)
+		return -EINVAL;
 
 	ret = subbuffer_id_check_index(config, num_subbuf);
 	if (ret)
@@ -294,6 +296,7 @@ int channel_backend_init(struct channel_backend *chanb,
 		buf = shmp(handle, chanb->buf[0].shmp);
 		if (!buf)
 			goto end;
+		set_shmp(buf->self, chanb->buf[0].shmp._ref);
 		ret = lib_ring_buffer_create(buf, chanb, -1,
 					handle, shmobj);
 		if (ret)